diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-31 08:49:13 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-31 08:49:13 +1100 |
commit | 8eb0fd6d6fee368ff0c3de479b0c18763fe3ea3a (patch) | |
tree | 274f73a6e3c7272b0a22892078b564561e886d37 /auth-passwd.c | |
parent | 8bdeee25f8c0215812cdcdbd24f8c5b308a7b76a (diff) |
- Fix password support on systems with a mixture of shadowed and
non-shadowed passwords (e.g. NIS). Report and fix from
HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>
Diffstat (limited to 'auth-passwd.c')
-rw-r--r-- | auth-passwd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/auth-passwd.c b/auth-passwd.c index e91893ae5..c33470300 100644 --- a/auth-passwd.c +++ b/auth-passwd.c | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | #ifndef USE_PAM | 12 | #ifndef USE_PAM |
13 | 13 | ||
14 | RCSID("$Id: auth-passwd.c,v 1.13 1999/12/29 22:48:15 damien Exp $"); | 14 | RCSID("$Id: auth-passwd.c,v 1.14 1999/12/30 21:49:13 damien Exp $"); |
15 | 15 | ||
16 | #include "packet.h" | 16 | #include "packet.h" |
17 | #include "ssh.h" | 17 | #include "ssh.h" |
@@ -76,14 +76,14 @@ auth_password(struct passwd * pw, const char *password) | |||
76 | 76 | ||
77 | #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) | 77 | #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) |
78 | spw = getspnam(pw->pw_name); | 78 | spw = getspnam(pw->pw_name); |
79 | if (spw == NULL) | 79 | if (spw != NULL) |
80 | return(0); | 80 | { |
81 | /* Check for users with no password. */ | ||
82 | if (strcmp(password, "") == 0 && strcmp(spw->sp_pwdp, "") == 0) | ||
83 | return 1; | ||
81 | 84 | ||
82 | /* Check for users with no password. */ | 85 | pw_password = spw->sp_pwdp; |
83 | if (strcmp(password, "") == 0 && strcmp(spw->sp_pwdp, "") == 0) | 86 | } |
84 | return 1; | ||
85 | |||
86 | pw_password = spw->sp_pwdp; | ||
87 | #endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */ | 87 | #endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */ |
88 | 88 | ||
89 | if (pw_password[0] != '\0') | 89 | if (pw_password[0] != '\0') |