From ceffd3f0a40bf599e4e2edc6e4c3d89018779377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sat, 8 Nov 2003 19:23:51 +0000 Subject: [PATCH] add [appdefaults]kinit/pkinit-ca-dir git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13100 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kuser/kinit.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kuser/kinit.c b/kuser/kinit.c index f73c3dbbe..17f6941e6 100644 --- a/kuser/kinit.c +++ b/kuser/kinit.c @@ -448,7 +448,7 @@ get_new_tickets(krb5_context context, if (pac_flag != -1) krb5_get_init_creds_opt_set_paq_request(context, opt, 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, pk_cert_file, pk_key_file, @@ -704,6 +704,11 @@ main (int argc, char **argv) krb5_principal_get_realm(context, principal), "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) krb5_errx(context, 1, "specifying both extra addresses and " "no addresses makes no sense");