From 882c2eed97630695c5e1acd2fd237cb5fa01fe26 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 1 Mar 2001 09:18:57 +1100
Subject: [PATCH]  - (djm) Force standard PAM conversation function in a few
 more places.    Patch from Redhat 2.5.1p1-2 RPM, probably Nalin Dahyabhai   
 <nalin@redhat.com>

---
 ChangeLog  | 5 ++++-
 auth-pam.c | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79c6f94c4..fad786106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 20010301
  - (djm) Properly add -lcrypt if needed. 
+ - (djm) Force standard PAM conversation function in a few more places.
+   Patch from Redhat 2.5.1p1-2 RPM, probably Nalin Dahyabhai 
+   <nalin@redhat.com>
 
 20010228
  - (djm) Detect endianness in configure and use it in rijndael.c. Fixes
@@ -4169,4 +4172,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.842 2001/02/28 22:16:11 djm Exp $
+$Id: ChangeLog,v 1.843 2001/02/28 22:18:57 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index fd9c0f245..ce4984532 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -33,7 +33,7 @@
 #include "canohost.h"
 #include "readpass.h"
 
-RCSID("$Id: auth-pam.c,v 1.30 2001/02/26 22:20:48 djm Exp $");
+RCSID("$Id: auth-pam.c,v 1.31 2001/02/28 22:18:58 djm Exp $");
 
 #define NEW_AUTHTOK_MSG \
 	"Warning: Your password has expired, please change it now"
@@ -268,6 +268,8 @@ void do_pam_session(char *username, const char *ttyname)
 {
 	int pam_retval;
 
+	do_pam_set_conv(&conv);
+
 	if (ttyname != NULL) {
 		debug("PAM setting tty to \"%.200s\"", ttyname);
 		pam_retval = pam_set_item(__pamh, PAM_TTY, ttyname);
@@ -289,6 +291,8 @@ void do_pam_setcred(void)
 {
 	int pam_retval;
 
+	do_pam_set_conv(&conv);
+
 	debug("PAM establishing creds");
 	pam_retval = pam_setcred(__pamh, PAM_ESTABLISH_CRED);
 	if (pam_retval != PAM_SUCCESS) {
@@ -318,6 +322,8 @@ void do_pam_chauthtok(void)
 {
 	int pam_retval;
 
+	do_pam_set_conv(&conv);
+
 	if (password_change_required) {
 		pamstate = OTHER;
 		/* XXX: should we really loop forever? */