diff options
| author | Damien Miller <djm@mindrot.org> | 2001-03-01 09:18:57 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-03-01 09:18:57 +1100 |
| commit | 882c2eed97630695c5e1acd2fd237cb5fa01fe26 (patch) | |
| tree | 0b150e78e2822ae1a2c5ab25b281d808cc1ff227 | |
| parent | 95aa2d60eaefc707a832d7ef2f17498fb6841ac8 (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>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | auth-pam.c | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -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 $ @@ -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? */ |