summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--auth-pam.c14
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c238370a..cdde2e048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
120050928 120050928
2 - (dtucker) [entropy.c] Use u_char for receiving RNG seed for consistency. 2 - (dtucker) [entropy.c] Use u_char for receiving RNG seed for consistency.
3 - (dtucker) [auth-pam.c] Bug #1028: send final non-query messages from
4 PAM via keyboard-interactive. Patch tested by the folks at Vintela.
3 5
420050927 620050927
5 - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid 7 - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid
@@ -3023,4 +3025,4 @@
3023 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3025 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3024 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3026 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3025 3027
3026$Id: ChangeLog,v 1.3897 2005/09/27 22:26:30 dtucker Exp $ 3028$Id: ChangeLog,v 1.3898 2005/09/28 12:33:27 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 0446cd559..787aad1d0 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -47,7 +47,7 @@
47 47
48/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ 48/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
49#include "includes.h" 49#include "includes.h"
50RCSID("$Id: auth-pam.c,v 1.126 2005/07/17 07:18:50 djm Exp $"); 50RCSID("$Id: auth-pam.c,v 1.127 2005/09/28 12:33:27 dtucker Exp $");
51 51
52#ifdef USE_PAM 52#ifdef USE_PAM
53#if defined(HAVE_SECURITY_PAM_APPL_H) 53#if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -716,8 +716,18 @@ sshpam_query(void *ctx, char **name, char **info,
716 plen++; 716 plen++;
717 xfree(msg); 717 xfree(msg);
718 break; 718 break;
719 case PAM_SUCCESS:
720 case PAM_AUTH_ERR: 719 case PAM_AUTH_ERR:
720 debug3("PAM: PAM_AUTH_ERR");
721 if (**prompts != NULL && strlen(**prompts) != 0) {
722 *info = **prompts;
723 **prompts = NULL;
724 *num = 0;
725 **echo_on = 0;
726 ctxt->pam_done = -1;
727 return 0;
728 }
729 /* FALLTHROUGH */
730 case PAM_SUCCESS:
721 if (**prompts != NULL) { 731 if (**prompts != NULL) {
722 /* drain any accumulated messages */ 732 /* drain any accumulated messages */
723 debug("PAM: %s", **prompts); 733 debug("PAM: %s", **prompts);