From ae9d5af0dee1381afd17c757674b31afef1564ca Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 26 Apr 2002 11:27:24 +1000
Subject:  - (djm) Disable PAM password expiry until a complete fix for bug
 #188 exists

---
 ChangeLog  | 3 ++-
 auth-pam.c | 4 +++-
 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 @@
 20020426
  - (djm) Bug #137, #209: fix make problems for scard/Ssh.bin, do uudecode
    during distprep only
+ - (djm) Disable PAM password expiry until a complete fix for bug #188 exists
 
 20020425
  - (stevesk) [defines.h] remove USE_TIMEVAL; unused
@@ -512,4 +513,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2086 2002/04/26 01:25:40 djm Exp $
+$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 @@
 
 extern char *__progname;
 
-RCSID("$Id: auth-pam.c,v 1.44 2002/04/23 10:28:49 djm Exp $");
+RCSID("$Id: auth-pam.c,v 1.45 2002/04/26 01:27:24 djm Exp $");
 
 #define NEW_AUTHTOK_MSG \
 	"Warning: Your password has expired, please change it now"
@@ -254,11 +254,13 @@ int do_pam_account(char *username, char *remote_user)
 		case PAM_SUCCESS:
 			/* This is what we want */
 			break;
+#if 0
 		case PAM_NEW_AUTHTOK_REQD:
 			message_cat(&__pam_msg, NEW_AUTHTOK_MSG);
 			/* flag that password change is necessary */
 			password_change_required = 1;
 			break;
+#endif
 		default:
 			log("PAM rejected by account configuration[%d]: "
 			    "%.200s", pam_retval, PAM_STRERROR(__pamh, 
-- 
cgit v1.2.3