summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--auth-pam.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c0ea7f73a..a5cfdea79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120070810
2 - (dtucker) [auth-pam.c] Use sigdie here too. ok djm@
3
120070809 420070809
2 - (dtucker) [openbsd-compat/port-aix.c] Comment typo. 5 - (dtucker) [openbsd-compat/port-aix.c] Comment typo.
3 - (dtucker) [README.platform] Document the interaction between PermitRootLogin 6 - (dtucker) [README.platform] Document the interaction between PermitRootLogin
@@ -3142,4 +3145,4 @@
3142 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3145 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3143 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3146 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3144 3147
3145$Id: ChangeLog,v 1.4722 2007/08/09 05:03:23 dtucker Exp $ 3148$Id: ChangeLog,v 1.4723 2007/08/10 04:32:34 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 35aecbdb4..a07f1fe77 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -161,9 +161,9 @@ sshpam_sigchld_handler(int sig)
161 WTERMSIG(sshpam_thread_status) == SIGTERM) 161 WTERMSIG(sshpam_thread_status) == SIGTERM)
162 return; /* terminated by pthread_cancel */ 162 return; /* terminated by pthread_cancel */
163 if (!WIFEXITED(sshpam_thread_status)) 163 if (!WIFEXITED(sshpam_thread_status))
164 fatal("PAM: authentication thread exited unexpectedly"); 164 sigdie("PAM: authentication thread exited unexpectedly");
165 if (WEXITSTATUS(sshpam_thread_status) != 0) 165 if (WEXITSTATUS(sshpam_thread_status) != 0)
166 fatal("PAM: authentication thread exited uncleanly"); 166 sigdie("PAM: authentication thread exited uncleanly");
167} 167}
168 168
169/* ARGSUSED */ 169/* ARGSUSED */