From 706e7a9cf93fad3a8b0b7cd524c44d9e17e64da7 Mon Sep 17 00:00:00 2001
From: Kevin Steves <stevesk@pobox.com>
Date: Mon, 23 Apr 2001 18:38:37 +0000
Subject: [PATCH]  - (stevesk) auth-pam.c: use PERMIT_NO_PASSWD

---
 ChangeLog  | 3 ++-
 auth-pam.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 19fe40b59..3773ac9b9 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 91854a400..2b3308a97 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 @@ int auth_pam_password(struct passwd *pw, const char *password)
 	/* 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;