diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-03-04 20:03:54 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-03-04 20:03:54 +1100 |
commit | b9b6021667953fcb578215c97e523d6cea281ea9 (patch) | |
tree | 5b40e18a68b768f5149622957f0c182046aee7d0 | |
parent | 4b385d4bc0ac6e27b5ba5ce941d1603417963603 (diff) |
- (dtucker) [auth-pam.c] Reset signal status when starting pam auth thread,
prevent hanging during PAM keyboard-interactive authentications. ok djm@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-pam.c | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20040304 | 1 | 20040304 |
2 | - (dtucker) [auth-pam.c] Don't try to export PAM when compiled with | 2 | - (dtucker) [auth-pam.c] Don't try to export PAM when compiled with |
3 | -DUSE_POSIX_THREADS. From antoine.verheijen at ualbert ca. ok djm@ | 3 | -DUSE_POSIX_THREADS. From antoine.verheijen at ualbert ca. ok djm@ |
4 | - (dtucker) [auth-pam.c] Reset signal status when starting pam auth thread, | ||
5 | prevent hanging during PAM keyboard-interactive authentications. ok djm@ | ||
4 | 6 | ||
5 | 20040303 | 7 | 20040303 |
6 | - (djm) [configure.ac ssh-agent.c] Use prctl to prevent ptrace on ssh-agent | 8 | - (djm) [configure.ac ssh-agent.c] Use prctl to prevent ptrace on ssh-agent |
@@ -849,4 +851,4 @@ | |||
849 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 851 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
850 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 852 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
851 | 853 | ||
852 | $Id: ChangeLog,v 1.3274 2004/03/04 08:54:10 dtucker Exp $ | 854 | $Id: ChangeLog,v 1.3275 2004/03/04 09:03:54 dtucker Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index 53221a02e..ea361f171 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" |
34 | RCSID("$Id: auth-pam.c,v 1.96 2004/03/04 08:54:10 dtucker Exp $"); | 34 | RCSID("$Id: auth-pam.c,v 1.97 2004/03/04 09:03:54 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) |
@@ -117,6 +117,7 @@ pthread_create(sp_pthread_t *thread, const void *attr __unused, | |||
117 | { | 117 | { |
118 | pid_t pid; | 118 | pid_t pid; |
119 | 119 | ||
120 | sshpam_thread_status = -1; | ||
120 | switch ((pid = fork())) { | 121 | switch ((pid = fork())) { |
121 | case -1: | 122 | case -1: |
122 | error("fork(): %s", strerror(errno)); | 123 | error("fork(): %s", strerror(errno)); |