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

   PAM_ERROR_MSG messages.

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

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