RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [auth-pam.c] Ensure that only one side of the authentication 

socketpair stays open on in both the monitor and PAM process.  Patch from
   Joerg Sonnenberger.
This commit is contained in:
Darren Tucker 2005-07-16 11:33:06 +10:00
parent 4a42257b06
commit 4f1adad4f6
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
20050716
- (dtucker) [auth-pam.c] Ensure that only one side of the authentication
socketpair stays open on in both the monitor and PAM process. Patch from
Joerg Sonnenberger.
20050714 20050714
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2005/07/06 09:33:05 - dtucker@cvs.openbsd.org 2005/07/06 09:33:05
@ -2825,4 +2830,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.3845 2005/07/14 07:22:11 dtucker Exp $ $Id: ChangeLog,v 1.3846 2005/07/16 01:33:06 dtucker Exp $

7
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.123 2005/05/26 09:59:48 dtucker Exp $"); RCSID("$Id: auth-pam.c,v 1.124 2005/07/16 01:33:06 dtucker Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H) #if defined(HAVE_SECURITY_PAM_APPL_H)
@ -157,6 +157,7 @@ pthread_create(sp_pthread_t *thread, const void *attr __unused,
void *(*thread_start)(void *), void *arg) void *(*thread_start)(void *), void *arg)
{ {
pid_t pid; pid_t pid;
struct pam_ctxt *ctx = arg;
sshpam_thread_status = -1; sshpam_thread_status = -1;
switch ((pid = fork())) { switch ((pid = fork())) {
@ -164,10 +165,14 @@ pthread_create(sp_pthread_t *thread, const void *attr __unused,
error("fork(): %s", strerror(errno)); error("fork(): %s", strerror(errno));
return (-1); return (-1);
case 0: case 0:
close(ctx->pam_psock);
ctx->pam_psock = -1;
thread_start(arg); thread_start(arg);
_exit(1); _exit(1);
default: default:
*thread = pid; *thread = pid;
close(ctx->pam_csock);
ctx->pam_csock = -1;
sshpam_oldsig = signal(SIGCHLD, sshpam_sigchld_handler); sshpam_oldsig = signal(SIGCHLD, sshpam_sigchld_handler);
return (0); return (0);
} }