Merge pull request #12869 from vojtapolasek/fix_master_account_pwd_hi…

…story rename OVAL tests and objects to fix name conflict
ComplianceAsCode · Jan 22, 2025 · 12279d1 · 12279d1
2 parents 795606e + 5774de8
commit 12279d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...ocking_out_password_attempts/accounts_password_pam_pwhistory_enforce_root/oval/shared.xml b/...ocking_out_password_attempts/accounts_password_pam_pwhistory_enforce_root/oval/shared.xml
@@ -8,20 +8,20 @@
   <definition class="compliance" id="{{{ rule_id }}}" version="2">
     {{{ oval_metadata("Enforce password history for root of pam_pwhistory.") }}}
       <criteria operator="AND" comment="Check if pam_pwhistory.so is properly configured">
-        <criterion test_ref="test_accounts_password_pam_pwhistory_enabled"
+        <criterion test_ref="test_accounts_password_pam_pwhistory_enforce_root_enabled"
                    comment="pam_pwhistory.so is properly defined in password section of PAM file"/>
         <criterion test_ref="test_accounts_password_pam_pwhistory_enforce_for_root_parameter"
                  comment="enforce_for_root parameter of pam_pwhistory.so is properly configured"/>
       </criteria>
   </definition>
 
   <!-- is pam_pwhistory.so enabled? -->
-  <ind:textfilecontent54_test id="test_accounts_password_pam_pwhistory_enabled"
+  <ind:textfilecontent54_test id="test_accounts_password_pam_pwhistory_enforce_root_enabled"
                               check="all" version="1" comment="Check pam_pwhistory.so presence in PAM file">
-    <ind:object object_ref="object_accounts_password_pam_pwhistory_enabled"/>
+    <ind:object object_ref="object_accounts_password_pam_pwhistory_enforce_root_enabled"/>
   </ind:textfilecontent54_test>
 
-  <ind:textfilecontent54_object id="object_accounts_password_pam_pwhistory_enabled"
+  <ind:textfilecontent54_object id="object_accounts_password_pam_pwhistory_enforce_root_enabled"
                                 version="1">
     <ind:filepath>{{{ accounts_password_pam_file }}}</ind:filepath>
     <ind:pattern var_ref="var_accounts_password_pam_pwhistory_module_regex"

diff --git a/...am/locking_out_password_attempts/accounts_password_pam_pwhistory_remember/oval/shared.xml b/...am/locking_out_password_attempts/accounts_password_pam_pwhistory_remember/oval/shared.xml
@@ -6,7 +6,7 @@
   <definition class="compliance" id="{{{ rule_id }}}" version="2">
     {{{ oval_metadata("The passwords to remember of pam_pwhistory should be set correctly.") }}}
       <criteria operator="AND" comment="Check if pam_pwhistory.so is properly configured">
-        <criterion test_ref="test_accounts_password_pam_pwhistory_enabled"
+        <criterion test_ref="test_accounts_password_pam_pwhistory_remember_enabled"
                    comment="pam_pwhistory.so is properly defined in password section of PAM file"/>
         <criterion test_ref="test_accounts_password_pam_pwhistory_remember_parameter"
                  comment="Remember parameter of pam_pwhistory.so is properly configured"/>
@@ -16,12 +16,12 @@
   <external_variable comment="number of passwords that should be remembered" datatype="int" id="var_password_pam_remember" version="1" />
 
   <!-- is pam_pwhistory.so enabled? -->
-  <ind:textfilecontent54_test id="test_accounts_password_pam_pwhistory_enabled"
+  <ind:textfilecontent54_test id="test_accounts_password_pam_pwhistory_remember_enabled"
                               check="all" version="1" comment="Check pam_pwhistory.so presence in PAM file">
-    <ind:object object_ref="object_accounts_password_pam_pwhistory_enabled"/>
+    <ind:object object_ref="object_accounts_password_pam_pwhistory_remember_enabled"/>
   </ind:textfilecontent54_test>
 
-  <ind:textfilecontent54_object id="object_accounts_password_pam_pwhistory_enabled"
+  <ind:textfilecontent54_object id="object_accounts_password_pam_pwhistory_remember_enabled"
                                 version="1">
     <ind:filepath>{{{ accounts_password_pam_file }}}</ind:filepath>
     <ind:pattern var_ref="var_accounts_password_pam_pwhistory_module_regex"