]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:kdc: Move calls using the samba4 name to be right after each other
authorAndrew Bartlett <abartlet@samba.org>
Tue, 18 Sep 2018 01:50:55 +0000 (18:50 -0700)
committerJoseph Sutton <jsutton@samba.org>
Wed, 19 Jan 2022 20:50:35 +0000 (20:50 +0000)
These all need to be in sync

NOTE: THIS COMMIT WON'T COMPILE/WORK ON ITS OWN!

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source4/kdc/kdc-heimdal.c

index 02adb8d8dc4df76ae13886a36be47e77d2cc86cf..f3bab82465507b825aafcfc03df812bf4a96eeb8 100644 (file)
@@ -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",