- (stevesk) auth-pam.c: use PERMIT_NO_PASSWD
diff --git a/ChangeLog b/ChangeLog
index 19fe40b..3773ac9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
[ssh-keygen.1 ssh.1 sshd.8]
document hostbased and other cleanup
- (stevesk) start_pam() doesn't use DNS now for sshd -u0.
+ - (stevesk) auth-pam.c: use PERMIT_NO_PASSWD
20010422
- OpenBSD CVS Sync
@@ -5232,4 +5233,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1162 2001/04/23 17:55:26 stevesk Exp $
+$Id: ChangeLog,v 1.1163 2001/04/23 18:38:37 stevesk Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 91854a4..2b3308a 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -35,7 +35,7 @@
extern char *__progname;
-RCSID("$Id: auth-pam.c,v 1.36 2001/04/23 17:28:29 stevesk Exp $");
+RCSID("$Id: auth-pam.c,v 1.37 2001/04/23 18:38:37 stevesk Exp $");
#define NEW_AUTHTOK_MSG \
"Warning: Your password has expired, please change it now"
@@ -209,7 +209,7 @@
/* deny if no user. */
if (pw == NULL)
return 0;
- if (pw->pw_uid == 0 && options.permit_root_login == 2)
+ if (pw->pw_uid == 0 && options.permit_root_login == PERMIT_NO_PASSWD)
return 0;
if (*password == '\0' && options.permit_empty_passwd == 0)
return 0;