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

Move parsing of the PK-INIT configuration file to the library so

Browse Source 
application doesn't need to deal with it.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17530 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-05-11 10:16:41 +00:00
parent 1e12165c58
commit 22a9431c92
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kuser/kinit.c
View File

@@ -71,9 +71,6 @@ int fcache_version;
char *password_file = NULL;
char *pk_user_id = NULL;
char *pk_x509_anchors = NULL;
char **pk_x509_pool = NULL;
char **pk_x509_revoke = NULL;
static char *krb4_cc_name;
@@ -484,8 +481,8 @@ get_new_tickets(krb5_context context,
principal,
pk_user_id,
pk_x509_anchors,
pk_x509_pool,
pk_x509_revoke,
NULL,
NULL,
0,
NULL,
NULL,
@@ -825,23 +822,6 @@ main (int argc, char **argv)
krb5_principal_get_realm(context, principal),
"afslog", TRUE, &do_afslog);
/* XXX implement krb5_appdefault_strings */
pk_x509_pool = krb5_config_get_strings(context, NULL,
"appdefaults",
"pkinit-pool",
NULL);
pk_x509_revoke = krb5_config_get_strings(context, NULL,
"appdefaults",
"pkinit-revoke",
NULL);
if (pk_x509_anchors == NULL)
krb5_appdefault_string(context, "kinit",
krb5_principal_get_realm(context, principal),
"pkinit-anchors", NULL, &pk_x509_anchors);
if(!addrs_flag && extra_addresses.num_strings > 0)
krb5_errx(context, 1, "specifying both extra addresses and "
"no addresses makes no sense");