summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-03-11 22:58:25 +1100
committerDarren Tucker <dtucker@zip.com.au>2008-03-11 22:58:25 +1100
commit52358d6df32d9ae923572c43a58159d84b673631 (patch)
tree83261a70dd007f2af900e1b22884c75b703f8b37 /monitor.c
parentfe1cf97ee811dc7a2bb7cea912c9292c976ab5af (diff)
- (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move
pam_open_session and pam_close_session into the privsep monitor, which will ensure that pam_session_close is called as root. Patch from Tomas Mraz.
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/monitor.c b/monitor.c
index 2f23669cd..cc0e0fcac 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1547,6 +1547,11 @@ mm_answer_term(int sock, Buffer *req)
1547 /* The child is terminating */ 1547 /* The child is terminating */
1548 session_destroy_all(&mm_session_close); 1548 session_destroy_all(&mm_session_close);
1549 1549
1550#ifdef USE_PAM
1551 if (options.use_pam)
1552 sshpam_cleanup();
1553#endif
1554
1550 while (waitpid(pmonitor->m_pid, &status, 0) == -1) 1555 while (waitpid(pmonitor->m_pid, &status, 0) == -1)
1551 if (errno != EINTR) 1556 if (errno != EINTR)
1552 exit(1); 1557 exit(1);