From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 14 Nov 2010 22:08:43 +0000 (+1100)
Subject: s4-kdc update startup routines after heimdal update
X-Git-Tag: samba-4.0.0alpha14~1048
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=be8526a0a1dbc070ce14414b0ab132816ddd20f6;p=samba.git

s4-kdc update startup routines after heimdal update

We should check the errors from krb5_kdc_windc_init and we now need to
additionally run krb5_kdc_pkinit_config()

Andrew Bartlett
---

diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index f8e9b02fa58..d39e616e7e7 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -800,7 +800,19 @@ static void kdc_task_init(struct task_server *task)
 		return;
 	}
 
-	krb5_kdc_windc_init(kdc->smb_krb5_context->krb5_context);
+	ret = krb5_kdc_windc_init(kdc->smb_krb5_context->krb5_context);
+
+	if(ret) {
+		task_server_terminate(task, "kdc: failed to init windc plugin", true);
+		return;
+	}
+
+	ret = krb5_kdc_pkinit_config(kdc->smb_krb5_context->krb5_context, kdc->config);
+
+	if(ret) {
+		task_server_terminate(task, "kdc: failed to init kdc pkinit subsystem", true);
+		return;
+	}
 
 	/* start listening on the configured network interfaces */
 	status = kdc_startup_interfaces(kdc, task->lp_ctx, ifaces);