Seems reasonable to me, so ACK.
If some Red Hatters want to tell us if this is the right way to do this,
that would be great, too.
On 04/23/2013 01:35 PM, Maura Dailey wrote:
Signed-off-by: Maura Dailey <maura(a)eclipse.ncsc.mil>
---
.../checks/package_red_hat_gpgkeys_installed.xml | 32 +++++++-------------
1 files changed, 11 insertions(+), 21 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..9b299cb 100644
--- a/RHEL6/input/checks/package_red_hat_gpgkeys_installed.xml
+++ b/RHEL6/input/checks/package_red_hat_gpgkeys_installed.xml
@@ -8,38 +8,28 @@
</affected>
<description>The Red Hat release and auxiliary key packages are required to
be installed.</description>
</metadata>
- <criteria comment="packages gpg-pubkey-fd431d51-4ae0493b and
gpg-pubkey-2fa658e0-45700c69 are installed"
- operator="AND">
- <criterion comment="package gpg-pubkey-fd431d51-4ae0493b is
installed"
- test_ref="test_package_gpgkey-fd431d51-4ae0493b_installed" />
- <criterion comment="package gpg-pubkey-2fa658e0-45700c69 is
installed"
- test_ref="test_package_gpgkey-2fa658e0-45700c69_installed" />
+ <criteria comment="packages gpg-pubkey-fd431d51-4ae0493b and
gpg-pubkey-2fa658e0-45700c69 are installed" operator="AND">
+ <criterion comment="package gpg-pubkey-fd431d51-4ae0493b is
installed" test_ref="test_package_gpgkey-fd431d51-4ae0493b_installed"
/>
+ <criterion comment="package gpg-pubkey-2fa658e0-45700c69 is
installed" test_ref="test_package_gpgkey-2fa658e0-45700c69_installed"
/>
</criteria>
</definition>
- <linux:rpminfo_test check="only one"
check_existence="any_exist"
- id="test_package_gpgkey-fd431d51-4ae0493b_installed" version="1"
- comment="Red Hat release key package is installed">
+ <linux:rpminfo_test check="only one"
check_existence="any_exist"
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>
- <linux:rpminfo_test check="only one"
check_existence="any_exist"
- id="test_package_gpgkey-2fa658e0-45700c69_installed" version="1"
- comment="Red Hat auxiliary key package is installed">
+ <linux:rpminfo_test check="only one"
check_existence="any_exist"
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>
--
___________________________
Jeffrey Blank
410-854-8675
Technology and Systems Analysis / Network Components
NSA Information Assurance