From 2c1421673321a0eb7d0a19c1554739c12a22712e Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Sun, 22 Nov 2009 08:41:10 -0800 Subject: [PATCH] don't override configuration if there is one --- kdc/config.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kdc/config.c b/kdc/config.c index 92a58622f..eeff5c3f8 100644 --- a/kdc/config.c +++ b/kdc/config.c @@ -338,11 +338,12 @@ configure(krb5_context context, int argc, char **argv) #ifdef __APPLE__ config->enable_pkinit = 1; - if (config->pkinit_kdc_friendly_name == NULL) - config->pkinit_kdc_friendly_name = - strdup("O=System Identity,CN=com.apple.kerberos.kdc"); - if (config->pkinit_kdc_identity == NULL) + if (config->pkinit_kdc_identity == NULL) { + if (config->pkinit_kdc_friendly_name == NULL) + config->pkinit_kdc_friendly_name = + strdup("O=System Identity,CN=com.apple.kerberos.kdc"); config->pkinit_kdc_identity = strdup("KEYCHAIN:"); + } if (config->pkinit_kdc_anchors == NULL) config->pkinit_kdc_anchors = strdup("KEYCHAIN:");