[src/netbsd-1-5]: src/crypto/dist/heimdal/kdc Pull up revision 1.2 (really 1....

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/51b41388027f
branches:  netbsd-1-5
changeset: 491229:51b41388027f
user:      he <he%NetBSD.org@localhost>
date:      Fri Apr 06 09:36:33 2001 +0000

description:
Pull up revision 1.2 (really 1.1.1.3 -> 1.2, requested by thorpej):
  Prevent a NULL-pointer deref when making a TGS_REP for a ticket
  renewal.  Fixes a kdc core dump which happens frequently if you
  have Windows 2000 clients in the realm.

diffstat:

 crypto/dist/heimdal/kdc/kerberos5.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 857acb7ff667 -r 51b41388027f crypto/dist/heimdal/kdc/kerberos5.c
--- a/crypto/dist/heimdal/kdc/kerberos5.c       Fri Apr 06 09:32:03 2001 +0000
+++ b/crypto/dist/heimdal/kdc/kerberos5.c       Fri Apr 06 09:36:33 2001 +0000
@@ -33,7 +33,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: kerberos5.c,v 1.1.1.1.2.1 2001/04/05 23:23:01 he Exp $");
+RCSID("$Id: kerberos5.c,v 1.1.1.1.2.2 2001/04/06 09:36:33 he Exp $");
 
 #define MAX_TIME ((time_t)((1U << 31) - 1))
 
@@ -978,7 +978,9 @@
            old_life -= *tgt->starttime;
        else
            old_life -= tgt->authtime;
-       et->endtime = min(*et->renew_till, *et->starttime + old_life);
+       et->endtime = *et->starttime + old_life;
+       if (et->renew_till != NULL)
+           et->endtime = min(*et->renew_till, et->endtime);
     }      
     
     /* checks for excess flags */