diff options
| author | mouring <mouring> | 2004-06-22 03:37:11 +0000 |
|---|---|---|
| committer | mouring <mouring> | 2004-06-22 03:37:11 +0000 |
| commit | 633b5b82c9f324a2d84d70543a59553f8ea62a21 (patch) | |
| tree | c653d6ded716e9edbbb8296b2cf2b679b7000c5e | |
| parent | 2fd869c92cb4aa451c9a49ba7eb1e3c394f0cf80 (diff) | |
| download | openssh-633b5b82c9f324a2d84d70543a59553f8ea62a21.tar.gz | |
- (bal) [auth-passwd.c auth1.c] Clean up unused variables.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | auth-passwd.c | 2 | ||||
| -rw-r--r-- | auth1.c | 6 |
3 files changed, 7 insertions, 4 deletions
@@ -1,4 +1,5 @@ 20040622 + - (bal) [auth-passwd.c auth1.c] Clean up unused variables. - (dtucker) OpenBSD CVS Sync - djm@cvs.openbsd.org 2004/06/20 17:36:59 [ssh.c] @@ -1361,4 +1362,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3429 2004/06/22 03:27:16 dtucker Exp $ +$Id: ChangeLog,v 1.3430 2004/06/22 03:37:11 mouring Exp $ diff --git a/auth-passwd.c b/auth-passwd.c index da247df7..7a68e056 100644 --- a/auth-passwd.c +++ b/auth-passwd.c @@ -64,7 +64,9 @@ auth_password(Authctxt *authctxt, const char *password) { struct passwd * pw = authctxt->pw; int ok = authctxt->valid; +#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) static int expire_checked = 0; +#endif #ifndef HAVE_CYGWIN if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) @@ -69,7 +69,6 @@ do_authloop(Authctxt *authctxt) u_int dlen; u_int ulen; int prev, type = 0; - struct passwd *pw = authctxt->pw; debug("Attempting authentication for %s%.100s.", authctxt->valid ? "" : "illegal user ", authctxt->user); @@ -232,9 +231,10 @@ do_authloop(Authctxt *authctxt) #ifdef HAVE_CYGWIN if (authenticated && - !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, pw)) { + !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, + authctxt->pw)) { packet_disconnect("Authentication rejected for uid %d.", - pw == NULL ? -1 : pw->pw_uid); + authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); authenticated = 0; } #else |