From d31c63863f159c5e15ea75978a41dcf8d72278d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Tue, 12 Dec 2006 16:35:41 +0000 Subject: [PATCH] Read the appdefault configration before we try to use the flags. Bug reported by Ingemar Nilsson. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19323 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kuser/kinit.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/kuser/kinit.c b/kuser/kinit.c index 02e628539..1e48e101d 100644 --- a/kuser/kinit.c +++ b/kuser/kinit.c @@ -810,6 +810,20 @@ main (int argc, char **argv) if(fcache_version) krb5_set_fcache_version(context, fcache_version); + if(renewable_flag == -1) + /* this seems somewhat pointless, but whatever */ + krb5_appdefault_boolean(context, "kinit", + krb5_principal_get_realm(context, principal), + "renewable", FALSE, &renewable_flag); + if(get_v4_tgt == -1) + krb5_appdefault_boolean(context, "kinit", + krb5_principal_get_realm(context, principal), + "krb4_get_tickets", FALSE, &get_v4_tgt); + if(do_afslog == -1) + krb5_appdefault_boolean(context, "kinit", + krb5_principal_get_realm(context, principal), + "afslog", TRUE, &do_afslog); + if(cred_cache) ret = krb5_cc_resolve(context, cred_cache, &ccache); else { @@ -850,19 +864,6 @@ main (int argc, char **argv) ticket_life = tmp; } - if(renewable_flag == -1) - /* this seems somewhat pointless, but whatever */ - krb5_appdefault_boolean(context, "kinit", - krb5_principal_get_realm(context, principal), - "renewable", FALSE, &renewable_flag); - if(get_v4_tgt == -1) - krb5_appdefault_boolean(context, "kinit", - krb5_principal_get_realm(context, principal), - "krb4_get_tickets", FALSE, &get_v4_tgt); - if(do_afslog == -1) - krb5_appdefault_boolean(context, "kinit", - krb5_principal_get_realm(context, principal), - "afslog", TRUE, &do_afslog); if(addrs_flag == 0 && extra_addresses.num_strings > 0) krb5_errx(context, 1, "specifying both extra addresses and "