Merge pull request #2283 from Mab879/fix_2282

Always check the current lists before inserting on blueprints

Author: evgenyz

src/XCCDF_POLICY/xccdf_policy_remediate.c

@@ -742,7 +742,7 @@ static inline int _parse_blueprint_fix(const char *fix_text, struct blueprint_cu
 			memcpy(val, &fix_text[ovector[2]], ovector[3] - ovector[2]);
 			val[ovector[3] - ovector[2]] = '\0';
 
-			if (!oscap_list_contains(customizations->kernel_append, val, (oscap_cmp_func) oscap_streq)) {
+			if (!oscap_list_contains(tab[i].list, val, (oscap_cmp_func) oscap_streq)) {
 				oscap_list_prepend(tab[i].list, val);
 			} else {
 				free(val);

tests/API/XCCDF/unittests/test_remediation_blueprint.xccdf.xml

@@ -104,6 +104,16 @@ enabled = ["sshd"]
     <fix system="urn:redhat:osbuild:blueprint">
 [customizations.services]
 masked = ["evil"]
+</fix>
+    <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+      <check-content-ref href="test_remediation_simple.oval.xml" name="oval:moc.elpmaxe.www:def:1"/>
+    </check>
+  </Rule>
+ <Rule selected="true" id="xccdf_moc.elpmaxe.www_rule_11">
+    <title>Enable sshd</title>
+    <fix system="urn:redhat:osbuild:blueprint">
+[customizations.services]
+enabled = ["sshd"]
 </fix>
     <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5">
       <check-content-ref href="test_remediation_simple.oval.xml" name="oval:moc.elpmaxe.www:def:1"/>