tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows 

the monitor to properly clean up the PAM thread (Debian bug #252676).
This commit is contained in:
Darren Tucker 2004-07-11 16:54:08 +10:00
parent 3b376f08fb
commit 5d423f4ece
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20040711
- (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows
the monitor to properly clean up the PAM thread (Debian bug #252676).
20040709 20040709
- (tim) [contrib/cygwin/README] add minires-devel requirement. Patch from - (tim) [contrib/cygwin/README] add minires-devel requirement. Patch from
vinschen AT redhat.com vinschen AT redhat.com
@ -1499,4 +1503,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3472 2004/07/09 17:45:26 tim Exp $ $Id: ChangeLog,v 1.3473 2004/07/11 06:54:08 dtucker Exp $

6
auth-pam.c
View File

@ -47,7 +47,7 @@
/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-pam.c,v 1.110 2004/07/01 04:00:15 dtucker Exp $"); RCSID("$Id: auth-pam.c,v 1.111 2004/07/11 06:54:08 dtucker Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H) #if defined(HAVE_SECURITY_PAM_APPL_H)
@ -113,11 +113,11 @@ sshpam_sigchld_handler(int sig)
if (cleanup_ctxt == NULL) if (cleanup_ctxt == NULL)
return; /* handler called after PAM cleanup, shouldn't happen */ return; /* handler called after PAM cleanup, shouldn't happen */
if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, WNOHANG) if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, WNOHANG)
== -1) { <= 0) {
/* PAM thread has not exitted, privsep slave must have */ /* PAM thread has not exitted, privsep slave must have */
kill(cleanup_ctxt->pam_thread, SIGTERM); kill(cleanup_ctxt->pam_thread, SIGTERM);
if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, 0) if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, 0)
== -1) <= 0)
return; /* could not wait */ return; /* could not wait */
} }
if (WIFSIGNALED(sshpam_thread_status) && if (WIFSIGNALED(sshpam_thread_status) &&