diff options
author | dtucker <dtucker> | 2005-09-28 12:33:27 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2005-09-28 12:33:27 +0000 |
commit | 79ad1230b840d1e6a4388b892c98cd6d32df68cb (patch) | |
tree | 5cae8d72e419d0a625d7e344dec71819934378cb | |
parent | 951f7074d4823c77097993e090164de1cb3bf2f7 (diff) | |
download | openssh-79ad1230b840d1e6a4388b892c98cd6d32df68cb.tar.gz |
- (dtucker) [auth-pam.c] Bug #1028: send final non-query messages from
PAM via keyboard-interactive. Patch tested by the folks at Vintela.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-pam.c | 14 |
2 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,7 @@ 20050928 - (dtucker) [entropy.c] Use u_char for receiving RNG seed for consistency. + - (dtucker) [auth-pam.c] Bug #1028: send final non-query messages from + PAM via keyboard-interactive. Patch tested by the folks at Vintela. 20050927 - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid @@ -3023,4 +3025,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3897 2005/09/27 22:26:30 dtucker Exp $ +$Id: ChangeLog,v 1.3898 2005/09/28 12:33:27 dtucker Exp $ @@ -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 $ */ #include "includes.h" -RCSID("$Id: auth-pam.c,v 1.126 2005/07/17 07:18:50 djm Exp $"); +RCSID("$Id: auth-pam.c,v 1.127 2005/09/28 12:33:27 dtucker Exp $"); #ifdef USE_PAM #if defined(HAVE_SECURITY_PAM_APPL_H) @@ -716,8 +716,18 @@ sshpam_query(void *ctx, char **name, char **info, plen++; xfree(msg); break; - case PAM_SUCCESS: case PAM_AUTH_ERR: + debug3("PAM: PAM_AUTH_ERR"); + if (**prompts != NULL && strlen(**prompts) != 0) { + *info = **prompts; + **prompts = NULL; + *num = 0; + **echo_on = 0; + ctxt->pam_done = -1; + return 0; + } + /* FALLTHROUGH */ + case PAM_SUCCESS: if (**prompts != NULL) { /* drain any accumulated messages */ debug("PAM: %s", **prompts); |