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

use appdefaults for everything. defaults are now as in kauth.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10612 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2001-08-31 10:01:31 +00:00
parent 8224db10b5
commit df4581e760
1 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
kuser/kinit.c
View File

@@ -52,8 +52,8 @@ struct getarg_strings etype_str;
int use_keytab = 0; int use_keytab = 0;
char *keytab_str = NULL; char *keytab_str = NULL;
#ifdef KRB4 #ifdef KRB4
extern int do_afslog; int get_v4_tgt = -1;
extern int get_v4_tgt; int do_afslog = -1;
int convert_524; int convert_524;
#endif #endif
int fcache_version; int fcache_version;
@@ -553,22 +553,6 @@ main (int argc, char **argv)
if (ret) if (ret)
errx(1, "krb5_init_context failed: %d", ret); errx(1, "krb5_init_context failed: %d", ret);
/* XXX no way to figure out if set without explict test */
if(krb5_config_get_string(context, NULL, "libdefaults",
"forwardable", NULL))
forwardable_flag = krb5_config_get_bool (context, NULL,
"libdefaults",
"forwardable",
NULL);
#ifdef KRB4
get_v4_tgt = krb5_config_get_bool_default (context, NULL,
get_v4_tgt,
"libdefaults",
"krb4_get_tickets",
NULL);
#endif
if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind)) if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
usage(1); usage(1);
@@ -634,14 +618,10 @@ main (int argc, char **argv)
ticket_life = tmp; ticket_life = tmp;
} }
#ifdef KRB4 #ifdef KRB4
get_v4_tgt = krb5_config_get_bool_default (context, if(get_v4_tgt == -1)
NULL, krb5_appdefault_boolean(context, "kinit",
get_v4_tgt, krb5_principal_get_realm(context, principal),
"realms", "krb4_get_tickets", get_v4_tgt, &get_v4_tgt);
krb5_principal_get_realm(context,
principal),
"krb4_get_tickets",
NULL);
#endif #endif