summaryrefslogtreecommitdiffstats
path: root/auth-pam.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-01-22 15:42:26 +1100
committerDamien Miller <djm@mindrot.org>2003-01-22 15:42:26 +1100
commit2101bfc4e1dbe1dc475d71158b1c24c6d2e2e412 (patch)
treeb9012d184941802b5f9fa188a3a530410513c755 /auth-pam.c
parent53d81483f0bcea8af2207583bb6e83c187d522fc (diff)
- (djm) Reorganise PAM & SIA password handling to eliminate some common code
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 99b03f45..fe9570f9 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -38,7 +38,7 @@ extern char *__progname;
extern int use_privsep;
-RCSID("$Id: auth-pam.c,v 1.54 2002/07/28 20:24:08 stevesk Exp $");
+RCSID("$Id: auth-pam.c,v 1.55 2003/01/22 04:42:26 djm Exp $");
#define NEW_AUTHTOK_MSG \
"Warning: Your password has expired, please change it now."
@@ -210,14 +210,6 @@ int auth_pam_password(Authctxt *authctxt, const char *password)
do_pam_set_conv(&conv);
- /* deny if no user. */
- if (pw == NULL)
- return 0;
- if (pw->pw_uid == 0 && options.permit_root_login == PERMIT_NO_PASSWD)
- return 0;
- if (*password == '\0' && options.permit_empty_passwd == 0)
- return 0;
-
__pampasswd = password;
pamstate = INITIAL_LOGIN;