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>

diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index ecca52cdcddbf23f89aa4dcdf5d8749ab1fb7da9..b10e125af339bf4d9ba50dc5be1ed8eb27772f5a 100644 (file)
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -2561,11 +2561,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));
 
@@ -2589,10 +2589,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