- (dtucker) [auth-pam.c] Add newline to accumulated PAM_TEXT_INFO and

   PAM_ERROR_MSG messages.

diff --git a/ChangeLog b/ChangeLog
index c6a4a6613322540c9439c92d9de60b6bd2bb4ef3..ba7d0c185b0af1be706d71567f0445f53f2a0976 100644 (file)
--- 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

diff --git a/auth-pam.c b/auth-pam.c
index 0287958520c3a7a9ffb779683cf8ad6cbd589d51..6bc7daee9d684e735cd4864e5cee487055ea4d53 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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: