1 files changed, 4 insertions, 2 deletions

diff --git a/auth-pam.c b/auth-pam.c
index 67f6ac0d8..36a719fbb 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -47,7 +47,7 @@
 
 /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
 #include "includes.h"
-RCSID("$Id: auth-pam.c,v 1.109 2004/07/01 02:38:15 dtucker Exp $");
+RCSID("$Id: auth-pam.c,v 1.110 2004/07/01 04:00:15 dtucker Exp $");
 
 #ifdef USE_PAM
 #if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -356,6 +356,8 @@ sshpam_thread(void *ctxtp)
         struct pam_ctxt *ctxt = ctxtp;
         Buffer buffer;
         struct pam_conv sshpam_conv;
+        int flags = (options.permit_empty_passwd == 0 ?
+            PAM_DISALLOW_NULL_AUTHTOK : 0);
 #ifndef USE_POSIX_THREADS
         extern char **environ;
         char **env_from_pam;
@@ -378,7 +380,7 @@ sshpam_thread(void *ctxtp)
             (const void *)&sshpam_conv);
         if (sshpam_err != PAM_SUCCESS)
                 goto auth_fail;
-        sshpam_err = pam_authenticate(sshpam_handle, 0);
+        sshpam_err = pam_authenticate(sshpam_handle, flags);
         if (sshpam_err != PAM_SUCCESS)
                 goto auth_fail;