2 files changed, 3 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index f71b2d030..b6492b0d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
    - deraadt@cvs.openbsd.org 2002/06/17 06:05:56
      [scp.c]
      make usage like man page
+ - (bal) Cygwin special handling of empty passwords wrong.  Patch by
+   vinschen@redhat.com
 
 20020613
  - (bal) typo of setgroup for cygwin.  Patch by vinschen@redhat.com
@@ -951,4 +953,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2223 2002/06/21 00:10:58 mouring Exp $
+$Id: ChangeLog,v 1.2224 2002/06/21 00:26:22 mouring Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index ad3bd3552..8107e723f 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -124,13 +124,6 @@ auth_password(Authctxt *authctxt, const char *password)
        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;
 #ifdef KRB5