From d9891c59faf835d912219e158dbe2af813a25de4 Mon Sep 17 00:00:00 2001 From: mouring Date: Mon, 6 May 2002 23:06:08 +0000 Subject: [PATCH] - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue --- ChangeLog | 3 +++ auth-passwd.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 157509e3..4eb5b2b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +20020506 + - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue + 20020501 - (djm) Import OpenBSD regression tests. Requires BSD make to run - (djm) Fix readpassphase compilation for systems which have it diff --git a/auth-passwd.c b/auth-passwd.c index 58c11364..896f1c26 100644 --- a/auth-passwd.c +++ b/auth-passwd.c @@ -36,7 +36,7 @@ */ #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 "log.h" @@ -90,11 +90,11 @@ int auth_password(Authctxt *authctxt, const char *password) { #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 auth_pam_password(authctxt, password); #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 auth_sia_password(authctxt, password); #else @@ -131,7 +131,7 @@ auth_password(Authctxt *authctxt, const char *password) */ if (!is_winnt) #endif - if (*password == '\0' && options.permit_empty_passwd == 0) + if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) return 0; #ifdef KRB5 if (options.kerberos_authentication == 1) { -- 2.45.2