From 431853c84644c02e6bff1b325af5e94d3b1eacc6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Mar 2011 23:06:40 +0100 Subject: Merge new lorikeet heimdal, revision 85ed7247f515770c73b1f1ced1739f6ce19d75d2 Autobuild-User: Jelmer Vernooij Autobuild-Date: Mon Mar 14 23:53:46 CET 2011 on sn-devel-104 --- source4/heimdal/kdc/default_config.c | 6 +++--- source4/heimdal/kdc/kdc.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'source4/heimdal/kdc') diff --git a/source4/heimdal/kdc/default_config.c b/source4/heimdal/kdc/default_config.c index e26245323c..1441c3161e 100644 --- a/source4/heimdal/kdc/default_config.c +++ b/source4/heimdal/kdc/default_config.c @@ -272,7 +272,7 @@ krb5_kdc_pkinit_config(krb5_context context, krb5_kdc_configuration *config) if (config->pkinit_kdc_identity == NULL) { if (config->pkinit_kdc_friendly_name == NULL) - config->pkinit_kdc_friendly_name = + config->pkinit_kdc_friendly_name = strdup("O=System Identity,CN=com.apple.kerberos.kdc"); config->pkinit_kdc_identity = strdup("KEYCHAIN:"); } @@ -284,7 +284,7 @@ krb5_kdc_pkinit_config(krb5_context context, krb5_kdc_configuration *config) if (config->enable_pkinit) { if (config->pkinit_kdc_identity == NULL) krb5_errx(context, 1, "pkinit enabled but no identity"); - + if (config->pkinit_kdc_anchors == NULL) krb5_errx(context, 1, "pkinit enabled but no X509 anchors"); @@ -298,4 +298,4 @@ krb5_kdc_pkinit_config(krb5_context context, krb5_kdc_configuration *config) return 0; #endif /* PKINIT */ -} +} diff --git a/source4/heimdal/kdc/kdc.h b/source4/heimdal/kdc/kdc.h index c353ca1c5f..139b5e7087 100644 --- a/source4/heimdal/kdc/kdc.h +++ b/source4/heimdal/kdc/kdc.h @@ -41,6 +41,7 @@ #ifndef __KDC_H__ #define __KDC_H__ +#include #include enum krb5_kdc_trpolicy { -- cgit