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
This commit is contained in:
@@ -1270,7 +1270,7 @@ Write about the kdc.
|
|||||||
|
|
||||||
@example
|
@example
|
||||||
[kdc]
|
[kdc]
|
||||||
pkinit_enable = yes
|
enable-pkinit = yes
|
||||||
pkinit_identity = FILE:/secure/kdc.crt,/secure/kdc.key
|
pkinit_identity = FILE:/secure/kdc.crt,/secure/kdc.key
|
||||||
pkinit_anchors = FILE:/path/to/trust-anchors.pem
|
pkinit_anchors = FILE:/path/to/trust-anchors.pem
|
||||||
pkinit_pool = PKCS12:/path/to/useful-intermediate-certs.pfx
|
pkinit_pool = PKCS12:/path/to/useful-intermediate-certs.pfx
|
||||||
|
@@ -512,7 +512,7 @@ configure(krb5_context context, int argc, char **argv)
|
|||||||
NULL,
|
NULL,
|
||||||
config->enable_pkinit,
|
config->enable_pkinit,
|
||||||
"kdc",
|
"kdc",
|
||||||
"pkinit_enable",
|
"enable-pkinit",
|
||||||
NULL);
|
NULL);
|
||||||
if (config->enable_pkinit) {
|
if (config->enable_pkinit) {
|
||||||
const char *user_id, *anchors, *ocsp_file;
|
const char *user_id, *anchors, *ocsp_file;
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
[kdc]
|
[kdc]
|
||||||
enable-digest = true
|
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_identity = FILE:@srcdir@/../../lib/hx509/data/kdc.crt,@srcdir@/../../lib/hx509/data/kdc.key
|
||||||
pkinit_anchors = FILE:@srcdir@/../../lib/hx509/data/ca.crt
|
pkinit_anchors = FILE:@srcdir@/../../lib/hx509/data/ca.crt
|
||||||
pkinit_pool = FILE:@srcdir@/../../lib/hx509/data/sub-ca.crt
|
pkinit_pool = FILE:@srcdir@/../../lib/hx509/data/sub-ca.crt
|
||||||
|
Reference in New Issue
Block a user