From 8466eac79de17ee0168d02f6f95427dd87aec25b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sun, 19 Nov 2006 04:16:49 +0000 Subject: [PATCH] revert the enable-pkinit change, and make it consistant with all other other enable- options git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19075 ec53bebd-3082-4978-b11e-865c3cabbd6b --- doc/setup.texi | 2 +- kdc/config.c | 2 +- tests/kdc/krb5.conf.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/setup.texi b/doc/setup.texi index 0755fe64c..f962bddc3 100644 --- a/doc/setup.texi +++ b/doc/setup.texi @@ -1270,7 +1270,7 @@ Write about the kdc. @example [kdc] - pkinit_enable = yes + enable-pkinit = yes pkinit_identity = FILE:/secure/kdc.crt,/secure/kdc.key pkinit_anchors = FILE:/path/to/trust-anchors.pem pkinit_pool = PKCS12:/path/to/useful-intermediate-certs.pfx diff --git a/kdc/config.c b/kdc/config.c index 656fb39d4..ae6ba15cf 100644 --- a/kdc/config.c +++ b/kdc/config.c @@ -512,7 +512,7 @@ configure(krb5_context context, int argc, char **argv) NULL, config->enable_pkinit, "kdc", - "pkinit_enable", + "enable-pkinit", NULL); if (config->enable_pkinit) { const char *user_id, *anchors, *ocsp_file; diff --git a/tests/kdc/krb5.conf.in b/tests/kdc/krb5.conf.in index f1bb46ebe..a522c7bae 100644 --- a/tests/kdc/krb5.conf.in +++ b/tests/kdc/krb5.conf.in @@ -18,7 +18,7 @@ [kdc] enable-digest = true - pkinit_enable = true + enable-pkinit = true pkinit_identity = FILE:@srcdir@/../../lib/hx509/data/kdc.crt,@srcdir@/../../lib/hx509/data/kdc.key pkinit_anchors = FILE:@srcdir@/../../lib/hx509/data/ca.crt pkinit_pool = FILE:@srcdir@/../../lib/hx509/data/sub-ca.crt