From 86b20d95443f0f5d01f5028136bcaea78e9a04f9 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Tue, 16 May 2023 17:10:09 +1200 Subject: [PATCH] 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 --- kdc/kerberos5.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c index ce46638a8..f780103d0 100644 --- a/kdc/kerberos5.c +++ b/kdc/kerberos5.c @@ -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