* kerberos_v4.c (kerberos_v4): Remove references to

	KRB_NEVERDATE.

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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index de700c2bb8c403e5ecbebfe85b5d13d11fc37eb4..01ef6b8f269c90dab07b1d780279ec4e20093ce0 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-08  Tom Yu  <tlyu@mit.edu>
+
+       * kerberos_v4.c (kerberos_v4): Remove references to
+       KRB_NEVERDATE.
+
 2000-12-12  Ken Raeburn  <raeburn@mit.edu>
 
        * network.c: Don't include net/if.h if ARPHRD_ETHER is defined.

diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c
index 9e26b5ce0073380adacf72616135d6e59fd66845..b7c30c07f96efc98b5ba8e1bd72abf085c00ecad 100644 (file)
--- a/src/kdc/kerberos_v4.c
+++ b/src/kdc/kerberos_v4.c
@@ -731,10 +731,7 @@ kerberos_v4(client, pkt)
            }
            /* Bound requested lifetime with service and user */
            v4req_end = krb_life_to_time(kerb_time.tv_sec, req_life);
-           if (v4req_end < 0 || v4req_end == KRB_NEVERDATE)
-               v4req_end = kerb_time.tv_sec + ck5life;
-           else
-               v4req_end = min(v4req_end, kerb_time.tv_sec + ck5life);
+           v4req_end = min(v4req_end, kerb_time.tv_sec + ck5life);
            v4req_end = min(v4req_end, kerb_time.tv_sec + sk5life);
            lifetime = krb_time_to_life(kerb_time.tv_sec, v4req_end);
            v4endtime = krb_life_to_time(kerb_time.tv_sec, lifetime);
@@ -914,14 +911,7 @@ kerberos_v4(client, pkt)
            /* Bound requested lifetime with service and user */
            v4endtime = krb_life_to_time((KRB4_32)ad->time_sec, ad->life);
            v4req_end = krb_life_to_time(kerb_time.tv_sec, req_life);
-           /*
-            * Handle special case of req_life == 255, since that will
-            * return the magic KRB_NEVERDATE value.
-            */
-           if (v4req_end < 0 || v4req_end == KRB_NEVERDATE)
-               v4req_end = v4endtime;
-           else
-               v4req_end = min(v4endtime, v4req_end);
+           v4req_end = min(v4endtime, v4req_end);
            v4req_end = min(v4req_end, kerb_time.tv_sec + sk5life);
 
            lifetime = krb_time_to_life(kerb_time.tv_sec, v4req_end);