>From e3675a72feac57701e86d2b1162d05d819010bda Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn@redhat.com>
Date: Sun, 10 Nov 2013 01:40:26 -0500
Subject: [PATCH 05/11] Updated OVAL naming for accounts_password_pam_cracklib_dcredit
 - Updated naming scheme to be consistent with accounts_password_*

---
 RHEL6/input/auxiliary/stig_overlay.xml      |    2 +-
 RHEL6/input/profiles/CS2.xml                |    2 +-
 RHEL6/input/profiles/common.xml             |    2 +-
 RHEL6/input/profiles/rht-ccp.xml            |    2 +-
 RHEL6/input/profiles/test.xml               |    2 +-
 RHEL6/input/profiles/usgcb-rhel6-server.xml |    2 +-
 RHEL6/input/system/accounts/pam.xml         |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/RHEL6/input/auxiliary/stig_overlay.xml b/RHEL6/input/auxiliary/stig_overlay.xml
index e47d427..0ab0708 100644
--- a/RHEL6/input/auxiliary/stig_overlay.xml
+++ b/RHEL6/input/auxiliary/stig_overlay.xml
@@ -129,7 +129,7 @@
 	<overlay owner="disastig" ruleid="XXXX" ownerid="RHEL-06-000054" disa="366" severity="low">
 		<title>Users must be warned 7 days in advance of password expiration.</title>
 	</overlay>
-	<overlay owner="disastig" ruleid="password_require_digits" ownerid="RHEL-06-000056" disa="194" severity="low">
+	<overlay owner="disastig" ruleid="accounts_password_pam_cracklib_dcredit" ownerid="RHEL-06-000056" disa="194" severity="low">
 		<title>The system must require passwords to contain at least one numeric character.</title>
 	</overlay>
 	<overlay owner="disastig" ruleid="password_require_uppercases" ownerid="RHEL-06-000057" disa="192" severity="low">
diff --git a/RHEL6/input/profiles/CS2.xml b/RHEL6/input/profiles/CS2.xml
index 302cf5b..b32b9d1 100644
--- a/RHEL6/input/profiles/CS2.xml
+++ b/RHEL6/input/profiles/CS2.xml
@@ -8,7 +8,7 @@
 <refine-value idref="var_accounts_minimum_age_login_defs" selector="1"/>
 <select idref="acounts_maximum_age_login_defs" selected="true"/>
 <refine-value idref="var_acounts_maximum_age_login_defs" selector="180"/>
-<select idref="password_require_digits" selected="true"/>
+<select idref="accounts_password_pam_cracklib_dcredit" selected="true"/>
 <select idref="password_require_uppercases" selected="true"/>
 <select idref="password_require_specials" selected="true"/>
 <select idref="password_require_lowercases" selected="true"/>
diff --git a/RHEL6/input/profiles/common.xml b/RHEL6/input/profiles/common.xml
index 5eda579..aa4ed08 100644
--- a/RHEL6/input/profiles/common.xml
+++ b/RHEL6/input/profiles/common.xml
@@ -52,7 +52,7 @@
 <select idref="accounts_maximum_age_login_defs" selected="true"/>
 <select idref="accounts_password_warn_age_login_defs" selected="true"/>
 <select idref="accounts_password_pam_cracklib_retry" selected="true"/>
-<select idref="password_require_digits" selected="true"/>
+<select idref="accounts_password_pam_cracklib_dcredit" selected="true"/>
 <select idref="password_require_uppercases" selected="true"/>
 <select idref="password_require_specials" selected="true"/>
 <select idref="password_require_lowercases" selected="true"/>
diff --git a/RHEL6/input/profiles/rht-ccp.xml b/RHEL6/input/profiles/rht-ccp.xml
index 959c4d0..550f3c3 100644
--- a/RHEL6/input/profiles/rht-ccp.xml
+++ b/RHEL6/input/profiles/rht-ccp.xml
@@ -55,7 +55,7 @@
 <select idref="accounts_maximum_age_login_defs" selected="true"/>
 <select idref="accounts_password_warn_age_login_defs" selected="true"/>
 <select idref="accounts_password_pam_cracklib_retry" selected="true"/>
-<select idref="password_require_digits" selected="true"/>
+<select idref="accounts_password_pam_cracklib_dcredit" selected="true"/>
 <select idref="password_require_uppercases" selected="true"/>
 <select idref="password_require_specials" selected="true"/>
 <select idref="password_require_lowercases" selected="true"/>
diff --git a/RHEL6/input/profiles/test.xml b/RHEL6/input/profiles/test.xml
index 21b5131..564dbb5 100644
--- a/RHEL6/input/profiles/test.xml
+++ b/RHEL6/input/profiles/test.xml
@@ -10,7 +10,7 @@
 <select idref="service_rsyslog_enabled" selected="true"/>
 <select idref="disable_vsftpd" selected="true"/>
 <select idref="set_selinux_state" selected="true"/>
-<select idref="password_require_digits" selected="true"/>
+<select idref="accounts_password_pam_cracklib_dcredit" selected="true"/>
 <select idref="tftpd_uses_secure_mode" selected="true"/>
 <select idref="set_system_login_banner" selected="true"/>
 <select idref="set_screensaver_inactivity_timeout" selected="true"/>
diff --git a/RHEL6/input/profiles/usgcb-rhel6-server.xml b/RHEL6/input/profiles/usgcb-rhel6-server.xml
index a736b04..8d68a5d 100644
--- a/RHEL6/input/profiles/usgcb-rhel6-server.xml
+++ b/RHEL6/input/profiles/usgcb-rhel6-server.xml
@@ -73,7 +73,7 @@
 <refine-value idref="var_password_pam_cracklib_retry" selector="3" />
 <select idref="accounts_password_pam_cracklib_retry" selected="true" />
 <refine-value idref="var_password_pam_cracklib_dcredit" selector="1" />
-<select idref="password_require_digits" selected="true" />
+<select idref="accounts_password_pam_cracklib_dcredit" selected="true" />
 <refine-value idref="var_password_pam_cracklib_ucredit" selector="1" />
 <select idref="password_require_uppercases" selected="true" />
 <refine-value idref="var_password_pam_cracklib_lcredit" selector="1" />
diff --git a/RHEL6/input/system/accounts/pam.xml b/RHEL6/input/system/accounts/pam.xml
index 2ad6609..9d8155c 100644
--- a/RHEL6/input/system/accounts/pam.xml
+++ b/RHEL6/input/system/accounts/pam.xml
@@ -267,7 +267,7 @@ Passwords with excessive repeating characters may be more vulnerable to password
 <ref nist="IA-5(c)" disa="366"/>
 </Rule>
 
-<Rule id="password_require_digits">
+<Rule id="accounts_password_pam_cracklib_dcredit">
 <title>Set Password Strength Minimum Digit Characters</title>
 <description>The pam_cracklib module's <tt>dcredit</tt> parameter controls requirements for
 usage of digits in a password. When set to a negative number, any password will be required to
-- 
1.7.1