2 files changed, 4 insertions, 0 deletions

diff --git a/auth-pam.c b/auth-pam.c
index 397f7d3a8..15a691b11 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -117,6 +117,7 @@ pthread_create(sp_pthread_t *thread, const void *attr __unused,
 {
         pid_t pid;
 
+        sshpam_thread_status = -1;
         switch ((pid = fork())) {
         case -1:
                 error("fork(): %s", strerror(errno));
diff --git a/debian/changelog b/debian/changelog
index a8259ef8e..c15d3c7e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ openssh (1:3.8p1-1) UNRELEASED; urgency=low
     ssh_config(5) for details.
   * Remove -fno-builtin-log, -DHAVE_MMAP_ANON_SHARED, and
     -D__FILE_OFFSET_BITS=64 compiler options, which are no longer necessary.
+  * Darren Tucker:
+    - Reset signal status when starting pam auth thread, prevent hanging
+      during PAM keyboard-interactive authentications.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 23 Sep 2003 19:22:38 +0100