Simplify template

The flags "S" and "R" are set in FLAGS variable always. Since
they're set always, we don't have to set them at all. We
can remove the conditions that check for these flags and always
use the code inside the conditions.

shared/templates/sysctl/oval.template

@@ -62,7 +62,6 @@
 </def-group>
 
 {{%- endif %}}
-{{%- if "R" in FLAGS -%}}
 
 {{% if CHECK_RUNTIME == "true" %}}
 <def-group>
@@ -121,8 +120,6 @@
 </def-group>
 {{% endif %}}
 
-{{%- endif -%}}
-{{%- if "S" in FLAGS -%}}
 
 <def-group>
   <definition class="compliance" id="{{{ rule_id }}}_static" version="3">
@@ -269,4 +266,3 @@
 {{% endfor %}}
 {{% endif %}}
 </def-group>
-{{%- endif -%}}

shared/templates/sysctl/template.py

@@ -8,7 +8,7 @@ def preprocess(data, lang):
     ipv6_flag = "P"
     if data["sysctlid"].find("ipv6") >= 0:
         ipv6_flag = "I"
-    data["flags"] = "SR" + ipv6_flag
+    data["flags"] = ipv6_flag
     if "operation" not in data:
         data["operation"] = "equals"
     if isinstance(data["sysctlval"], list) and len(data["sysctlval"]) == 0: