Rename pki-chain to pki-pool to match rest of code.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17106 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
11
kdc/config.c
11
kdc/config.c
@@ -502,7 +502,7 @@ configure(krb5_context context, int argc, char **argv)
|
|||||||
NULL);
|
NULL);
|
||||||
if (config->enable_pkinit) {
|
if (config->enable_pkinit) {
|
||||||
const char *user_id, *anchors;
|
const char *user_id, *anchors;
|
||||||
char **chain, **revoke;
|
char **chain, **pool;
|
||||||
|
|
||||||
user_id = krb5_config_get_string(context, NULL,
|
user_id = krb5_config_get_string(context, NULL,
|
||||||
"kdc",
|
"kdc",
|
||||||
@@ -518,9 +518,9 @@ configure(krb5_context context, int argc, char **argv)
|
|||||||
if (anchors == NULL)
|
if (anchors == NULL)
|
||||||
krb5_errx(context, 1, "pkinit enabled but no X509 anchors");
|
krb5_errx(context, 1, "pkinit enabled but no X509 anchors");
|
||||||
|
|
||||||
chain = krb5_config_get_strings(context, NULL,
|
pool = krb5_config_get_strings(context, NULL,
|
||||||
"kdc",
|
"kdc",
|
||||||
"pki-chain",
|
"pki-pool",
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
revoke = krb5_config_get_strings(context, NULL,
|
revoke = krb5_config_get_strings(context, NULL,
|
||||||
@@ -528,9 +528,10 @@ configure(krb5_context context, int argc, char **argv)
|
|||||||
"pki-revoke",
|
"pki-revoke",
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
_kdc_pk_initialize(context, config, user_id, anchors, chain, revoke);
|
_kdc_pk_initialize(context, config, user_id, anchors, pool, revoke);
|
||||||
|
|
||||||
krb5_config_free_strings(chain);
|
krb5_config_free_strings(pool);
|
||||||
|
krb5_config_free_strings(revoke);
|
||||||
|
|
||||||
config->enable_pkinit_princ_in_cert =
|
config->enable_pkinit_princ_in_cert =
|
||||||
krb5_config_get_bool_default(context,
|
krb5_config_get_bool_default(context,
|
||||||
|
Reference in New Issue
Block a user