>From 8e5c83b56ffdf99309619ae4d960e0bef01c1ee5 Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn@redhat.com>
Date: Fri, 29 Mar 2013 20:13:53 -0400
Subject: [PATCH 21/21] Renamed OVAL no_empty_passwords.xml to match XCCDF rule name
 Renamed OVAL no_empty_passwords.xml to match XCCDF rule name

---
 RHEL6/input/checks/accounts_pam_no_nullok.xml      |   23 --------------------
 RHEL6/input/checks/no_empty_passwords.xml          |   23 ++++++++++++++++++++
 .../accounts/restrictions/password_storage.xml     |    2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 RHEL6/input/checks/accounts_pam_no_nullok.xml
 create mode 100644 RHEL6/input/checks/no_empty_passwords.xml

diff --git a/RHEL6/input/checks/accounts_pam_no_nullok.xml b/RHEL6/input/checks/accounts_pam_no_nullok.xml
deleted file mode 100644
index eed8a41..0000000
--- a/RHEL6/input/checks/accounts_pam_no_nullok.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<def-group>
-  <definition class="compliance" id="accounts_pam_no_nullok" version="1">
-    <metadata>
-      <title>No nullok Option in /etc/pam.d/system-auth</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The file /etc/pam.d/system-auth should not contain the nullok option</description>
-    </metadata>
-    <criteria>
-      <criterion comment="make sure the nullok option is not used in /etc/pam.d/system-auth" test_ref="test_accounts_pam_no_nullok" />
-    </criteria>
-  </definition>
-  <ind:textfilecontent54_test check="all" check_existence="none_exist" comment="make sure nullok is not used in /etc/pam.d/system-auth" id="test_accounts_pam_no_nullok" version="1">
-    <ind:object object_ref="object_accounts_pam_no_nullok" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object id="object_accounts_pam_no_nullok" version="1">
-    <ind:path>/etc/pam.d/</ind:path>
-    <ind:filename>system-auth</ind:filename>
-    <ind:pattern operation="pattern match">\s*nullok\s*</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-</def-group>
diff --git a/RHEL6/input/checks/no_empty_passwords.xml b/RHEL6/input/checks/no_empty_passwords.xml
new file mode 100644
index 0000000..eed8a41
--- /dev/null
+++ b/RHEL6/input/checks/no_empty_passwords.xml
@@ -0,0 +1,23 @@
+<def-group>
+  <definition class="compliance" id="accounts_pam_no_nullok" version="1">
+    <metadata>
+      <title>No nullok Option in /etc/pam.d/system-auth</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>The file /etc/pam.d/system-auth should not contain the nullok option</description>
+    </metadata>
+    <criteria>
+      <criterion comment="make sure the nullok option is not used in /etc/pam.d/system-auth" test_ref="test_accounts_pam_no_nullok" />
+    </criteria>
+  </definition>
+  <ind:textfilecontent54_test check="all" check_existence="none_exist" comment="make sure nullok is not used in /etc/pam.d/system-auth" id="test_accounts_pam_no_nullok" version="1">
+    <ind:object object_ref="object_accounts_pam_no_nullok" />
+  </ind:textfilecontent54_test>
+  <ind:textfilecontent54_object id="object_accounts_pam_no_nullok" version="1">
+    <ind:path>/etc/pam.d/</ind:path>
+    <ind:filename>system-auth</ind:filename>
+    <ind:pattern operation="pattern match">\s*nullok\s*</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+</def-group>
diff --git a/RHEL6/input/system/accounts/restrictions/password_storage.xml b/RHEL6/input/system/accounts/restrictions/password_storage.xml
index 333e9a5..95000cc 100644
--- a/RHEL6/input/system/accounts/restrictions/password_storage.xml
+++ b/RHEL6/input/system/accounts/restrictions/password_storage.xml
@@ -37,7 +37,7 @@ empty passwords should never be used in operational
 environments.
 </rationale>
 <ident cce="27038-9" />
-<oval id="accounts_pam_no_nullok" />
+<oval id="no_empty_passwords" />
 <ref nist="IA-5" />
 <tested by="DS" on="20121024"/>
 </Rule>
-- 
1.7.1