oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

default life/renewlife time to KDC policy

Browse Source 
Instead of imposing a default 10 hour ticket lifetime and 1 month renew
lifetime when requesting tickets, increase the default lifetime and
renew lifetime to 2147483647 seconds.  This ensures that in the absence
of any other configuration or command line parameters that the KDC will
determine the ticket lifetime and renew lifetime.

Change-Id: I52b6eeac1ee830a9bf4d0130e8f4ec7b70bc8694
Signed-off-by: Nicolas Williams <nico@twosigma.com>
This commit is contained in:
Jeffrey Altman
2016-11-10 13:04:06 -05:00
committed by Nicolas Williams
parent 616aaf95a8
commit a013e93e95
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kcm/config.c
View File

@@ -270,7 +270,7 @@ ccache_init_system(void)
renew_life = kcm_system_config_get_string("renew_life");
if (renew_life == NULL)
renew_life = "1 month";
renew_life = "2147483647s";
if (renew_life != NULL) {
ccache->renew_life = parse_time(renew_life, "s");

2
kuser/kinit.c
View File

@@ -553,7 +553,7 @@ get_new_tickets(krb5_context context,
addrs_flag ? FALSE : TRUE);
if (renew_life == NULL && renewable_flag)
renewstr = "1 month";
renewstr = "2147483647s";
if (renew_life)
renewstr = renew_life;
if (renewstr) {

9
lib/krb5/init_creds_pw.c
View File

@@ -249,9 +249,12 @@ init_cred (krb5_context context,
tmp = KRB5_TKT_LIFETIME_DEFAULT;
cred->times.endtime = now + tmp;
if ((options->flags & KRB5_GET_INIT_CREDS_OPT_RENEW_LIFE) &&
options->renew_life > 0) {
cred->times.renew_till = now + options->renew_life;
if ((options->flags & KRB5_GET_INIT_CREDS_OPT_RENEW_LIFE)) {
if (options->renew_life > 0)
tmp = options->renew_life;
else
tmp = KRB5_TKT_RENEW_LIFETIME_DEFAULT;
cred->times.renew_till = now + tmp;
}
return 0;

6
lib/krb5/krb5_locl.h
View File

@@ -322,7 +322,11 @@ typedef struct krb5_context_data {
#endif
#ifndef KRB5_TKT_LIFETIME_DEFAULT
# define KRB5_TKT_LIFETIME_DEFAULT (10 * 60 * 60) /* 10 hours */
# define KRB5_TKT_LIFETIME_DEFAULT 2147483647 /* seconds */
#endif
#ifndef KRB5_TKT_RENEW_LIFETIME_DEFAULT
# define KRB5_TKT_RENEW_LIFETIME_DEFAULT 2147483647 /* seconds */
#endif
#ifdef PKINIT