<div dir="ltr">These look excellent - ack to the patch set!</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sun, May 11, 2014 at 9:30 PM, Shawn Wells <span dir="ltr"><<a href="mailto:shawn@redhat.com" target="_blank">shawn@redhat.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Updating RHEL6 check to match RHEL7 style, as submitted by Simon Lukasik on 17-MAR-2014.<br>
<br>
Signed-off-by: Shawn Wells <<a href="mailto:shawn@redhat.com">shawn@redhat.com</a>><br>
---<br>
RHEL/6/input/checks/installed_OS_is_rhel6.xml | 37 ++++++++++++++++---------<br>
1 files changed, 24 insertions(+), 13 deletions(-)<br>
<br>
diff --git a/RHEL/6/input/checks/installed_OS_is_rhel6.xml b/RHEL/6/input/checks/installed_OS_is_rhel6.xml<br>
index 7f77491..0c61df5 100644<br>
--- a/RHEL/6/input/checks/installed_OS_is_rhel6.xml<br>
+++ b/RHEL/6/input/checks/installed_OS_is_rhel6.xml<br>
@@ -14,8 +14,12 @@<br>
<criteria><br>
<criterion comment="Installed operating system is part of the unix family"<br>
test_ref="test_unix_family" /><br>
- <criterion comment="Red Hat Enterprise Linux 6 is installed"<br>
- test_ref="test_rhel_6" /><br>
+ <criteria operator="OR"><br>
+ <criterion comment="Red Hat Enterprise Linux 6 Workstation is installed"<br>
+ test_ref="test_rhel_workstation" /><br>
+ <criterion comment="Red Hat Enterprise Linux 6 Server is installed"<br>
+ test_ref="test_rhel_server" /><br>
+ </criteria><br>
</criteria><br>
</definition><br>
<br>
@@ -28,18 +32,25 @@<br>
</ind:family_state><br>
<ind:family_object id="obj_unix_family" version="1" /><br>
<br>
- <linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-* is version 6" id="test_rhel_6" version="1"><br>
- <linux:object object_ref="obj_rhel_release" /><br>
- <linux:state state_ref="state_rhel_6" /><br>
+ <linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-workstation is version 6" id="test_rhel_workstation" version="1"><br>
+ <linux:object object_ref="obj_rhel_workstation" /><br>
+ <linux:state state_ref="state_rhel_workstation" /><br>
</linux:rpminfo_test><br>
- <linux:rpminfo_state id="state_rhel_6" version="1"><br>
- <linux:name operation="pattern match">^redhat-release</linux:name><br>
- <linux:version operation="pattern match">^6[^\d]</linux:version><br>
+ <linux:rpminfo_state id="state_rhel_workstation" version="1"><br>
+ <linux:version operation="pattern match">^6\.\d+$</linux:version><br>
</linux:rpminfo_state><br>
- <linux:rpmverifyfile_object id="obj_rhel_release" version="1"><br>
- <!-- Sadly, OVAL cannot do the right query (that is: rpm -q -whatprovides system-release).<br>
- Let's check the filename instead. --><br>
- <linux:filepath>/etc/redhat-release</linux:filepath><br>
- </linux:rpmverifyfile_object><br>
+ <linux:rpminfo_object id="obj_rhel_workstation" version="1"><br>
+ <linux:name>redhat-release-workstation</linux:name><br>
+ </linux:rpminfo_object><br>
<br>
+ <linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-server is version 6" id="test_rhel_server" version="1"><br>
+ <linux:object object_ref="obj_rhel_server" /><br>
+ <linux:state state_ref="state_rhel_server" /><br>
+ </linux:rpminfo_test><br>
+ <linux:rpminfo_state id="state_rhel_server" version="1"><br>
+ <linux:version operation="pattern match">^6\.\d+$</linux:version><br>
+ </linux:rpminfo_state><br>
+ <linux:rpminfo_object id="obj_rhel_server" version="1"><br>
+ <linux:name>redhat-release-server</linux:name><br>
+ </linux:rpminfo_object><br>
</def-group><br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.1<br>
<br>
_______________________________________________<br>
scap-security-guide mailing list<br>
<a href="mailto:scap-security-guide@lists.fedorahosted.org">scap-security-guide@lists.fedorahosted.org</a><br>
<a href="https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide" target="_blank">https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr"><div><div>David Smith<br></div><font size="1">Sr. Information Security Engineer<br></font></div><font size="1">Secure Innovations, LLC</font><br>
</div>
</div>