- (bal) Minor cygwin patch to auth1.c. Suggested by djm.

diff --git a/ChangeLog b/ChangeLog
index a87714da7162eb634b0c925a60e00fce2de21720..95697dfcc1c21694eedb2eca244d32dab06f21e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@
  - (djm) Merge patch from Tim Waugh (via Nalin Dahyabhai <nalin@redhat.com>)
    to fix NULL pointer deref and fake authloop breakage in PAM code.
  - (bal) Updated contrib/cygwin/ by Corinna Vinschen <vinschen@redhat.com>
+ - (bal) Minor cygwin patch to auth1.c.  Suggested by djm.
  
 20010118
  - (bal) Super Sized OpenBSD Resync

diff --git a/auth1.c b/auth1.c
index e990ff57edaf4d24eb9986ee224eec999659053f..2df2de897b9c543db1f9a9ae7b1cfa5a15532575 100644 (file)
--- a/auth1.c
+++ b/auth1.c
@@ -329,13 +329,12 @@ do_authloop(Authctxt *authctxt)
                        (int)pw->pw_uid);
                        authenticated = 0;
                }
-#endif
-
+#else
                /* Special handling for root */
                if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed())
                        authenticated = 0;
-
-#ifdef USE_PAM                 /* ISSUE: Right place? */
+#endif
+#ifdef USE_PAM                 
                if (authenticated && !do_pam_account(pw->pw_name, client_user))
                        authenticated = 0;
 #endif