[PATCH 2/2] Duplicate state ids fixed, fixed reversed version and release info for the auxillary key

Maura Dailey maura at eclipse.ncsc.mil
Tue Apr 23 21:29:33 UTC 2013


---
 .../checks/package_red_hat_gpgkeys_installed.xml   |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/RHEL6/input/checks/package_red_hat_gpgkeys_installed.xml b/RHEL6/input/checks/package_red_hat_gpgkeys_installed.xml
index ccdeb89..e06d0c0 100644
--- a/RHEL6/input/checks/package_red_hat_gpgkeys_installed.xml
+++ b/RHEL6/input/checks/package_red_hat_gpgkeys_installed.xml
@@ -20,12 +20,9 @@
   id="test_package_gpgkey-fd431d51-4ae0493b_installed" version="1"
   comment="Red Hat release key package is installed">
     <linux:object object_ref="obj_package_gpg-pubkey" />
-    <linux:state state_ref="state_package_gpg-pubkey" />
+    <linux:state state_ref="state_package_gpg-pubkey-fd431d51-4ae0493b" />
   </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_gpg-pubkey" version="1">
-    <linux:name>gpg-pubkey</linux:name>
-  </linux:rpminfo_object>
-  <linux:rpminfo_state id="state_package_gpg-pubkey" version="1">
+  <linux:rpminfo_state id="state_package_gpg-pubkey-fd431d51-4ae0493b" version="1">
     <linux:release>4ae0493b</linux:release>
     <linux:version>fd431d51</linux:version>
   </linux:rpminfo_state>
@@ -33,13 +30,13 @@
   id="test_package_gpgkey-2fa658e0-45700c69_installed" version="1"
   comment="Red Hat auxiliary key package is installed">
     <linux:object object_ref="obj_package_gpg-pubkey" />
-    <linux:state state_ref="state_package_gpg-pubkey" />
+    <linux:state state_ref="state_package_gpg-pubkey-2fa658e0-45700c69" />
   </linux:rpminfo_test>
   <linux:rpminfo_object id="obj_package_gpg-pubkey" version="1">
     <linux:name>gpg-pubkey</linux:name>
   </linux:rpminfo_object>
-  <linux:rpminfo_state id="state_package_gpg-pubkey" version="1">
-    <linux:release>2fa658e0</linux:release>
-    <linux:version>45700c69</linux:version>
+  <linux:rpminfo_state id="state_package_gpg-pubkey-2fa658e0-45700c69" version="1">
+    <linux:release>45700c69</linux:release>
+    <linux:version>2fa658e0</linux:version>
   </linux:rpminfo_state>
 </def-group>
-- 
1.7.1



More information about the scap-security-guide mailing list