On 8/11/12 2:30 PM, Jeffrey Blank wrote:
Signed-off-by: Jeffrey Blank <[email protected]> --- RHEL6/input/checks/installed_OS_is_rhel6.xml | 36 +++++++++++++------------- 1 files changed, 18 insertions(+), 18 deletions(-)diff --git a/RHEL6/input/checks/installed_OS_is_rhel6.xml b/RHEL6/input/checks/installed_OS_is_rhel6.xml index 384c342..1ffeb53 100644 --- a/RHEL6/input/checks/installed_OS_is_rhel6.xml +++ b/RHEL6/input/checks/installed_OS_is_rhel6.xml @@ -13,42 +13,42 @@ </metadata> <criteria> <criterion comment="Installed operating system is part of the unix family" - test_ref="test_20001" /> + test_ref="test_unix_family" /> <criterion comment="Red Hat Enterprise Linux 6 Workstation is installed" - test_ref="test_10000" /> + test_ref="test_rhel_workstation" /> <criterion comment="Red Hat Enterprise Linux 6 Server is installed" - test_ref="test_10001" /> + test_ref="test_rhel_server" /> </criteria> </definition>- <ind:family_test check="all" check_existence="at_least_one_exists" comment="installed OS part of unix family" id="test_20001" version="1">- <ind:object object_ref="obj_20001" /> - <ind:state state_ref="state_20001" /> + <ind:family_test check="all" check_existence="at_least_one_exists" comment="installed OS part of unix family" id="test_unix_family" version="1"> + <ind:object object_ref="obj_unix_family" /> + <ind:state state_ref="state_unix_family" /> </ind:family_test> - <ind:family_state id="state_20001" version="1"> + <ind:family_state id="state_unix_family" version="1"> <ind:family>unix</ind:family> </ind:family_state> - <ind:family_object id="obj_20001" version="1" /> + <ind:family_object id="obj_unix_family" version="1" />- <linux:rpminfo_test check="all" check_existence="any_exist" comment="redhat-release-workstation is version 6" id="test_10000" version="1">- <linux:object object_ref="obj_10000" /> - <linux:state state_ref="state_10000" /> + <linux:rpminfo_test check="all" check_existence="any_exist" comment="redhat-release-workstation is version 6" id="test_rhel_workstation" version="1"> + <linux:object object_ref="obj_rhel_workstation" /> + <linux:state state_ref="state_rhel_workstation" /> </linux:rpminfo_test> - <linux:rpminfo_state id="state_10000" version="1"> + <linux:rpminfo_state id="state_rhel_workstation" version="1"> <linux:version operation="pattern match">^6Workstation$</linux:version> </linux:rpminfo_state> - <linux:rpminfo_object id="obj_10000" version="1"> + <linux:rpminfo_object id="obj_rhel_workstation" version="1"> <linux:name>redhat-release-workstation</linux:name> </linux:rpminfo_object>- <linux:rpminfo_test check="all" check_existence="any_exist" comment="redhat-release-server is version 6" id="test_10001" version="1">- <linux:object object_ref="obj_10001" /> - <linux:state state_ref="state_10001" /> + <linux:rpminfo_test check="all" check_existence="any_exist" comment="redhat-release-server is version 6" id="test_rhel_server" version="1"> + <linux:object object_ref="obj_rhel_server" /> + <linux:state state_ref="state_rhel_server" /> </linux:rpminfo_test> - <linux:rpminfo_state id="state_10001" version="1"> + <linux:rpminfo_state id="state_rhel_server" version="1"> <linux:version operation="pattern match">^6Server$</linux:version> </linux:rpminfo_state> - <linux:rpminfo_object id="obj_10001" version="1"> + <linux:rpminfo_object id="obj_rhel_server" version="1"> <linux:name>redhat-release-server</linux:name> </linux:rpminfo_object> </def-group>
Based off Kevin's ack I went ahead and pushed this. _______________________________________________ scap-security-guide mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
