summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-01-19 06:10:29 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-01-19 06:10:29 +0000
commit5dc81502cbac042e3e66e9f31bd932623ca43e31 (patch)
tree78304c37cc7358a3b62e0638c5e11f5c51166a5f
parentb100ec95429daa986cb31834e462083adc22e8b6 (diff)
- (bal) Minor cygwin patch to auth1.c. Suggested by djm.
-rw-r--r--ChangeLog1
-rw-r--r--auth1.c7
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a87714da..95697dfc 100644
--- 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 e990ff57..2df2de89 100644
--- 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