summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-11-15 09:08:43 +1100
committerAndrew Bartlett <abartlet@samba.org>2010-11-15 01:25:06 +0000
commitbe8526a0a1dbc070ce14414b0ab132816ddd20f6 (patch)
tree660275ec3766f8a03908af84132dc47de5461d30
parentbbfaa9bbdfc7f3c360a2d79124122a360aa9f493 (diff)
downloadsamba-be8526a0a1dbc070ce14414b0ab132816ddd20f6.tar.gz
samba-be8526a0a1dbc070ce14414b0ab132816ddd20f6.tar.bz2
samba-be8526a0a1dbc070ce14414b0ab132816ddd20f6.zip
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
-rw-r--r--source4/kdc/kdc.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index f8e9b02fa5..d39e616e7e 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);