Apply patch from Darren Tucker to make the PAM authentication SIGCHLD

handler kill the PAM thread if its waitpid() call returns 0, as well as the
previous check for -1 (closes: #252676).

1 files changed, 2 insertions, 2 deletions

diff --git a/auth-pam.c b/auth-pam.c
index 361573807..701d85b64 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -97,11 +97,11 @@ sshpam_sigchld_handler(int sig)
         if (cleanup_ctxt == NULL)
                 return; /* handler called after PAM cleanup, shouldn't happen */
         if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, WNOHANG)
-             == -1) {
+             <= 0) {
                 /* 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)
+                    <= 0)
                         return; /* could not wait */
         }
         if (WIFSIGNALED(sshpam_thread_status) &&