<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">&lt;<a href="mailto:shawn@redhat.com" target="_blank">shawn@redhat.com</a>&gt;</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 &lt;<a href="mailto:shawn@redhat.com">shawn@redhat.com</a>&gt;<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>
     &lt;criteria&gt;<br>
       &lt;criterion comment=&quot;Installed operating system is part of the unix family&quot;<br>
       test_ref=&quot;test_unix_family&quot; /&gt;<br>
-      &lt;criterion comment=&quot;Red Hat Enterprise Linux 6 is installed&quot;<br>
-      test_ref=&quot;test_rhel_6&quot; /&gt;<br>
+      &lt;criteria operator=&quot;OR&quot;&gt;<br>
+        &lt;criterion comment=&quot;Red Hat Enterprise Linux 6 Workstation is installed&quot;<br>
+        test_ref=&quot;test_rhel_workstation&quot; /&gt;<br>
+        &lt;criterion comment=&quot;Red Hat Enterprise Linux 6 Server is installed&quot;<br>
+        test_ref=&quot;test_rhel_server&quot; /&gt;<br>
+      &lt;/criteria&gt;<br>
     &lt;/criteria&gt;<br>
   &lt;/definition&gt;<br>
<br>
@@ -28,18 +32,25 @@<br>
   &lt;/ind:family_state&gt;<br>
   &lt;ind:family_object id=&quot;obj_unix_family&quot; version=&quot;1&quot; /&gt;<br>
<br>
-  &lt;linux:rpminfo_test check=&quot;all&quot; check_existence=&quot;at_least_one_exists&quot; comment=&quot;redhat-release-* is version 6&quot; id=&quot;test_rhel_6&quot; version=&quot;1&quot;&gt;<br>
-    &lt;linux:object object_ref=&quot;obj_rhel_release&quot; /&gt;<br>
-    &lt;linux:state state_ref=&quot;state_rhel_6&quot; /&gt;<br>
+  &lt;linux:rpminfo_test check=&quot;all&quot; check_existence=&quot;at_least_one_exists&quot; comment=&quot;redhat-release-workstation is version 6&quot; id=&quot;test_rhel_workstation&quot; version=&quot;1&quot;&gt;<br>

+    &lt;linux:object object_ref=&quot;obj_rhel_workstation&quot; /&gt;<br>
+    &lt;linux:state state_ref=&quot;state_rhel_workstation&quot; /&gt;<br>
   &lt;/linux:rpminfo_test&gt;<br>
-  &lt;linux:rpminfo_state id=&quot;state_rhel_6&quot; version=&quot;1&quot;&gt;<br>
-    &lt;linux:name operation=&quot;pattern match&quot;&gt;^redhat-release&lt;/linux:name&gt;<br>
-    &lt;linux:version operation=&quot;pattern match&quot;&gt;^6[^\d]&lt;/linux:version&gt;<br>
+  &lt;linux:rpminfo_state id=&quot;state_rhel_workstation&quot; version=&quot;1&quot;&gt;<br>
+    &lt;linux:version operation=&quot;pattern match&quot;&gt;^6\.\d+$&lt;/linux:version&gt;<br>
   &lt;/linux:rpminfo_state&gt;<br>
-  &lt;linux:rpmverifyfile_object id=&quot;obj_rhel_release&quot; version=&quot;1&quot;&gt;<br>
-    &lt;!-- Sadly, OVAL cannot do the right query (that is: rpm -q -whatprovides system-release).<br>
-         Let&#39;s check the filename instead. --&gt;<br>
-    &lt;linux:filepath&gt;/etc/redhat-release&lt;/linux:filepath&gt;<br>
-  &lt;/linux:rpmverifyfile_object&gt;<br>
+  &lt;linux:rpminfo_object id=&quot;obj_rhel_workstation&quot; version=&quot;1&quot;&gt;<br>
+    &lt;linux:name&gt;redhat-release-workstation&lt;/linux:name&gt;<br>
+  &lt;/linux:rpminfo_object&gt;<br>
<br>
+  &lt;linux:rpminfo_test check=&quot;all&quot; check_existence=&quot;at_least_one_exists&quot; comment=&quot;redhat-release-server is version 6&quot; id=&quot;test_rhel_server&quot; version=&quot;1&quot;&gt;<br>
+    &lt;linux:object object_ref=&quot;obj_rhel_server&quot; /&gt;<br>
+    &lt;linux:state state_ref=&quot;state_rhel_server&quot; /&gt;<br>
+  &lt;/linux:rpminfo_test&gt;<br>
+  &lt;linux:rpminfo_state id=&quot;state_rhel_server&quot; version=&quot;1&quot;&gt;<br>
+    &lt;linux:version operation=&quot;pattern match&quot;&gt;^6\.\d+$&lt;/linux:version&gt;<br>
+  &lt;/linux:rpminfo_state&gt;<br>
+  &lt;linux:rpminfo_object id=&quot;obj_rhel_server&quot; version=&quot;1&quot;&gt;<br>
+    &lt;linux:name&gt;redhat-release-server&lt;/linux:name&gt;<br>
+  &lt;/linux:rpminfo_object&gt;<br>
 &lt;/def-group&gt;<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>