summaryrefslogtreecommitdiffstats
path: root/auth-pam.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-10-28 12:36:55 +0100
committerDamien Miller <djm@mindrot.org>2001-10-28 12:36:55 +0100
commit092564869a30a7e1f51969fa736149f9246a9831 (patch)
tree244692e8d8e480e9b1256a13d897de091d184b8f /auth-pam.c
parent - (djm) Disconnect if no tty and PAM reports password expired (diff)
downloadopenssh-092564869a30a7e1f51969fa736149f9246a9831.tar.xz
openssh-092564869a30a7e1f51969fa736149f9246a9831.zip
- (djm) Fix for PAM password changes being echoed (from stevesk)
Diffstat (limited to 'auth-pam.c')
-rw-r--r--auth-pam.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/auth-pam.c b/auth-pam.c
index 2767eb156..08ba132a4 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -35,7 +35,7 @@
extern char *__progname;
-RCSID("$Id: auth-pam.c,v 1.38 2001/10/28 11:33:48 djm Exp $");
+RCSID("$Id: auth-pam.c,v 1.39 2001/10/28 11:36:56 djm Exp $");
#define NEW_AUTHTOK_MSG \
"Warning: Your password has expired, please change it now"
@@ -87,7 +87,7 @@ int do_pam_authenticate(int flags)
* messages with into __pam_msg. This is used during initial
* authentication to bypass the normal PAM password prompt.
*
- * OTHER mode handles PAM_PROMPT_ECHO_OFF with read_passphrase(prompt, 1)
+ * OTHER mode handles PAM_PROMPT_ECHO_OFF with read_passphrase()
* and outputs messages to stderr. This mode is used if pam_chauthtok()
* is called to update expired passwords.
*/
@@ -146,9 +146,9 @@ static int do_pam_conversation(int num_msg, const struct pam_message **msg,
reply[count].resp_retcode = PAM_SUCCESS;
break;
case PAM_PROMPT_ECHO_OFF:
- reply[count].resp = xstrdup(
+ reply[count].resp =
read_passphrase(PAM_MSG_MEMBER(msg, count,
- msg), 1));
+ msg), RP_ALLOW_STDIN));
reply[count].resp_retcode = PAM_SUCCESS;
break;
case PAM_ERROR_MSG: