From ae52b7ca596adf4f2b9a5c6a19062f42a2543b02 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 13 Nov 2003 19:52:31 +1100 Subject: [PATCH] - (dtucker) [auth-pam.c] Add newline to accumulated PAM_TEXT_INFO and PAM_ERROR_MSG messages. --- ChangeLog | 4 +++- auth-pam.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a1c55a57..5cffbbc2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ - Create configs from skeletons in /etc/defaults/etc. - Use /bin/bash, allows reading user input with readline support. - Remove really old configs from /usr/local. + - (dtucker) [auth-pam.c] Add newline to accumulated PAM_TEXT_INFO and + PAM_ERROR_MSG messages. 20031106 - (djm) Clarify UsePAM consequences a little more @@ -1411,4 +1413,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3095 2003/11/13 00:28:49 dtucker Exp $ +$Id: ChangeLog,v 1.3096 2003/11/13 08:52:31 dtucker Exp $ diff --git a/auth-pam.c b/auth-pam.c index c9122487e..1f0b791ed 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -31,7 +31,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.77 2003/11/13 00:21:32 dtucker Exp $"); +RCSID("$Id: auth-pam.c,v 1.78 2003/11/13 08:52:31 dtucker Exp $"); #ifdef USE_PAM #include @@ -412,9 +412,9 @@ sshpam_query(void *ctx, char **name, char **info, case PAM_ERROR_MSG: case PAM_TEXT_INFO: /* accumulate messages */ - len = plen + strlen(msg) + 1; + len = plen + strlen(msg) + 2; **prompts = xrealloc(**prompts, len); - plen += snprintf(**prompts + plen, len, "%s", msg); + plen += snprintf(**prompts + plen, len, "%s\n", msg); xfree(msg); break; case PAM_SUCCESS: