summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-04-26 11:27:24 +1000
committerDamien Miller <djm@mindrot.org>2002-04-26 11:27:24 +1000
commitae9d5af0dee1381afd17c757674b31afef1564ca (patch)
treed8145a28a6a23939649bbb7275690c007167f67f
parent13ce922cc6edd189056b278c4f0f67511449c821 (diff)
- (djm) Disable PAM password expiry until a complete fix for bug #188 exists
-rw-r--r--ChangeLog3
-rw-r--r--auth-pam.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 446ed15d2..8d91fdfb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120020426 120020426
2 - (djm) Bug #137, #209: fix make problems for scard/Ssh.bin, do uudecode 2 - (djm) Bug #137, #209: fix make problems for scard/Ssh.bin, do uudecode
3 during distprep only 3 during distprep only
4 - (djm) Disable PAM password expiry until a complete fix for bug #188 exists
4 5
520020425 620020425
6 - (stevesk) [defines.h] remove USE_TIMEVAL; unused 7 - (stevesk) [defines.h] remove USE_TIMEVAL; unused
@@ -512,4 +513,4 @@
512 - (stevesk) entropy.c: typo in debug message 513 - (stevesk) entropy.c: typo in debug message
513 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 514 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
514 515
515$Id: ChangeLog,v 1.2086 2002/04/26 01:25:40 djm Exp $ 516$Id: ChangeLog,v 1.2087 2002/04/26 01:27:24 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 222b358cc..10a87fa46 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -36,7 +36,7 @@
36 36
37extern char *__progname; 37extern char *__progname;
38 38
39RCSID("$Id: auth-pam.c,v 1.44 2002/04/23 10:28:49 djm Exp $"); 39RCSID("$Id: auth-pam.c,v 1.45 2002/04/26 01:27:24 djm Exp $");
40 40
41#define NEW_AUTHTOK_MSG \ 41#define NEW_AUTHTOK_MSG \
42 "Warning: Your password has expired, please change it now" 42 "Warning: Your password has expired, please change it now"
@@ -254,11 +254,13 @@ int do_pam_account(char *username, char *remote_user)
254 case PAM_SUCCESS: 254 case PAM_SUCCESS:
255 /* This is what we want */ 255 /* This is what we want */
256 break; 256 break;
257#if 0
257 case PAM_NEW_AUTHTOK_REQD: 258 case PAM_NEW_AUTHTOK_REQD:
258 message_cat(&__pam_msg, NEW_AUTHTOK_MSG); 259 message_cat(&__pam_msg, NEW_AUTHTOK_MSG);
259 /* flag that password change is necessary */ 260 /* flag that password change is necessary */
260 password_change_required = 1; 261 password_change_required = 1;
261 break; 262 break;
263#endif
262 default: 264 default:
263 log("PAM rejected by account configuration[%d]: " 265 log("PAM rejected by account configuration[%d]: "
264 "%.200s", pam_retval, PAM_STRERROR(__pamh, 266 "%.200s", pam_retval, PAM_STRERROR(__pamh,