summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-11-13 11:22:44 +1100
committerDarren Tucker <dtucker@zip.com.au>2003-11-13 11:22:44 +1100
commitf5c89269d409f71e2fa7b5d579db4c394601232f (patch)
tree680192e4ee3a3ef7b4a5449eede8329c92e953a2
parented6e4ad14844f9bb573b1a95523ea86e94ddb0b6 (diff)
- (dtucker) [auth-pam.c] Append newlines to lines output by the
pam_chauthtok_conv().
-rw-r--r--ChangeLog4
-rw-r--r--auth-pam.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0403d6e1..84896412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
20031113
- (dtucker) [sshd_config] Clarify UsePAM consequences a little more, from
current.
+ - (dtucker) [auth-pam.c] Append newlines to lines output by the
+ pam_chauthtok_conv().
20031103
- (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services
@@ -1265,4 +1267,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.57 2003/11/12 23:55:12 dtucker Exp $
+$Id: ChangeLog,v 1.2994.2.58 2003/11/13 00:22:44 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 2c8feb65..0ad41245 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.2 2003/09/23 09:24:21 djm Exp $");
+RCSID("$Id: auth-pam.c,v 1.72.2.3 2003/11/13 00:22:45 dtucker Exp $");
#ifdef USE_PAM
#include <security/pam_appl.h>
@@ -635,14 +635,14 @@ pam_chauthtok_conv(int n, const struct pam_message **msg,
reply[i].resp_retcode = PAM_SUCCESS;
break;
case PAM_PROMPT_ECHO_ON:
- fputs(PAM_MSG_MEMBER(msg, i, msg), stderr);
+ fprintf(stderr, "%s\n", PAM_MSG_MEMBER(msg, i, msg));
fgets(input, sizeof input, stdin);
reply[i].resp = xstrdup(input);
reply[i].resp_retcode = PAM_SUCCESS;
break;
case PAM_ERROR_MSG:
case PAM_TEXT_INFO:
- fputs(PAM_MSG_MEMBER(msg, i, msg), stderr);
+ fprintf(stderr, "%s\n", PAM_MSG_MEMBER(msg, i, msg));
reply[i].resp_retcode = PAM_SUCCESS;
break;
default: