2 files changed, 15 insertions, 2 deletions

diff --git a/auth-pam.c b/auth-pam.c
index 36dbb7e15..361573807 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -93,10 +93,17 @@ static mysig_t sshpam_oldsig;
 static void 
 sshpam_sigchld_handler(int sig)
 {
+        signal(SIGCHLD, SIG_DFL);
         if (cleanup_ctxt == NULL)
                 return; /* handler called after PAM cleanup, shouldn't happen */
-        if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, 0) == -1)
-                return; /* couldn't wait for process */
+        if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, WNOHANG)
+             == -1) {
+                /* PAM thread has not exitted, privsep slave must have */
+                kill(cleanup_ctxt->pam_thread, SIGTERM);
+                if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, 0)
+                    == -1)
+                        return; /* could not wait */
+        }
         if (WIFSIGNALED(sshpam_thread_status) &&
             WTERMSIG(sshpam_thread_status) == SIGTERM)
                 return; /* terminated by pthread_cancel */
diff --git a/debian/changelog b/debian/changelog
index 1274b1f69..4a2ba9110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:3.8.1p1-4) UNRELEASED; urgency=low
+
+  * Kill off PAM thread if privsep slave dies (closes: #248125).
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 28 May 2004 17:26:35 -0300
+
 openssh (1:3.8.1p1-3) unstable; urgency=low
 
   * Add ssh-keygen to openssh-server-udeb.