From: Ken Hornstein <kenh@cmf.nrl.navy.mil>
Date: Thu, 24 Oct 2002 02:03:15 +0000 (+0000)
Subject: No support for negative password expiration last-req hint
X-Git-Tag: krb5-1.3-alpha1~313
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a706a2d0d05ecea7a844db7d291493a5d282ed57;p=krb5.git

No support for negative password expiration last-req hint

Fixing an omission; previous code didn't support a negative value for the
password expiration hint (which is legal).  Pointed out by Ezra Peisach.

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14938 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 7ab1cde04..345660253 100644
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -839,7 +839,8 @@ krb5_error_code krb5_decrypt_data
 #define KRB5_LRQ_ONE_LAST_RENEWAL	(-4)
 #define KRB5_LRQ_ALL_LAST_REQ		5
 #define KRB5_LRQ_ONE_LAST_REQ		(-5)
-#define KRB5_LRQ_PW_EXPTIME		6
+#define KRB5_LRQ_ALL_PW_EXPTIME		6
+#define KRB5_LRQ_ONE_PW_EXPTIME		(-6)
 
 /* PADATA types */
 #define KRB5_PADATA_NONE		0
diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
index 776669af4..287ee7b7b 100644
--- a/src/lib/krb5/krb/gic_pwd.c
+++ b/src/lib/krb5/krb/gic_pwd.c
@@ -323,7 +323,8 @@ cleanup:
 	  */
 
 	 for (last_req = as_reply->enc_part2->last_req; *last_req; last_req++)
-	    if ((*last_req)->lr_type == KRB5_LRQ_PW_EXPTIME) {
+	    if ((*last_req)->lr_type == KRB5_LRQ_ALL_PW_EXPTIME ||
+		(*last_req)->lr_type == KRB5_LRQ_ONE_PW_EXPTIME) {
 	       krb5_deltat delta;
 	       char ts[256];