RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-03-01 04:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue

Browse Source
This commit is contained in:
Ben Lindstrom 2002-05-06 23:06:08 +00:00
parent 804357ace9
commit 532bbdb99b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,6 @@
20020506
- (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue
20020501 20020501
- (djm) Import OpenBSD regression tests. Requires BSD make to run - (djm) Import OpenBSD regression tests. Requires BSD make to run
- (djm) Fix readpassphase compilation for systems which have it - (djm) Fix readpassphase compilation for systems which have it
@ -525,4 +528,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2091 2002/05/01 12:00:22 djm Exp $ $Id: ChangeLog,v 1.2092 2002/05/06 23:06:08 mouring Exp $

8
auth-passwd.c
View File

@ -36,7 +36,7 @@
*/ */
#include "includes.h" #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.25 2002/05/06 23:00:59 mouring Exp $");
#include "packet.h" #include "packet.h"
#include "log.h" #include "log.h"
@ -90,11 +90,11 @@ int
auth_password(Authctxt *authctxt, const char *password) auth_password(Authctxt *authctxt, const char *password)
{ {
#if defined(USE_PAM) #if defined(USE_PAM)
if (*password == '\0' && options.permit_empty_passwd == 0) if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0)
return 0; return 0;
return auth_pam_password(authctxt, password); return auth_pam_password(authctxt, password);
#elif defined(HAVE_OSF_SIA) #elif defined(HAVE_OSF_SIA)
if (*password == '\0' && options.permit_empty_passwd == 0) if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0)
return 0; return 0;
return auth_sia_password(authctxt, password); return auth_sia_password(authctxt, password);
#else #else
@ -131,7 +131,7 @@ auth_password(Authctxt *authctxt, const char *password)
*/ */
if (!is_winnt) if (!is_winnt)
#endif #endif
if (*password == '\0' && options.permit_empty_passwd == 0) if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0)
return 0; return 0;
#ifdef KRB5 #ifdef KRB5
if (options.kerberos_authentication == 1) { if (options.kerberos_authentication == 1) {