summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-11-13 19:53:16 +1100
committerDarren Tucker <dtucker@zip.com.au>2003-11-13 19:53:16 +1100
commit6ece1b29f9c113e3e45946bedfcbd21d4bf68bfc (patch)
tree826ec012b96acb603e42d61339ecdc9e5b8f0c9a
parent2efe8153b34c2c215466be7e4fb528ae434c83b4 (diff)
- (dtucker) [auth-pam.c] Add newline to accumulated PAM_TEXT_INFO and
PAM_ERROR_MSG messages.
-rw-r--r--ChangeLog4
-rw-r--r--auth-pam.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8534dfd4..e20f7422 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,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.
20031103
- (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services
@@ -1277,4 +1279,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.2994.2.59 2003/11/13 00:31:00 dtucker Exp $
+$Id: ChangeLog,v 1.2994.2.60 2003/11/13 08:53:16 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 0ad41245..2a94ca3c 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.72.2.3 2003/11/13 00:22:45 dtucker Exp $");
+RCSID("$Id: auth-pam.c,v 1.72.2.4 2003/11/13 08:53:16 dtucker Exp $");
#ifdef USE_PAM
#include <security/pam_appl.h>
@@ -410,9 +410,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: