From bbaae5f43c3743a91cc3cd9833b2126c6e5493ef Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Sun, 4 Dec 2016 16:40:55 -0600 Subject: [PATCH] Fix 32-bit time_t regression (#220) --- kcm/config.c | 2 +- kuser/kinit.c | 2 +- lib/krb5/krb5_locl.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kcm/config.c b/kcm/config.c index c780db24f..42f896f3f 100644 --- a/kcm/config.c +++ b/kcm/config.c @@ -270,7 +270,7 @@ ccache_init_system(void) renew_life = kcm_system_config_get_string("renew_life"); if (renew_life == NULL) - renew_life = "2147483647s"; + renew_life = "6 months"; if (renew_life != NULL) { ccache->renew_life = parse_time(renew_life, "s"); diff --git a/kuser/kinit.c b/kuser/kinit.c index 0d2c41bee..4e93c6905 100644 --- a/kuser/kinit.c +++ b/kuser/kinit.c @@ -553,7 +553,7 @@ get_new_tickets(krb5_context context, addrs_flag ? FALSE : TRUE); if (renew_life == NULL && renewable_flag) - renewstr = "2147483647s"; + renewstr = "6 months"; if (renew_life) renewstr = renew_life; if (renewstr) { diff --git a/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h index 448938b28..4d524ce1b 100644 --- a/lib/krb5/krb5_locl.h +++ b/lib/krb5/krb5_locl.h @@ -322,11 +322,11 @@ typedef struct krb5_context_data { #endif #ifndef KRB5_TKT_LIFETIME_DEFAULT -# define KRB5_TKT_LIFETIME_DEFAULT 2147483647 /* seconds */ +# define KRB5_TKT_LIFETIME_DEFAULT 15778800 /* seconds */ #endif #ifndef KRB5_TKT_RENEW_LIFETIME_DEFAULT -# define KRB5_TKT_RENEW_LIFETIME_DEFAULT 2147483647 /* seconds */ +# define KRB5_TKT_RENEW_LIFETIME_DEFAULT 15778800 /* seconds */ #endif #ifdef PKINIT