diff options
| author | des <des@FreeBSD.org> | 2002-06-23 14:01:54 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-23 14:01:54 +0000 |
| commit | 610201f50fdb0594e9885594b69e4ee69c71dd08 (patch) | |
| tree | b7e89b45c0327694bc87ec94464fd0a685e1ef1d /crypto/openssh/auth-passwd.c | |
| parent | f58c4e7f5e1985bae7ed77fb0e8b2766eb4824e9 (diff) | |
| download | FreeBSD-src-610201f50fdb0594e9885594b69e4ee69c71dd08.zip FreeBSD-src-610201f50fdb0594e9885594b69e4ee69c71dd08.tar.gz | |
Vendor import of OpenSSH 3.3.
Diffstat (limited to 'crypto/openssh/auth-passwd.c')
| -rw-r--r-- | crypto/openssh/auth-passwd.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/crypto/openssh/auth-passwd.c b/crypto/openssh/auth-passwd.c index 915991f..d0295fb 100644 --- a/crypto/openssh/auth-passwd.c +++ b/crypto/openssh/auth-passwd.c @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-passwd.c,v 1.24 2002/03/04 12:43:06 markus Exp $"); +RCSID("$OpenBSD: auth-passwd.c,v 1.27 2002/05/24 16:45:16 stevesk Exp $"); #include "packet.h" #include "log.h" @@ -54,7 +54,6 @@ int auth_password(Authctxt *authctxt, const char *password) { struct passwd * pw = authctxt->pw; - char *encrypted_password; /* deny if no user. */ if (pw == NULL) @@ -85,14 +84,20 @@ auth_password(Authctxt *authctxt, const char *password) return 0; else return 1; -#endif +#else /* Check for users with no password. */ if (strcmp(password, "") == 0 && strcmp(pw->pw_passwd, "") == 0) return 1; - /* Encrypt the candidate password using the proper salt. */ - encrypted_password = crypt(password, - (pw->pw_passwd[0] && pw->pw_passwd[1]) ? pw->pw_passwd : "xx"); - - /* Authentication is accepted if the encrypted passwords are identical. */ - return (strcmp(encrypted_password, pw->pw_passwd) == 0); + else { + /* Encrypt the candidate password using the proper salt. */ + char *encrypted_password = crypt(password, + (pw->pw_passwd[0] && pw->pw_passwd[1]) ? + pw->pw_passwd : "xx"); + /* + * Authentication is accepted if the encrypted passwords + * are identical. + */ + return (strcmp(encrypted_password, pw->pw_passwd) == 0); + } +#endif } |
