summaryrefslogtreecommitdiff
path: root/auth-pam.c
diff options
context:
space:
mode:
Diffstat (limited to 'auth-pam.c')
-rw-r--r--auth-pam.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/auth-pam.c b/auth-pam.c
index 99b03f45b..fe9570f92 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -38,7 +38,7 @@ extern char *__progname;
38 38
39extern int use_privsep; 39extern int use_privsep;
40 40
41RCSID("$Id: auth-pam.c,v 1.54 2002/07/28 20:24:08 stevesk Exp $"); 41RCSID("$Id: auth-pam.c,v 1.55 2003/01/22 04:42:26 djm Exp $");
42 42
43#define NEW_AUTHTOK_MSG \ 43#define NEW_AUTHTOK_MSG \
44 "Warning: Your password has expired, please change it now." 44 "Warning: Your password has expired, please change it now."
@@ -210,14 +210,6 @@ int auth_pam_password(Authctxt *authctxt, const char *password)
210 210
211 do_pam_set_conv(&conv); 211 do_pam_set_conv(&conv);
212 212
213 /* deny if no user. */
214 if (pw == NULL)
215 return 0;
216 if (pw->pw_uid == 0 && options.permit_root_login == PERMIT_NO_PASSWD)
217 return 0;
218 if (*password == '\0' && options.permit_empty_passwd == 0)
219 return 0;
220
221 __pampasswd = password; 213 __pampasswd = password;
222 214
223 pamstate = INITIAL_LOGIN; 215 pamstate = INITIAL_LOGIN;