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

add [appdefaults]kinit/pkinit-ca-dir

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13100 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-11-08 19:23:51 +00:00
parent cb698a314c
commit ceffd3f0a4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kuser/kinit.c
View File

@@ -448,7 +448,7 @@ get_new_tickets(krb5_context context,
if (pac_flag != -1) if (pac_flag != -1)
krb5_get_init_creds_opt_set_paq_request(context, opt, krb5_get_init_creds_opt_set_paq_request(context, opt,
pac_flag ? TRUE : FALSE); pac_flag ? TRUE : FALSE);
if (pk_cert_file || pk_key_file || pk_ca_dir) { if (pk_cert_file || pk_key_file) {
ret = krb5_get_init_creds_opt_set_pkinit(context, opt, ret = krb5_get_init_creds_opt_set_pkinit(context, opt,
pk_cert_file, pk_cert_file,
pk_key_file, pk_key_file,
@@ -704,6 +704,11 @@ main (int argc, char **argv)
krb5_principal_get_realm(context, principal), krb5_principal_get_realm(context, principal),
"afslog", TRUE, &do_afslog); "afslog", TRUE, &do_afslog);
if (pk_ca_dir == NULL)
krb5_appdefault_string(context, "kinit",
krb5_principal_get_realm(context, principal),
"pkinit-ca-dir", NULL, &pk_ca_dir);
if(!addrs_flag && extra_addresses.num_strings > 0) if(!addrs_flag && extra_addresses.num_strings > 0)
krb5_errx(context, 1, "specifying both extra addresses and " krb5_errx(context, 1, "specifying both extra addresses and "
"no addresses makes no sense"); "no addresses makes no sense");