From 8588fcfc9fb3a68c72d57f25ad71373d1e1f1775 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 9 Feb 2001 07:01:38 +0000 Subject: [PATCH] * 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 --- src/kdc/ChangeLog | 5 +++++ src/kdc/kerberos_v4.c | 14 ++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index de700c2bb..01ef6b8f2 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,8 @@ +2001-02-08 Tom Yu + + * kerberos_v4.c (kerberos_v4): Remove references to + KRB_NEVERDATE. + 2000-12-12 Ken Raeburn * 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 9e26b5ce0..b7c30c07f 100644 --- 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); -- 2.26.2