merge 5.6p1

1 files changed, 2 insertions, 2 deletions

diff --git a/auth1.c b/auth1.c
index 1801661fd..bf442dbf6 100644
--- a/auth1.c
+++ b/auth1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth1.c,v 1.73 2008/07/04 23:30:16 djm Exp $ */
+/* $OpenBSD: auth1.c,v 1.74 2010/06/25 08:46:17 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -244,7 +244,7 @@ do_authloop(Authctxt *authctxt)
             authctxt->valid ? "" : "invalid user ", authctxt->user);
 
         /* If the user has no password, accept authentication immediately. */
-        if (options.password_authentication &&
+        if (options.permit_empty_passwd && options.password_authentication &&
 #ifdef KRB5
             (!options.kerberos_authentication || options.kerberos_or_local_passwd) &&
 #endif