[26412] in CVS-changelog-for-Kerberos-V5
svn rev #25748: branches/krb5-1-9/src/lib/krb5/krb/
daemon@ATHENA.MIT.EDU (tlyu@mit.edu)
Wed Mar 7 23:32:06 2012
Date: Wed, 7 Mar 2012 23:32:04 -0500
From: tlyu@mit.edu
Message-Id: <201203080432.q284W4RS024725@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
http://src.mit.edu/fisheye/changelog/krb5/?cs=25748
Commit By: tlyu
Log Message:
ticket: 7104
subject: Fix spurious password expiry warning
version_fixed: 1.9.4
status: resolved
------------------------------------------------------------------------
r25730 | ghudson | 2012-03-05 12:35:14 -0500 (Mon, 05 Mar 2012) | 15 lines
ticket: 7098
subject: Fix spurious password expiry warning
target_version: 1.9.4
tags: pullup
r24241 (#6755) introduced a bug where if the KDC sends a LastReq entry
containing an account expiry time, we send a prompter warning for
password expiry even if there was no entry containing a password
expiry time. Typically, this results in the message "Warning: Your
password will expire in less than one hour on Thu Jan 1 12:00:00
1970".
Fix this by explicitly checking for pw_exp == 0 in warn_pw_expiry()
after we've gotten past the conditional for invoking the callback.
Changed Files:
U branches/krb5-1-9/src/lib/krb5/krb/gic_pwd.c
Modified: branches/krb5-1-9/src/lib/krb5/krb/gic_pwd.c
===================================================================
--- branches/krb5-1-9/src/lib/krb5/krb/gic_pwd.c 2012-03-08 04:31:57 UTC (rev 25747)
+++ branches/krb5-1-9/src/lib/krb5/krb/gic_pwd.c 2012-03-08 04:32:04 UTC (rev 25748)
@@ -167,6 +167,10 @@
return;
}
+ /* Don't warn if no password expiry value was sent. */
+ if (pw_exp == 0)
+ return;
+
/* Don't warn if the password is being changed. */
if (in_tkt_service && strcmp(in_tkt_service, "kadmin/changepw") == 0)
return;
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
