tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 16:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (bal) [auth-passwd.c auth1.c] Clean up unused variables.

Browse Source
This commit is contained in:
Ben Lindstrom 2004-06-22 03:37:11 +00:00
parent 59bf4a9bd4
commit e35bf12eeb
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,4 +1,5 @@
20040622 20040622
- (bal) [auth-passwd.c auth1.c] Clean up unused variables.
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2004/06/20 17:36:59 - djm@cvs.openbsd.org 2004/06/20 17:36:59
[ssh.c] [ssh.c]
@ -1361,4 +1362,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

2
auth-passwd.c
View File

@ -64,7 +64,9 @@ auth_password(Authctxt *authctxt, const char *password)
{ {
struct passwd * pw = authctxt->pw; struct passwd * pw = authctxt->pw;
int ok = authctxt->valid; int ok = authctxt->valid;
#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
static int expire_checked = 0; static int expire_checked = 0;
#endif
#ifndef HAVE_CYGWIN #ifndef HAVE_CYGWIN
if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)

6
auth1.c
View File

@ -69,7 +69,6 @@ do_authloop(Authctxt *authctxt)
u_int dlen; u_int dlen;
u_int ulen; u_int ulen;
int prev, type = 0; int prev, type = 0;
struct passwd *pw = authctxt->pw;
debug("Attempting authentication for %s%.100s.", debug("Attempting authentication for %s%.100s.",
authctxt->valid ? "" : "illegal user ", authctxt->user); authctxt->valid ? "" : "illegal user ", authctxt->user);
@ -232,9 +231,10 @@ do_authloop(Authctxt *authctxt)
#ifdef HAVE_CYGWIN #ifdef HAVE_CYGWIN
if (authenticated && 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.", packet_disconnect("Authentication rejected for uid %d.",
pw == NULL ? -1 : pw->pw_uid); authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid);
authenticated = 0; authenticated = 0;
} }
#else #else