summaryrefslogtreecommitdiff
path: root/auth-pam.c
diff options
context:
space:
mode:
Diffstat (limited to 'auth-pam.c')
-rw-r--r--auth-pam.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/auth-pam.c b/auth-pam.c
index 14d0c7b7f..45c5e0a0a 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -31,7 +31,7 @@
31 31
32/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ 32/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
33#include "includes.h" 33#include "includes.h"
34RCSID("$Id: auth-pam.c,v 1.90 2004/01/14 11:14:05 dtucker Exp $"); 34RCSID("$Id: auth-pam.c,v 1.91 2004/01/14 12:07:56 dtucker Exp $");
35 35
36#ifdef USE_PAM 36#ifdef USE_PAM
37#if defined(HAVE_SECURITY_PAM_APPL_H) 37#if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -92,6 +92,8 @@ static mysig_t sshpam_oldsig;
92static void 92static void
93sshpam_sigchld_handler(int sig) 93sshpam_sigchld_handler(int sig)
94{ 94{
95 if (cleanup_ctxt == NULL)
96 return; /* handler called after PAM cleanup, shouldn't happen */
95 if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, 0) == -1) 97 if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, 0) == -1)
96 return; /* couldn't wait for process */ 98 return; /* couldn't wait for process */
97 if (WIFSIGNALED(sshpam_thread_status) && 99 if (WIFSIGNALED(sshpam_thread_status) &&
@@ -132,6 +134,7 @@ pthread_create(sp_pthread_t *thread, const void *attr __unused,
132static int 134static int
133pthread_cancel(sp_pthread_t thread) 135pthread_cancel(sp_pthread_t thread)
134{ 136{
137 signal(SIGCHLD, sshpam_oldsig);
135 return (kill(thread, SIGTERM)); 138 return (kill(thread, SIGTERM));
136} 139}
137 140