summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--auth-pam.c8
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 @@
120010301 120010301
2 - (djm) Properly add -lcrypt if needed. 2 - (djm) Properly add -lcrypt if needed.
3 - (djm) Force standard PAM conversation function in a few more places.
4 Patch from Redhat 2.5.1p1-2 RPM, probably Nalin Dahyabhai
5 <nalin@redhat.com>
3 6
420010228 720010228
5 - (djm) Detect endianness in configure and use it in rijndael.c. Fixes 8 - (djm) Detect endianness in configure and use it in rijndael.c. Fixes
@@ -4169,4 +4172,4 @@
4169 - Wrote replacements for strlcpy and mkdtemp 4172 - Wrote replacements for strlcpy and mkdtemp
4170 - Released 1.0pre1 4173 - Released 1.0pre1
4171 4174
4172$Id: ChangeLog,v 1.842 2001/02/28 22:16:11 djm Exp $ 4175$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 @@
33#include "canohost.h" 33#include "canohost.h"
34#include "readpass.h" 34#include "readpass.h"
35 35
36RCSID("$Id: auth-pam.c,v 1.30 2001/02/26 22:20:48 djm Exp $"); 36RCSID("$Id: auth-pam.c,v 1.31 2001/02/28 22:18:58 djm Exp $");
37 37
38#define NEW_AUTHTOK_MSG \ 38#define NEW_AUTHTOK_MSG \
39 "Warning: Your password has expired, please change it now" 39 "Warning: Your password has expired, please change it now"
@@ -268,6 +268,8 @@ void do_pam_session(char *username, const char *ttyname)
268{ 268{
269 int pam_retval; 269 int pam_retval;
270 270
271 do_pam_set_conv(&conv);
272
271 if (ttyname != NULL) { 273 if (ttyname != NULL) {
272 debug("PAM setting tty to \"%.200s\"", ttyname); 274 debug("PAM setting tty to \"%.200s\"", ttyname);
273 pam_retval = pam_set_item(__pamh, PAM_TTY, ttyname); 275 pam_retval = pam_set_item(__pamh, PAM_TTY, ttyname);
@@ -289,6 +291,8 @@ void do_pam_setcred(void)
289{ 291{
290 int pam_retval; 292 int pam_retval;
291 293
294 do_pam_set_conv(&conv);
295
292 debug("PAM establishing creds"); 296 debug("PAM establishing creds");
293 pam_retval = pam_setcred(__pamh, PAM_ESTABLISH_CRED); 297 pam_retval = pam_setcred(__pamh, PAM_ESTABLISH_CRED);
294 if (pam_retval != PAM_SUCCESS) { 298 if (pam_retval != PAM_SUCCESS) {
@@ -318,6 +322,8 @@ void do_pam_chauthtok(void)
318{ 322{
319 int pam_retval; 323 int pam_retval;
320 324
325 do_pam_set_conv(&conv);
326
321 if (password_change_required) { 327 if (password_change_required) {
322 pamstate = OTHER; 328 pamstate = OTHER;
323 /* XXX: should we really loop forever? */ 329 /* XXX: should we really loop forever? */