- stevesk@cvs.openbsd.org 2002/08/21 19:38:06

[openssh.git] / auth-passwd.c

diff --git a/auth-passwd.c b/auth-passwd.c
index ad3bd3552209b83d43f5d8f6eda58bc4227d0613..17bbd2ceba0db51ed7422a2450b662a13a1a1d6e 100644 (file)
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-passwd.c,v 1.26 2002/05/10 02:30:12 mouring Exp $");
+RCSID("$OpenBSD: auth-passwd.c,v 1.27 2002/05/24 16:45:16 stevesk Exp $");
 
 #include "packet.h"
 #include "log.h"
@@ -123,13 +123,6 @@ auth_password(Authctxt *authctxt, const char *password)
 #ifndef HAVE_CYGWIN
        if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
                return 0;
-#endif
-#ifdef HAVE_CYGWIN
-       /*
-        * Empty password is only possible on NT if the user has _really_
-        * an empty password and authentication is done, though.
-        */
-       if (!is_winnt)
 #endif
        if (*password == '\0' && options.permit_empty_passwd == 0)
                return 0;