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

   PermitRootLogin=no

diff --git a/ChangeLog b/ChangeLog
index aa5dc838501e514c01cbfdf4799e5bf6265c7e43..3282e943ab52674bb632065e13f762fbfb33671c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/monitor.c b/monitor.c
index 97f1ee9f4c16c920e8727a5232ce951b269a0420..c4f9a48fbdf56ccef7d7edee4e61373561d47b2e 100644 (file)
--- 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);