- (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if

   UseLogin is set as PAM is not used to establish credentials in that
   case.  Found by Michael Selvesteen, ok djm@

diff --git a/ChangeLog b/ChangeLog
index 2f799df186bb2df690b05c7f2b156828f146c59e..f981996e07976312ad9828b8b551d2b6ed987e9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20050421
+ - (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if
+   UseLogin is set as PAM is not used to establish credentials in that
+   case.  Found by Michael Selvesteen, ok djm@
+
 20050419
  - (dtucker) [INSTALL] Reference README.privsep for the privilege separation
    requirements.  Pointed out by Bengt Svensson.

diff --git a/session.c b/session.c
index b32c9e2ca52393cce693799e569330afe23d7a86..8ac476c6914844612d43b80b3d554ce60e37d6e2 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1477,7 +1477,8 @@ do_child(Session *s, const char *command)
        }
 
 #ifdef USE_PAM
-       if (options.use_pam && !is_pam_session_open()) {
+       if (options.use_pam && !options.use_login && !is_pam_session_open()) {
+               debug3("PAM session not opened, exiting");
                display_loginmsg();
                exit(254);
        }