diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | auth-pam.c | 5 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20011109 | ||
2 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) | ||
3 | if permit_empty_passwd == 0 so null password check cannot be bypassed. | ||
4 | jayaraj@amritapuri.com OpenBSD bug 2168 | ||
5 | |||
1 | 20011103 | 6 | 20011103 |
2 | - (tim) [ contrib/caldera/openssh.spec contrib/caldera/sshd.init] Updates | 7 | - (tim) [ contrib/caldera/openssh.spec contrib/caldera/sshd.init] Updates |
3 | from Raymund Will <ray@caldera.de> | 8 | from Raymund Will <ray@caldera.de> |
@@ -6801,4 +6806,4 @@ | |||
6801 | - Wrote replacements for strlcpy and mkdtemp | 6806 | - Wrote replacements for strlcpy and mkdtemp |
6802 | - Released 1.0pre1 | 6807 | - Released 1.0pre1 |
6803 | 6808 | ||
6804 | $Id: ChangeLog,v 1.1631 2001/11/03 19:09:32 tim Exp $ | 6809 | $Id: ChangeLog,v 1.1632 2001/11/09 20:22:16 stevesk Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index 29d356674..0132e47bd 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | extern char *__progname; | 36 | extern char *__progname; |
37 | 37 | ||
38 | RCSID("$Id: auth-pam.c,v 1.40 2001/10/28 17:32:38 stevesk Exp $"); | 38 | RCSID("$Id: auth-pam.c,v 1.41 2001/11/09 20:22:17 stevesk Exp $"); |
39 | 39 | ||
40 | #define NEW_AUTHTOK_MSG \ | 40 | #define NEW_AUTHTOK_MSG \ |
41 | "Warning: Your password has expired, please change it now" | 41 | "Warning: Your password has expired, please change it now" |
@@ -217,7 +217,8 @@ int auth_pam_password(struct passwd *pw, const char *password) | |||
217 | __pampasswd = password; | 217 | __pampasswd = password; |
218 | 218 | ||
219 | pamstate = INITIAL_LOGIN; | 219 | pamstate = INITIAL_LOGIN; |
220 | pam_retval = do_pam_authenticate(0); | 220 | pam_retval = do_pam_authenticate( |
221 | options.permit_empty_passwd == 0 ? PAM_DISALLOW_NULL_AUTHTOK : 0); | ||
221 | if (pam_retval == PAM_SUCCESS) { | 222 | if (pam_retval == PAM_SUCCESS) { |
222 | debug("PAM Password authentication accepted for " | 223 | debug("PAM Password authentication accepted for " |
223 | "user \"%.100s\"", pw->pw_name); | 224 | "user \"%.100s\"", pw->pw_name); |