tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [auth-passwd.c openbsd-compat/port-aix.c] Don't call 

disable_forwarding() from compat library. Prevent linker errrors trying
   to resolve it for binaries other than sshd.  ok djm@
This commit is contained in:
Darren Tucker 2005-02-09 17:08:23 +11:00
parent 96d4710e38
commit 92170a8626
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -18,6 +18,11 @@
- dtucker@cvs.openbsd.org 2005/02/08 22:24:57 - dtucker@cvs.openbsd.org 2005/02/08 22:24:57
[sshd.c] [sshd.c]
Provide reason in error message if getnameinfo fails; ok markus@ Provide reason in error message if getnameinfo fails; ok markus@
- (dtucker) [auth-passwd.c openbsd-compat/port-aix.c] Don't call
disable_forwarding() from compat library. Prevent linker errrors trying
to resolve it for binaries other than sshd. ok djm@
when
20050208 20050208
- (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the
@ -2107,4 +2112,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.3644 2005/02/08 22:53:48 dtucker Exp $ $Id: ChangeLog,v 1.3645 2005/02/09 06:08:23 dtucker Exp $

12
auth-passwd.c
View File

@ -73,7 +73,7 @@ int
auth_password(Authctxt *authctxt, const char *password) auth_password(Authctxt *authctxt, const char *password)
{ {
struct passwd * pw = authctxt->pw; struct passwd * pw = authctxt->pw;
int ok = authctxt->valid; int result, ok = authctxt->valid;
#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
static int expire_checked = 0; static int expire_checked = 0;
#endif #endif
@ -110,14 +110,14 @@ auth_password(Authctxt *authctxt, const char *password)
#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
if (!expire_checked) { if (!expire_checked) {
expire_checked = 1; expire_checked = 1;
if (auth_shadow_pwexpired(authctxt)) { if (auth_shadow_pwexpired(authctxt))
disable_forwarding();
authctxt->force_pwchange = 1; authctxt->force_pwchange = 1;
}
} }
#endif #endif
result = sys_auth_passwd(authctxt, password);
return (sys_auth_passwd(authctxt, password) && ok); if (authctxt->force_pwchange)
disable_forwarding();
return (result && ok);
} }
#ifdef BSD_AUTH #ifdef BSD_AUTH

1
openbsd-compat/port-aix.c
View File

@ -196,7 +196,6 @@ sys_auth_passwd(Authctxt *ctxt, const char *password)
break; break;
case 1: /* expired, password change required */ case 1: /* expired, password change required */
ctxt->force_pwchange = 1; ctxt->force_pwchange = 1;
disable_forwarding();
break; break;
default: /* user can't change(2) or other error (-1) */ default: /* user can't change(2) or other error (-1) */
logit("Password can't be changed for user %s: %.100s", logit("Password can't be changed for user %s: %.100s",