From 40c3be460d3078b6b0daaf19d1a855b5b6aa1326 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Thu, 28 May 1998 22:33:00 +0000 Subject: [PATCH] (check_tgs_flags): make sure kdc-req-body->rtime is not NULL; set endtime to min of new starttime + old_life, and requested endtime git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4975 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kdc/kerberos5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c index 125d15270..4e5fa1404 100644 --- a/kdc/kerberos5.c +++ b/kdc/kerberos5.c @@ -918,6 +918,7 @@ check_tgs_flags(KDC_REQ_BODY *b, EncTicketPart *tgt, EncTicketPart *et) } et->flags.renewable = 1; ALLOC(et->renew_till); + fix_time(&b->rtime); *et->renew_till = *b->rtime; } if(f.renew){ @@ -931,7 +932,7 @@ check_tgs_flags(KDC_REQ_BODY *b, EncTicketPart *tgt, EncTicketPart *et) old_life -= *tgt->starttime; else old_life -= tgt->authtime; - et->endtime = *et->starttime + old_life; + et->endtime = min(*b->till, *et->starttime + old_life); } /* checks for excess flags */