svn rev #25741: branches/krb5-1-10/src/lib/krb5/krb/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25741
Commit By: tlyu
Log Message:
ticket: 7098
version_fixed: 1.10.1
status: resolved

Pull up r25730 from trunk

 ------------------------------------------------------------------------
 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-10/src/lib/krb5/krb/gic_pwd.c
Modified: branches/krb5-1-10/src/lib/krb5/krb/gic_pwd.c
===================================================================
--- branches/krb5-1-10/src/lib/krb5/krb/gic_pwd.c	2012-03-07 23:44:32 UTC (rev 25740)
+++ branches/krb5-1-10/src/lib/krb5/krb/gic_pwd.c	2012-03-07 23:44:36 UTC (rev 25741)
@@ -168,6 +168,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;