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

Read the appdefault configration before we try to use the flags.

Browse Source 
Bug reported by Ingemar Nilsson.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19323 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-12 16:35:41 +00:00
parent f594e615ea
commit d31c63863f
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kuser/kinit.c
View File

@@ -810,6 +810,20 @@ main (int argc, char **argv)
if(fcache_version) if(fcache_version)
krb5_set_fcache_version(context, 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) if(cred_cache)
ret = krb5_cc_resolve(context, cred_cache, &ccache); ret = krb5_cc_resolve(context, cred_cache, &ccache);
else { else {
@@ -850,19 +864,6 @@ main (int argc, char **argv)
ticket_life = tmp; 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) if(addrs_flag == 0 && extra_addresses.num_strings > 0)
krb5_errx(context, 1, "specifying both extra addresses and " krb5_errx(context, 1, "specifying both extra addresses and "