summaryrefslogtreecommitdiff
path: root/auth-pam.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-03-01 09:18:57 +1100
committerDamien Miller <djm@mindrot.org>2001-03-01 09:18:57 +1100
commit882c2eed97630695c5e1acd2fd237cb5fa01fe26 (patch)
tree0b150e78e2822ae1a2c5ab25b281d808cc1ff227 /auth-pam.c
parent95aa2d60eaefc707a832d7ef2f17498fb6841ac8 (diff)
- (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>
Diffstat (limited to 'auth-pam.c')
-rw-r--r--auth-pam.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/auth-pam.c b/auth-pam.c
index fd9c0f24..ce498453 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? */