change infinity to kdc_infinity

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

diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
index 248c28f0d18b83a1b1738535d8b24343cd4d1244..f220ed0429fe4ea9d6fd143e02e7f55ac85be111 100644 (file)
--- 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 51ae2836974bb4cd07284d6bfdef9f0c9c69d747..3fada1029b069e72eb1a499a69e4cf328032718c 100644 (file)
--- 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 0bda4474f7b7331cf7e84f8b6ec30233811eee9c..3df65372449415eb399d1e7fce83c01a813fa616 100644 (file)
--- 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 8e13e2102049b3bc480888be28521126fcc73712..7d1c0e57f24e1698baafc4d5cb89cabfc567cceb 100644 (file)
--- 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? */