From af89d92dfe47d24e4e1c41fd7fb2837506b54f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 18 Nov 2004 03:39:22 +0000 Subject: [PATCH] (get_new_tickets): only complain about ticket renewable lifetime when the user asked for a specific renewable lifetime git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14356 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kuser/kinit.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/kuser/kinit.c b/kuser/kinit.c index 25e46a692..16b0d2c27 100644 --- a/kuser/kinit.c +++ b/kuser/kinit.c @@ -439,6 +439,7 @@ get_new_tickets(krb5_context context, char passwd[256]; krb5_deltat start_time = 0; krb5_deltat renew = 0; + char *renewstr = NULL; memset(&cred, 0, sizeof(cred)); @@ -481,12 +482,14 @@ get_new_tickets(krb5_context context, } if (renew_life == NULL && renewable_flag) - renew_life = "1 month"; - if(renew_life) { - renew = parse_time (renew_life, "s"); + renewstr = "1 month"; + if (renew_life) + renewstr = renew_life; + if (renewstr) { + renew = parse_time (renewstr, "s"); if (renew < 0) - errx (1, "unparsable time: %s", renew_life); - + errx (1, "unparsable time: %s", renewstr); + krb5_get_init_creds_opt_set_renew_life (opt, renew); } @@ -609,7 +612,7 @@ get_new_tickets(krb5_context context, krb5_warnx(context, "NOTICE: ticket lifetime is %s", life); } } - if(renew != 0) { + if(renew_life) { if(abs(cred.times.renew_till - cred.times.starttime - renew) > 30) { char life[32]; unparse_time(cred.times.renew_till - cred.times.starttime,