[PATCH] Update from deprecated rpmverify_* to rpmverifyfile_* checks

Maura Dailey maura at eclipse.ncsc.mil
Mon Jun 3 22:21:11 UTC 2013


Little patch to eliminate a deprecated family of checks and tests. I compared the results of testcheck.py against the
current list of complaints that rpm -qVa outputs on our systems and everything seems to match up.

I still can't get accounts_root_path_dirs_no_write.xml to work correctly (specifying a file or directory directly in
place of parsing out PATH works, but trying to get it to use variables correctly is stumping me).

- Maura Dailey

Signed-off-by: Maura Dailey <maura at eclipse.ncsc.mil>
---
 RHEL6/input/checks/rpm_verify_permissions.xml |   42 ++++++++++++------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/RHEL6/input/checks/rpm_verify_permissions.xml b/RHEL6/input/checks/rpm_verify_permissions.xml
index cfb662e..d177dfb 100644
--- a/RHEL6/input/checks/rpm_verify_permissions.xml
+++ b/RHEL6/input/checks/rpm_verify_permissions.xml
@@ -16,40 +16,40 @@
       <criterion test_ref="test_verify_all_rpms_mode" comment="mode of all files matches local rpm database" />
     </criteria>
   </definition>
-  <linux:rpmverify_test check_existence="none_exist" id="test_verify_all_rpms_user_ownership" version="1" check="all" comment="user ownership of all files matches local rpm database">
+  <linux:rpmverifyfile_test check_existence="none_exist" id="test_verify_all_rpms_user_ownership" version="1" check="all" comment="user ownership of all files matches local rpm database">
     <linux:object object_ref="object_files_fail_user_ownership"/>
-  </linux:rpmverify_test>
-  <linux:rpmverify_test check_existence="none_exist" id="test_verify_all_rpms_group_ownership" version="1" check="all" comment="group ownership of all files matches local rpm database">
+  </linux:rpmverifyfile_test>
+  <linux:rpmverifyfile_test check_existence="none_exist" id="test_verify_all_rpms_group_ownership" version="1" check="all" comment="group ownership of all files matches local rpm database">
     <linux:object object_ref="object_files_fail_group_ownership"/>
-  </linux:rpmverify_test>
-  <linux:rpmverify_test check_existence="none_exist" id="test_verify_all_rpms_mode" version="1" check="all" comment="mode of all files matches local rpm database">
+  </linux:rpmverifyfile_test>
+  <linux:rpmverifyfile_test check_existence="none_exist" id="test_verify_all_rpms_mode" version="1" check="all" comment="mode of all files matches local rpm database">
     <linux:object object_ref="object_files_fail_mode"/>
-  </linux:rpmverify_test>
-  <linux:rpmverify_object id="object_files_fail_user_ownership" version="1" comment="rpm verify of all files">
-    <linux:behaviors nodeps="true" nofiles="false" nodigest="true" noscripts="true" nosignature="true" nomd5="true"/>
+  </linux:rpmverifyfile_test>
+  <linux:rpmverifyfile_object id="object_files_fail_user_ownership" version="1" comment="rpm verify of all files">
+    <linux:behaviors nomd5="true"/>
     <linux:name operation="pattern match">.*</linux:name>
     <linux:filepath operation="pattern match">.*</linux:filepath>
     <filter action="include">state_files_fail_user_ownership</filter>
-  </linux:rpmverify_object>
-  <linux:rpmverify_object id="object_files_fail_group_ownership" version="1" comment="rpm verify of all files">
-    <linux:behaviors nodeps="true" nofiles="false" nodigest="true" noscripts="true" nosignature="true" nomd5="true"/>
+  </linux:rpmverifyfile_object>
+  <linux:rpmverifyfile_object id="object_files_fail_group_ownership" version="1" comment="rpm verify of all files">
+    <linux:behaviors nomd5="true"/>
     <linux:name operation="pattern match">.*</linux:name>
     <linux:filepath operation="pattern match">.*</linux:filepath>
     <filter action="include">state_files_fail_group_ownership</filter>
-  </linux:rpmverify_object>
-  <linux:rpmverify_object id="object_files_fail_mode" version="1" comment="rpm verify of all files">
-    <linux:behaviors nodeps="true" nofiles="false" nodigest="true" noscripts="true" nosignature="true" nomd5="true"/>
+  </linux:rpmverifyfile_object>
+  <linux:rpmverifyfile_object id="object_files_fail_mode" version="1" comment="rpm verify of all files">
+    <linux:behaviors nomd5="true"/>
     <linux:name operation="pattern match">.*</linux:name>
     <linux:filepath operation="pattern match">.*</linux:filepath>
     <filter action="include">state_files_fail_mode</filter>
-  </linux:rpmverify_object>
-  <linux:rpmverify_state id="state_files_fail_user_ownership" version="1">
+  </linux:rpmverifyfile_object>
+  <linux:rpmverifyfile_state id="state_files_fail_user_ownership" version="1">
     <linux:ownership_differs>fail</linux:ownership_differs>
-  </linux:rpmverify_state>
-  <linux:rpmverify_state id="state_files_fail_group_ownership" version="1">
+  </linux:rpmverifyfile_state>
+  <linux:rpmverifyfile_state id="state_files_fail_group_ownership" version="1">
     <linux:group_differs>fail</linux:group_differs>
-  </linux:rpmverify_state>
-  <linux:rpmverify_state id="state_files_fail_mode" version="1">
+  </linux:rpmverifyfile_state>
+  <linux:rpmverifyfile_state id="state_files_fail_mode" version="1">
     <linux:mode_differs>fail</linux:mode_differs>
-  </linux:rpmverify_state>
+  </linux:rpmverifyfile_state>
 </def-group>
-- 
1.7.1



More information about the scap-security-guide mailing list