diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth-pam.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20031113 | ||
2 | - (dtucker) [auth-pam.c] Append newlines to lines output by the | ||
3 | pam_chauthtok_conv(). | ||
4 | |||
1 | 20031106 | 5 | 20031106 |
2 | - (djm) Clarify UsePAM consequences a little more | 6 | - (djm) Clarify UsePAM consequences a little more |
3 | 7 | ||
@@ -1397,4 +1401,4 @@ | |||
1397 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1401 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1398 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1402 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1399 | 1403 | ||
1400 | $Id: ChangeLog,v 1.3093 2003/11/06 09:27:51 djm Exp $ | 1404 | $Id: ChangeLog,v 1.3094 2003/11/13 00:21:31 dtucker Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index 11e53b61f..c9122487e 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.76 2003/10/09 04:20:15 dtucker Exp $"); | 34 | RCSID("$Id: auth-pam.c,v 1.77 2003/11/13 00:21:32 dtucker Exp $"); |
35 | 35 | ||
36 | #ifdef USE_PAM | 36 | #ifdef USE_PAM |
37 | #include <security/pam_appl.h> | 37 | #include <security/pam_appl.h> |
@@ -636,14 +636,14 @@ pam_chauthtok_conv(int n, const struct pam_message **msg, | |||
636 | reply[i].resp_retcode = PAM_SUCCESS; | 636 | reply[i].resp_retcode = PAM_SUCCESS; |
637 | break; | 637 | break; |
638 | case PAM_PROMPT_ECHO_ON: | 638 | case PAM_PROMPT_ECHO_ON: |
639 | fputs(PAM_MSG_MEMBER(msg, i, msg), stderr); | 639 | fprintf(stderr, "%s\n", PAM_MSG_MEMBER(msg, i, msg)); |
640 | fgets(input, sizeof input, stdin); | 640 | fgets(input, sizeof input, stdin); |
641 | reply[i].resp = xstrdup(input); | 641 | reply[i].resp = xstrdup(input); |
642 | reply[i].resp_retcode = PAM_SUCCESS; | 642 | reply[i].resp_retcode = PAM_SUCCESS; |
643 | break; | 643 | break; |
644 | case PAM_ERROR_MSG: | 644 | case PAM_ERROR_MSG: |
645 | case PAM_TEXT_INFO: | 645 | case PAM_TEXT_INFO: |
646 | fputs(PAM_MSG_MEMBER(msg, i, msg), stderr); | 646 | fprintf(stderr, "%s\n", PAM_MSG_MEMBER(msg, i, msg)); |
647 | reply[i].resp_retcode = PAM_SUCCESS; | 647 | reply[i].resp_retcode = PAM_SUCCESS; |
648 | break; | 648 | break; |
649 | default: | 649 | default: |