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 f8e9b02fa58361d2f834b3ff8880a7d0d5e5bfe2..d39e616e7e71b4b8077120155263d07e1a54046e 100644 (file)
--- 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);