- (stevesk) auth-pam.c: use PERMIT_NO_PASSWD

diff --git a/ChangeLog b/ChangeLog
index 03dbee8c93b646b0ffb2d2d81838706f63fc925d..071bc07049f6ea6023190da20a2bea3a4ca3dcd6 100644 (file)
--- 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

diff --git a/auth-pam.c b/auth-pam.c
index be9a102282153b288f683ae1e6d4b0de5ef3ec2c..be783f47c021d7de918415c41faa3ae8d62e5596 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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;