From d2fa903264c8d6e44371534ad7cb6773b4006d16 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Sat, 26 Jun 2010 00:01:33 +0000
Subject:    - djm@cvs.openbsd.org 2010/06/25 08:46:17      [auth1.c
 auth2-none.c]      skip the initial check for access with an empty password
 when      PermitEmptyPasswords=no; bz#1638; ok markus@

---
 auth1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'auth1.c')

diff --git a/auth1.c b/auth1.c
index 1801661f..bf442dbf 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
-- 
cgit v1.2.1