diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-pam.c | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -11,6 +11,8 @@ | |||
11 | - Create configs from skeletons in /etc/defaults/etc. | 11 | - Create configs from skeletons in /etc/defaults/etc. |
12 | - Use /bin/bash, allows reading user input with readline support. | 12 | - Use /bin/bash, allows reading user input with readline support. |
13 | - Remove really old configs from /usr/local. | 13 | - Remove really old configs from /usr/local. |
14 | - (dtucker) [auth-pam.c] Add newline to accumulated PAM_TEXT_INFO and | ||
15 | PAM_ERROR_MSG messages. | ||
14 | 16 | ||
15 | 20031106 | 17 | 20031106 |
16 | - (djm) Clarify UsePAM consequences a little more | 18 | - (djm) Clarify UsePAM consequences a little more |
@@ -1411,4 +1413,4 @@ | |||
1411 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1413 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1412 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1414 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1413 | 1415 | ||
1414 | $Id: ChangeLog,v 1.3095 2003/11/13 00:28:49 dtucker Exp $ | 1416 | $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 @@ | |||
31 | 31 | ||
32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ | 32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ |
33 | #include "includes.h" | 33 | #include "includes.h" |
34 | RCSID("$Id: auth-pam.c,v 1.77 2003/11/13 00:21:32 dtucker Exp $"); | 34 | RCSID("$Id: auth-pam.c,v 1.78 2003/11/13 08:52:31 dtucker Exp $"); |
35 | 35 | ||
36 | #ifdef USE_PAM | 36 | #ifdef USE_PAM |
37 | #include <security/pam_appl.h> | 37 | #include <security/pam_appl.h> |
@@ -412,9 +412,9 @@ sshpam_query(void *ctx, char **name, char **info, | |||
412 | case PAM_ERROR_MSG: | 412 | case PAM_ERROR_MSG: |
413 | case PAM_TEXT_INFO: | 413 | case PAM_TEXT_INFO: |
414 | /* accumulate messages */ | 414 | /* accumulate messages */ |
415 | len = plen + strlen(msg) + 1; | 415 | len = plen + strlen(msg) + 2; |
416 | **prompts = xrealloc(**prompts, len); | 416 | **prompts = xrealloc(**prompts, len); |
417 | plen += snprintf(**prompts + plen, len, "%s", msg); | 417 | plen += snprintf(**prompts + plen, len, "%s\n", msg); |
418 | xfree(msg); | 418 | xfree(msg); |
419 | break; | 419 | break; |
420 | case PAM_SUCCESS: | 420 | case PAM_SUCCESS: |