- (djm) Fix early exit for root auth success when UsePAM=yes and

PermitRootLogin=no
2003-11-18 10:45:20 +11:00 · 2003-11-18 10:45:20 +11:00 · 6aef38f5ac
parent 0425d40194
commit 6aef38f5ac
2 changed files with 6 additions and 2 deletions
--- a/6
+++ b/6
@ -1,3 +1,7 @@
+20031117
+ - (djm) Fix early exit for root auth success when UsePAM=yes and 
+   PermitRootLogin=no
+
 20031117
 - (djm) OpenBSD CVS Sync
   - djm@cvs.openbsd.org 2003/11/03 09:03:37
@ -1472,4 +1476,4 @@
 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
   Report from murple@murple.net, diagnosis from dtucker@zip.com.au

-$Id: ChangeLog,v 1.3112 2003/11/17 11:18:21 djm Exp $
+$Id: ChangeLog,v 1.3113 2003/11/17 23:45:20 djm Exp $
--- a/monitor.c
+++ b/monitor.c
@ -309,7 +309,7 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
 				authenticated = 0;
 #ifdef USE_PAM
 			/* PAM needs to perform account checks after auth */
-			if (options.use_pam) {
+			if (options.use_pam && authenticated) {
 				Buffer m;

 				buffer_init(&m);