RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) OpenBSD CVS Sync 

- otto@cvs.openbsd.org 2005/07/19 15:32:26
     [auth-passwd.c]
     auth_usercheck(3) can return NULL, so check for that. Report from
     mpech@. ok markus@
This commit is contained in:
Damien Miller 2005-07-26 21:54:11 +10:00
parent ac1910f1a5
commit 47655ee03a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,6 +1,11 @@
20050726 20050726
- (dtucker) [configure.ac] Update zlib warning message too, pointed out by - (dtucker) [configure.ac] Update zlib warning message too, pointed out by
tim@. tim@.
- (djm) OpenBSD CVS Sync
- otto@cvs.openbsd.org 2005/07/19 15:32:26
[auth-passwd.c]
auth_usercheck(3) can return NULL, so check for that. Report from
mpech@. ok markus@
20050725 20050725
- (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096. - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096.
@ -2865,4 +2870,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.3855 2005/07/26 02:00:42 dtucker Exp $ $Id: ChangeLog,v 1.3856 2005/07/26 11:54:11 djm Exp $

4
auth-passwd.c
View File

@ -36,7 +36,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth-passwd.c,v 1.33 2005/01/24 11:47:13 dtucker Exp $"); RCSID("$OpenBSD: auth-passwd.c,v 1.34 2005/07/19 15:32:26 otto Exp $");
#include "packet.h" #include "packet.h"
#include "buffer.h" #include "buffer.h"
@ -163,6 +163,8 @@ sys_auth_passwd(Authctxt *authctxt, const char *password)
as = auth_usercheck(pw->pw_name, authctxt->style, "auth-ssh", as = auth_usercheck(pw->pw_name, authctxt->style, "auth-ssh",
(char *)password); (char *)password);
if (as == NULL)
return (0);
if (auth_getstate(as) & AUTH_PWEXPIRED) { if (auth_getstate(as) & AUTH_PWEXPIRED) {
auth_close(as); auth_close(as);
disable_forwarding(); disable_forwarding();