From 5dc81502cbac042e3e66e9f31bd932623ca43e31 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Fri, 19 Jan 2001 06:10:29 +0000 Subject: - (bal) Minor cygwin patch to auth1.c. Suggested by djm. --- ChangeLog | 1 + auth1.c | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a87714da7..95697dfcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ - (djm) Merge patch from Tim Waugh (via Nalin Dahyabhai ) to fix NULL pointer deref and fake authloop breakage in PAM code. - (bal) Updated contrib/cygwin/ by Corinna Vinschen + - (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 e990ff57e..2df2de897 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 -- cgit v1.2.3