From: Andrew Bartlett Date: Tue, 18 Sep 2018 01:50:55 +0000 (-0700) Subject: s4:kdc: Move calls using the samba4 name to be right after each other X-Git-Tag: tdb-1.4.6~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7bd176f4cb5d058337b64819858eca2764bd88e;p=thirdparty%2Fsamba.git s4:kdc: Move calls using the samba4 name to be right after each other These all need to be in sync NOTE: THIS COMMIT WON'T COMPILE/WORK ON ITS OWN! Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher --- diff --git a/source4/kdc/kdc-heimdal.c b/source4/kdc/kdc-heimdal.c index 02adb8d8dc4..f3bab824655 100644 --- a/source4/kdc/kdc-heimdal.c +++ b/source4/kdc/kdc-heimdal.c @@ -438,12 +438,6 @@ static void kdc_post_fork(struct task_server *task, struct process_details *pd) return; } - ret = krb5_kt_register(kdc->smb_krb5_context->krb5_context, &hdb_kt_ops); - if(ret) { - task_server_terminate(task, "kdc: failed to register keytab plugin", true); - return; - } - kdc->keytab_name = talloc_asprintf(kdc, "HDB:samba4:&%p", kdc->base_ctx); if (kdc->keytab_name == NULL) { task_server_terminate(task, @@ -452,6 +446,12 @@ static void kdc_post_fork(struct task_server *task, struct process_details *pd) return; } + ret = krb5_kt_register(kdc->smb_krb5_context->krb5_context, &hdb_kt_ops); + if(ret) { + task_server_terminate(task, "kdc: failed to register keytab plugin", true); + return; + } + /* Register WinDC hooks */ ret = krb5_plugin_register(kdc->smb_krb5_context->krb5_context, PLUGIN_TYPE_DATA, "windc",