diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-passwd.c | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20030130 | ||
2 | - (djm) Unbreak root password auth. Spotted by dtucker@zip.com.au | ||
3 | |||
1 | 200301028 | 4 | 200301028 |
2 | - (djm) Search libposix4 and librt for nanosleep. From dtucker@zip.com.au | 5 | - (djm) Search libposix4 and librt for nanosleep. From dtucker@zip.com.au |
3 | and openssh-unix-dev@thewrittenword.com | 6 | and openssh-unix-dev@thewrittenword.com |
@@ -1083,4 +1086,4 @@ | |||
1083 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1086 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1084 | ok provos@ | 1087 | ok provos@ |
1085 | 1088 | ||
1086 | $Id: ChangeLog,v 1.2589 2003/01/28 00:33:42 djm Exp $ | 1089 | $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) | |||
117 | if (pw == NULL) | 117 | if (pw == NULL) |
118 | return 0; | 118 | return 0; |
119 | #ifndef HAVE_CYGWIN | 119 | #ifndef HAVE_CYGWIN |
120 | if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_NO_PASSWD) | 120 | if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) |
121 | return 0; | 121 | return 0; |
122 | #endif | 122 | #endif |
123 | if (*password == '\0' && options.permit_empty_passwd == 0) | 123 | if (*password == '\0' && options.permit_empty_passwd == 0) |