kdc: Always apply maximum ticket lifetime and renew time when non-NULL
This allows a lifetime of zero to work. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
This commit is contained in:
committed by
Nico Williams
parent
add30d09f9
commit
86b20d9544
@@ -2547,11 +2547,11 @@ _kdc_as_rep(astgs_request_t r)
|
||||
*/
|
||||
if (r->pa_max_life > 0)
|
||||
t = rk_time_add(start, min(rk_time_sub(t, start), r->pa_max_life));
|
||||
else if (r->client->max_life && *r->client->max_life)
|
||||
else if (r->client->max_life)
|
||||
t = rk_time_add(start, min(rk_time_sub(t, start),
|
||||
*r->client->max_life));
|
||||
|
||||
if (r->server->max_life && *r->server->max_life)
|
||||
if (r->server->max_life)
|
||||
t = rk_time_add(start, min(rk_time_sub(t, start),
|
||||
*r->server->max_life));
|
||||
|
||||
@@ -2582,10 +2582,10 @@ _kdc_as_rep(astgs_request_t r)
|
||||
t = *b->rtime;
|
||||
if(t == 0)
|
||||
t = MAX_TIME;
|
||||
if(r->client->max_renew && *r->client->max_renew)
|
||||
if(r->client->max_renew)
|
||||
t = rk_time_add(start, min(rk_time_sub(t, start),
|
||||
*r->client->max_renew));
|
||||
if(r->server->max_renew && *r->server->max_renew)
|
||||
if(r->server->max_renew)
|
||||
t = rk_time_add(start, min(rk_time_sub(t, start),
|
||||
*r->server->max_renew));
|
||||
#if 0
|
||||
|
||||
Reference in New Issue
Block a user