- (djm) Unbreak root password auth. Spotted by dtucker@zip.com.au

2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f6a07fd91..300552af3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20030130
+ - (djm) Unbreak root password auth. Spotted by dtucker@zip.com.au
+
 200301028
  - (djm) Search libposix4 and librt for nanosleep. From dtucker@zip.com.au 
    and openssh-unix-dev@thewrittenword.com 
@@ -1083,4 +1086,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2589 2003/01/28 00:33:42 djm Exp $
+$Id: ChangeLog,v 1.2590 2003/01/29 23:20:56 djm Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index d419fa0d2..9901d4842 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -117,7 +117,7 @@ auth_password(Authctxt *authctxt, const char *password)
         if (pw == NULL)
                 return 0;
 #ifndef HAVE_CYGWIN
-       if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_NO_PASSWD)
+       if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
                 return 0;
 #endif
         if (*password == '\0' && options.permit_empty_passwd == 0)