diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | auth-passwd.c | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -7,6 +7,9 @@ | |||
7 | keysize warnings talk about identity files | 7 | keysize warnings talk about identity files |
8 | - [packet.c] | 8 | - [packet.c] |
9 | "Connection closed by x.x.x.x": fatal() -> log() | 9 | "Connection closed by x.x.x.x": fatal() -> log() |
10 | - Correctly handle empty passwords in shadow file. Patch from: | ||
11 | "Chris, the Young One" <cky@pobox.com> | ||
12 | - Released 1.2.1pre18 | ||
10 | 13 | ||
11 | 19991215 | 14 | 19991215 |
12 | - Integrated patchs from Juergen Keil <jk@tools.de> | 15 | - Integrated patchs from Juergen Keil <jk@tools.de> |
diff --git a/auth-passwd.c b/auth-passwd.c index efae0fd2b..d197840e8 100644 --- a/auth-passwd.c +++ b/auth-passwd.c | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | #ifndef HAVE_PAM | 12 | #ifndef HAVE_PAM |
13 | 13 | ||
14 | RCSID("$Id: auth-passwd.c,v 1.8 1999/12/06 00:47:28 damien Exp $"); | 14 | RCSID("$Id: auth-passwd.c,v 1.9 1999/12/16 04:10:45 damien Exp $"); |
15 | 15 | ||
16 | #include "packet.h" | 16 | #include "packet.h" |
17 | #include "ssh.h" | 17 | #include "ssh.h" |
@@ -76,6 +76,10 @@ auth_password(struct passwd * pw, const char *password) | |||
76 | if ((spw->sp_namp == NULL) || (strcmp(pw->pw_name, spw->sp_namp) != 0)) | 76 | if ((spw->sp_namp == NULL) || (strcmp(pw->pw_name, spw->sp_namp) != 0)) |
77 | fatal("Shadow lookup returned garbage."); | 77 | fatal("Shadow lookup returned garbage."); |
78 | 78 | ||
79 | /* Check for users with no password. */ | ||
80 | if (strcmp(password, "") == 0 && strcmp(spw->sp_pwdp, "") == 0) | ||
81 | return 1; | ||
82 | |||
79 | if (strlen(spw->sp_pwdp) < 3) | 83 | if (strlen(spw->sp_pwdp) < 3) |
80 | return(0); | 84 | return(0); |
81 | 85 | ||