From bdd2568443d235b7880e65476d65ee4124818d77 Mon Sep 17 00:00:00 2001 From: John Kohl Date: Thu, 1 Nov 1990 17:23:03 +0000 Subject: [PATCH] change infinity to kdc_infinity git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1392 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kdc/do_as_req.c | 4 ++-- src/kdc/do_tgs_req.c | 4 ++-- src/kdc/extern.c | 2 +- src/kdc/extern.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c index 248c28f0d..f220ed042 100644 --- a/src/kdc/do_as_req.c +++ b/src/kdc/do_as_req.c @@ -195,7 +195,7 @@ krb5_data **response; /* filled in with a response packet */ enc_tkt_reply.times.starttime = kdc_time; - until = (request->till == 0) ? infinity : request->till; + until = (request->till == 0) ? kdc_infinity : request->till; enc_tkt_reply.times.endtime = min(until, @@ -212,7 +212,7 @@ krb5_data **response; /* filled in with a response packet */ setflag(request->kdc_options, KDC_OPT_RENEWABLE); request->rtime = request->till; } - rtime = (request->rtime == 0) ? infinity : request->rtime; + rtime = (request->rtime == 0) ? kdc_infinity : request->rtime; if (isflagset(request->kdc_options, KDC_OPT_RENEWABLE)) { setflag(enc_tkt_reply.flags, TKT_FLG_RENEWABLE); diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c index 51ae28369..3fada1029 100644 --- a/src/kdc/do_tgs_req.c +++ b/src/kdc/do_tgs_req.c @@ -302,7 +302,7 @@ krb5_data **response; /* filled in with a response packet */ } else { /* not a renew request */ enc_tkt_reply.times.starttime = kdc_time; - until = (request->till == 0) ? infinity : request->till; + until = (request->till == 0) ? kdc_infinity : request->till; enc_tkt_reply.times.endtime = min(until, min(enc_tkt_reply.times.starttime + server.max_life, min(enc_tkt_reply.times.starttime + max_life_for_realm, @@ -317,7 +317,7 @@ krb5_data **response; /* filled in with a response packet */ header_ticket->enc_part2->times.renew_till); } } - rtime = (request->rtime == 0) ? infinity : request->rtime; + rtime = (request->rtime == 0) ? kdc_infinity : request->rtime; if (isflagset(request->kdc_options, KDC_OPT_RENEWABLE)) { /* already checked above in policy check to reject request for a diff --git a/src/kdc/extern.c b/src/kdc/extern.c index 0bda4474f..3df653724 100644 --- a/src/kdc/extern.c +++ b/src/kdc/extern.c @@ -23,7 +23,7 @@ static char rcsid_extern_c[] = /* real declarations of KDC's externs */ krb5_data empty_string = {0, ""}; -krb5_timestamp infinity = KRB5_INT32_MAX; /* XXX */ +krb5_timestamp kdc_infinity = KRB5_INT32_MAX; /* XXX */ krb5_deltat max_life_for_realm = KRB5_KDB_MAX_LIFE; /* XXX parameter per-realm? */ krb5_deltat max_renewable_life_for_realm = KRB5_KDB_MAX_RLIFE; /* XXX param per-realm? */ diff --git a/src/kdc/extern.h b/src/kdc/extern.h index 8e13e2102..7d1c0e57f 100644 --- a/src/kdc/extern.h +++ b/src/kdc/extern.h @@ -18,7 +18,7 @@ /* various externs for KDC */ extern krb5_data empty_string; /* an empty string */ -extern krb5_timestamp infinity; /* greater than all other timestamps */ +extern krb5_timestamp kdc_infinity; /* greater than all other timestamps */ extern krb5_deltat max_life_for_realm; /* XXX should be a parameter? */ extern krb5_deltat max_renewable_life_for_realm; /* XXX should be a parameter? */ -- 2.26.2