This commit was generated by cvs2svn to compensate for changes in r94889,

which included commits to RCS files with non-trunk default branches.

2 files changed, 15 insertions, 11 deletions

diff --git a/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c b/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c
index d3d0ccc..7c39731 100644
--- a/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c
+++ b/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c
@@ -410,12 +410,12 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
 		if (status != PAM_SUCCESS)
 			return status;
 		if (!newpass || (check_max(&params, pamh, newpass) && enforce))
-			return PAM_AUTHTOK_RECOVERY_ERR;
+			return PAM_AUTHTOK_ERR;
 		reason = _passwdqc_check(&params.qc, newpass, oldpass, pw);
 		if (reason) {
 			say(pamh, PAM_ERROR_MSG, MESSAGE_WEAKPASS, reason);
 			if (enforce)
-				status = PAM_AUTHTOK_RECOVERY_ERR;
+				status = PAM_AUTHTOK_ERR;
 		}
 		return status;
 	}
@@ -469,12 +469,12 @@ retry:
 	if (randomonly) {
 		say(pamh, PAM_ERROR_MSG, getuid() != 0 ?
 		    MESSAGE_MISCONFIGURED : MESSAGE_RANDOMFAILED);
-		return PAM_AUTHTOK_RECOVERY_ERR;
+		return PAM_AUTHTOK_ERR;
 	}
 
 	status = converse(pamh, PAM_PROMPT_ECHO_OFF, PROMPT_NEWPASS1, &resp);
 	if (status == PAM_SUCCESS && (!resp || !resp->resp))
-		status = PAM_AUTHTOK_RECOVERY_ERR;
+		status = PAM_AUTHTOK_ERR;
 
 	if (status != PAM_SUCCESS) {
 		if (randompass) _pam_overwrite(randompass);
@@ -487,11 +487,11 @@ retry:
 
 	if (!newpass) {
 		if (randompass) _pam_overwrite(randompass);
-		return PAM_AUTHTOK_RECOVERY_ERR;
+		return PAM_AUTHTOK_ERR;
 	}
 
 	if (check_max(&params, pamh, newpass) && enforce) {
-		status = PAM_AUTHTOK_RECOVERY_ERR;
+		status = PAM_AUTHTOK_ERR;
 		retry_wanted = 1;
 	}
 
@@ -505,7 +505,7 @@ retry:
 		else
 			say(pamh, PAM_ERROR_MSG, MESSAGE_WEAKPASS, reason);
 		if (enforce) {
-			status = PAM_AUTHTOK_RECOVERY_ERR;
+			status = PAM_AUTHTOK_ERR;
 			retry_wanted = 1;
 		}
 	}
@@ -519,13 +519,13 @@ retry:
 				status = say(pamh,
 				    PAM_ERROR_MSG, MESSAGE_MISTYPED);
 				if (status == PAM_SUCCESS) {
-					status = PAM_AUTHTOK_RECOVERY_ERR;
+					status = PAM_AUTHTOK_ERR;
 					retry_wanted = 1;
 				}
 			}
 			_pam_drop_reply(resp, 1);
 		} else
-			status = PAM_AUTHTOK_RECOVERY_ERR;
+			status = PAM_AUTHTOK_ERR;
 	}
 
 	if (status == PAM_SUCCESS)
diff --git a/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec b/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec
index 30b5cb1..437db6f 100644
--- a/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec
+++ b/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec
@@ -1,8 +1,8 @@
-# $Id: pam_passwdqc.spec,v 1.9 2002/02/06 22:36:40 mci Exp $
+# $Id: pam_passwdqc.spec,v 1.11 2002/04/16 16:56:52 solar Exp $
 
 Summary: Pluggable password "quality check".
 Name: pam_passwdqc
-Version: 0.4
+Version: 0.5
 Release: owl1
 License: relaxed BSD and (L)GPL-compatible
 Group: System Environment/Base
@@ -35,6 +35,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/security/pam_passwdqc.so
 
 %changelog
+* Tue Apr 16 2002 Solar Designer <solar@owl.openwall.com>
+- 0.5: preliminary OpenPAM (FreeBSD-current) support in the code and related
+code cleanups (thanks to Dag-Erling Smorgrav).
+
 * Thu Feb 07 2002 Michail Litvak <mci@owl.openwall.com>
 - Enforce our new spec file conventions.