Finish removal of iconv_convenience in public API's.
[bbaumbach/samba-autobuild/.git] / source4 / kdc / kdc.c
index 2c07f89f171f950ad1ae7b6cfc6d7e97b2f4340e..b824bb86b089edddb3576ca0c12c66e2d56958bc 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    KDC Server startup
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,6 +29,7 @@
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
 #include "lib/tsocket/tsocket.h"
+#include "libcli/util/tstream.h"
 #include "system/network.h"
 #include "../lib/util/dlinklist.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 
 
-/* Disgusting hack to get a mem_ctx and lp_ctx into the hdb plugin, when 
- * used as a keytab */
-TALLOC_CTX *hdb_samba4_mem_ctx;
-struct tevent_context *hdb_samba4_ev_ctx;
-struct loadparm_context *hdb_samba4_lp_ctx;
+extern struct krb5plugin_windc_ftable windc_plugin_table;
+extern struct hdb_method hdb_samba4;
 
 typedef bool (*kdc_process_fn_t)(struct kdc_server *kdc,
-                                TALLOC_CTX *mem_ctx, 
-                                DATA_BLOB *input, 
+                                TALLOC_CTX *mem_ctx,
+                                DATA_BLOB *input,
                                 DATA_BLOB *reply,
                                 struct tsocket_address *peer_addr,
                                 struct tsocket_address *my_addr,
@@ -73,10 +71,9 @@ struct kdc_tcp_connection {
        /* the kdc_server the connection belongs to */
        struct kdc_socket *kdc_socket;
 
-       struct tsocket_address *local_address;
-       struct tsocket_address *remote_address;
+       struct tstream_context *tstream;
 
-       struct packet_context *packet;
+       struct tevent_queue *send_queue;
 };
 
 static void kdc_tcp_terminate_connection(struct kdc_tcp_connection *kdcconn, const char *reason)
@@ -84,83 +81,20 @@ static void kdc_tcp_terminate_connection(struct kdc_tcp_connection *kdcconn, con
        stream_terminate_connection(kdcconn->conn, reason);
 }
 
-/*
-  receive a full packet on a KDC connection
-*/
-static NTSTATUS kdc_tcp_recv(void *private_data, DATA_BLOB blob)
-{
-       struct kdc_tcp_connection *kdcconn = talloc_get_type(private_data,
-                                                            struct kdc_tcp_connection);
-       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       TALLOC_CTX *tmp_ctx = talloc_new(kdcconn);
-       int ret;
-       DATA_BLOB input, reply;
-       talloc_steal(tmp_ctx, blob.data);
-
-       /* Call krb5 */
-       input = data_blob_const(blob.data + 4, blob.length - 4); 
-
-       ret = kdcconn->kdc_socket->process(kdcconn->kdc_socket->kdc,
-                                          tmp_ctx,
-                                          &input,
-                                          &reply,
-                                          kdcconn->remote_address,
-                                          kdcconn->local_address,
-                                          0 /* Not datagram */);
-       if (!ret) {
-               talloc_free(tmp_ctx);
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       /* and now encode the reply */
-       blob = data_blob_talloc(kdcconn, NULL, reply.length + 4);
-       if (!blob.data) {
-               talloc_free(tmp_ctx);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       RSIVAL(blob.data, 0, reply.length);
-       memcpy(blob.data + 4, reply.data, reply.length);        
-
-       status = packet_send(kdcconn->packet, blob);
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(tmp_ctx);
-               return status;
-       }
-
-       /* the call isn't needed any more */
-       talloc_free(tmp_ctx);
-       return NT_STATUS_OK;
-}
-
-/*
-  receive some data on a KDC connection
-*/
-static void kdc_tcp_recv_handler(struct stream_connection *conn, uint16_t flags)
+static void kdc_tcp_recv(struct stream_connection *conn, uint16_t flags)
 {
        struct kdc_tcp_connection *kdcconn = talloc_get_type(conn->private_data,
                                                             struct kdc_tcp_connection);
-       packet_recv(kdcconn->packet);
+       /* this should never be triggered! */
+       kdc_tcp_terminate_connection(kdcconn, "kdc_tcp_recv: called");
 }
 
-/*
-  called on a tcp recv error
-*/
-static void kdc_tcp_recv_error(void *private_data, NTSTATUS status)
-{
-       struct kdc_tcp_connection *kdcconn = talloc_get_type(private_data,
-                                            struct kdc_tcp_connection);
-       kdc_tcp_terminate_connection(kdcconn, nt_errstr(status));
-}
-
-/*
-  called when we can write to a connection
-*/
 static void kdc_tcp_send(struct stream_connection *conn, uint16_t flags)
 {
        struct kdc_tcp_connection *kdcconn = talloc_get_type(conn->private_data,
                                                             struct kdc_tcp_connection);
-       packet_queue_run(kdcconn->packet);
+       /* this should never be triggered! */
+       kdc_tcp_terminate_connection(kdcconn, "kdc_tcp_send: called");
 }
 
 /**
@@ -169,8 +103,8 @@ static void kdc_tcp_send(struct stream_connection *conn, uint16_t flags)
 */
 
 static bool kdc_process(struct kdc_server *kdc,
-                       TALLOC_CTX *mem_ctx, 
-                       DATA_BLOB *input, 
+                       TALLOC_CTX *mem_ctx,
+                       DATA_BLOB *input,
                        DATA_BLOB *reply,
                        struct tsocket_address *peer_addr,
                        struct tsocket_address *my_addr,
@@ -197,7 +131,7 @@ static bool kdc_process(struct kdc_server *kdc,
        DEBUG(10,("Received KDC packet of length %lu from %s\n",
                                (long)input->length - 4, pa));
 
-       ret = krb5_kdc_process_krb5_request(kdc->smb_krb5_context->krb5_context, 
+       ret = krb5_kdc_process_krb5_request(kdc->smb_krb5_context->krb5_context,
                                            kdc->config,
                                            input->data, input->length,
                                            &k5_reply,
@@ -212,83 +146,206 @@ static bool kdc_process(struct kdc_server *kdc,
                *reply = data_blob_talloc(mem_ctx, k5_reply.data, k5_reply.length);
                krb5_data_free(&k5_reply);
        } else {
-               *reply = data_blob(NULL, 0);    
+               *reply = data_blob(NULL, 0);
        }
        return true;
 }
 
-/*
-  called when we get a new connection
-*/
-static void kdc_tcp_accept(struct stream_connection *conn)
+struct kdc_tcp_call {
+       struct kdc_tcp_connection *kdc_conn;
+       DATA_BLOB in;
+       DATA_BLOB out;
+       uint8_t out_hdr[4];
+       struct iovec out_iov[2];
+};
+
+static void kdc_tcp_call_writev_done(struct tevent_req *subreq);
+
+static void kdc_tcp_call_loop(struct tevent_req *subreq)
 {
-       struct kdc_socket *kdc_socket = talloc_get_type(conn->private_data, struct kdc_socket);
-       struct kdc_tcp_connection *kdcconn;
-       struct socket_address *src_addr;
-       struct socket_address *my_addr;
-       int ret;
+       struct kdc_tcp_connection *kdc_conn = tevent_req_callback_data(subreq,
+                                     struct kdc_tcp_connection);
+       struct kdc_tcp_call *call;
+       NTSTATUS status;
+       bool ok;
 
-       kdcconn = talloc_zero(conn, struct kdc_tcp_connection);
-       if (!kdcconn) {
-               stream_terminate_connection(conn, "kdc_tcp_accept: out of memory");
+       call = talloc(kdc_conn, struct kdc_tcp_call);
+       if (call == NULL) {
+               kdc_tcp_terminate_connection(kdc_conn, "kdc_tcp_call_loop: "
+                               "no memory for kdc_tcp_call");
                return;
        }
-       kdcconn->conn           = conn;
-       kdcconn->kdc_socket     = kdc_socket;
-       conn->private_data    = kdcconn;
+       call->kdc_conn = kdc_conn;
+
+       status = tstream_read_pdu_blob_recv(subreq,
+                                           call,
+                                           &call->in);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *reason;
+
+               reason = talloc_asprintf(call, "kdc_tcp_call_loop: "
+                                        "tstream_read_pdu_blob_recv() - %s",
+                                        nt_errstr(status));
+               if (!reason) {
+                       reason = nt_errstr(status);
+               }
 
-       src_addr = socket_get_peer_addr(kdcconn->conn->socket, kdcconn);
-       if (!src_addr) {
-               kdc_tcp_terminate_connection(kdcconn, "kdc_tcp_accept: out of memory");
+               kdc_tcp_terminate_connection(kdc_conn, reason);
                return;
        }
 
-       my_addr = socket_get_my_addr(kdcconn->conn->socket, kdcconn);
-       if (!my_addr) {
-               kdc_tcp_terminate_connection(kdcconn, "kdc_tcp_accept: out of memory");
+       DEBUG(10,("Received krb5 TCP packet of length %lu from %s\n",
+                (long) call->in.length,
+                tsocket_address_string(kdc_conn->conn->remote_address, call)));
+
+       /* skip length header */
+       call->in.data +=4;
+       call->in.length -= 4;
+
+       /* Call krb5 */
+       ok = kdc_conn->kdc_socket->process(kdc_conn->kdc_socket->kdc,
+                                          call,
+                                          &call->in,
+                                          &call->out,
+                                          kdc_conn->conn->remote_address,
+                                          kdc_conn->conn->local_address,
+                                          0 /* Stream */);
+       if (!ok) {
+               kdc_tcp_terminate_connection(kdc_conn,
+                               "kdc_tcp_call_loop: process function failed");
                return;
        }
 
-       ret = tsocket_address_bsd_from_sockaddr(kdcconn,
-                                               src_addr->sockaddr,
-                                               src_addr->sockaddrlen,
-                                               &kdcconn->remote_address);
-       if (ret < 0) {
-               kdc_tcp_terminate_connection(kdcconn, "kdc_tcp_accept: out of memory");
+       /* First add the length of the out buffer */
+       RSIVAL(call->out_hdr, 0, call->out.length);
+       call->out_iov[0].iov_base = call->out_hdr;
+       call->out_iov[0].iov_len = 4;
+
+       call->out_iov[1].iov_base = call->out.data;
+       call->out_iov[1].iov_len = call->out.length;
+
+       subreq = tstream_writev_queue_send(call,
+                                          kdc_conn->conn->event.ctx,
+                                          kdc_conn->tstream,
+                                          kdc_conn->send_queue,
+                                          call->out_iov, 2);
+       if (subreq == NULL) {
+               kdc_tcp_terminate_connection(kdc_conn, "kdc_tcp_call_loop: "
+                               "no memory for tstream_writev_queue_send");
+               return;
+       }
+       tevent_req_set_callback(subreq, kdc_tcp_call_writev_done, call);
+
+       /*
+        * The krb5 tcp pdu's has the length as 4 byte (initial_read_size),
+        * packet_full_request_u32 provides the pdu length then.
+        */
+       subreq = tstream_read_pdu_blob_send(kdc_conn,
+                                           kdc_conn->conn->event.ctx,
+                                           kdc_conn->tstream,
+                                           4, /* initial_read_size */
+                                           packet_full_request_u32,
+                                           kdc_conn);
+       if (subreq == NULL) {
+               kdc_tcp_terminate_connection(kdc_conn, "kdc_tcp_call_loop: "
+                               "no memory for tstream_read_pdu_blob_send");
                return;
        }
+       tevent_req_set_callback(subreq, kdc_tcp_call_loop, kdc_conn);
+}
 
-       ret = tsocket_address_bsd_from_sockaddr(kdcconn,
-                                               my_addr->sockaddr,
-                                               my_addr->sockaddrlen,
-                                               &kdcconn->local_address);
-       if (ret < 0) {
-               kdc_tcp_terminate_connection(kdcconn, "kdc_tcp_accept: out of memory");
+static void kdc_tcp_call_writev_done(struct tevent_req *subreq)
+{
+       struct kdc_tcp_call *call = tevent_req_callback_data(subreq,
+                       struct kdc_tcp_call);
+       int sys_errno;
+       int rc;
+
+       rc = tstream_writev_queue_recv(subreq, &sys_errno);
+       TALLOC_FREE(subreq);
+       if (rc == -1) {
+               const char *reason;
+
+               reason = talloc_asprintf(call, "kdc_tcp_call_writev_done: "
+                                        "tstream_writev_queue_recv() - %d:%s",
+                                        sys_errno, strerror(sys_errno));
+               if (!reason) {
+                       reason = "kdc_tcp_call_writev_done: tstream_writev_queue_recv() failed";
+               }
+
+               kdc_tcp_terminate_connection(call->kdc_conn, reason);
+               return;
+       }
+
+       /* We don't care about errors */
+
+       talloc_free(call);
+}
+
+/*
+  called when we get a new connection
+*/
+static void kdc_tcp_accept(struct stream_connection *conn)
+{
+       struct kdc_socket *kdc_socket;
+       struct kdc_tcp_connection *kdc_conn;
+       struct tevent_req *subreq;
+       int rc;
+
+       kdc_conn = talloc_zero(conn, struct kdc_tcp_connection);
+       if (kdc_conn == NULL) {
+               stream_terminate_connection(conn,
+                               "kdc_tcp_accept: out of memory");
+               return;
+       }
+
+       kdc_conn->send_queue = tevent_queue_create(conn, "kdc_tcp_accept");
+       if (kdc_conn->send_queue == NULL) {
+               stream_terminate_connection(conn,
+                               "kdc_tcp_accept: out of memory");
                return;
        }
 
-       TALLOC_FREE(src_addr);
-       TALLOC_FREE(my_addr);
+       kdc_socket = talloc_get_type(conn->private_data, struct kdc_socket);
+
+       TALLOC_FREE(conn->event.fde);
+
+       rc = tstream_bsd_existing_socket(kdc_conn,
+                       socket_get_fd(conn->socket),
+                       &kdc_conn->tstream);
+       if (rc < 0) {
+               stream_terminate_connection(conn,
+                               "kdc_tcp_accept: out of memory");
+               return;
+       }
 
-       kdcconn->packet = packet_init(kdcconn);
-       if (kdcconn->packet == NULL) {
-               kdc_tcp_terminate_connection(kdcconn, "kdc_tcp_accept: out of memory");
+       kdc_conn->conn = conn;
+       kdc_conn->kdc_socket = kdc_socket;
+       conn->private_data = kdc_conn;
+
+       /*
+        * The krb5 tcp pdu's has the length as 4 byte (initial_read_size),
+        * packet_full_request_u32 provides the pdu length then.
+        */
+       subreq = tstream_read_pdu_blob_send(kdc_conn,
+                                           kdc_conn->conn->event.ctx,
+                                           kdc_conn->tstream,
+                                           4, /* initial_read_size */
+                                           packet_full_request_u32,
+                                           kdc_conn);
+       if (subreq == NULL) {
+               kdc_tcp_terminate_connection(kdc_conn, "kdc_tcp_accept: "
+                               "no memory for tstream_read_pdu_blob_send");
                return;
        }
-       packet_set_private(kdcconn->packet, kdcconn);
-       packet_set_socket(kdcconn->packet, conn->socket);
-       packet_set_callback(kdcconn->packet, kdc_tcp_recv);
-       packet_set_full_request(kdcconn->packet, packet_full_request_u32);
-       packet_set_error_handler(kdcconn->packet, kdc_tcp_recv_error);
-       packet_set_event_context(kdcconn->packet, conn->event.ctx);
-       packet_set_fde(kdcconn->packet, conn->event.fde);
-       packet_set_serialise(kdcconn->packet);
+       tevent_req_set_callback(subreq, kdc_tcp_call_loop, kdc_conn);
 }
 
 static const struct stream_server_ops kdc_tcp_stream_ops = {
        .name                   = "kdc_tcp",
        .accept_connection      = kdc_tcp_accept,
-       .recv_handler           = kdc_tcp_recv_handler,
+       .recv_handler           = kdc_tcp_recv,
        .send_handler           = kdc_tcp_send
 };
 
@@ -315,7 +372,7 @@ static void kdc_udp_call_loop(struct tevent_req *subreq)
        uint8_t *buf;
        ssize_t len;
        int sys_errno;
-       int ret;
+       bool ok;
 
        call = talloc(sock, struct kdc_udp_call);
        if (call == NULL) {
@@ -339,14 +396,14 @@ static void kdc_udp_call_loop(struct tevent_req *subreq)
                 tsocket_address_string(call->src, call)));
 
        /* Call krb5 */
-       ret = sock->kdc_socket->process(sock->kdc_socket->kdc,
-                                       call,
-                                       &call->in,
-                                       &call->out,
-                                       call->src,
-                                       sock->kdc_socket->local_address,
-                                       1 /* Datagram */);
-       if (!ret) {
+       ok = sock->kdc_socket->process(sock->kdc_socket->kdc,
+                                      call,
+                                      &call->in,
+                                      &call->out,
+                                      call->src,
+                                      sock->kdc_socket->local_address,
+                                      1 /* Datagram */);
+       if (!ok) {
                talloc_free(call);
                goto done;
        }
@@ -421,12 +478,12 @@ static NTSTATUS kdc_add_socket(struct kdc_server *kdc,
                return status;
        }
 
-       status = stream_setup_socket(kdc->task->event_ctx, 
+       status = stream_setup_socket(kdc->task->event_ctx,
                                     kdc->task->lp_ctx,
-                                    model_ops, 
-                                    &kdc_tcp_stream_ops, 
-                                    "ip", address, &port, 
-                                    lp_socket_options(kdc->task->lp_ctx), 
+                                    model_ops,
+                                    &kdc_tcp_stream_ops,
+                                    "ip", address, &port,
+                                    lp_socket_options(kdc->task->lp_ctx),
                                     kdc_socket);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("Failed to bind to %s:%u TCP - %s\n",
@@ -487,7 +544,7 @@ static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc, struct loadparm_c
        }
 
        num_interfaces = iface_count(ifaces);
-       
+
        for (i=0; i<num_interfaces; i++) {
                const char *address = talloc_strdup(tmp_ctx, iface_n_ip(ifaces, i));
                uint16_t kdc_port = lp_krb5_port(lp_ctx);
@@ -514,7 +571,7 @@ static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc, struct loadparm_c
 }
 
 
-static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg, 
+static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg,
                                 struct kdc_check_generic_kerberos *r)
 {
        struct PAC_Validate pac_validate;
@@ -532,14 +589,12 @@ static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg,
        /* There is no reply to this request */
        r->out.generic_reply = data_blob(NULL, 0);
 
-       ndr_err = ndr_pull_struct_blob(&r->in.generic_request, msg, 
-                                      lp_iconv_convenience(kdc->task->lp_ctx), 
-                                      &pac_validate,
+       ndr_err = ndr_pull_struct_blob(&r->in.generic_request, msg, &pac_validate,
                                       (ndr_pull_flags_fn_t)ndr_pull_PAC_Validate);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
-       
+
        if (pac_validate.MessageType != 3) {
                /* We don't implement any other message types - such as certificate validation - yet */
                return NT_STATUS_INVALID_PARAMETER;
@@ -550,10 +605,10 @@ static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg,
            || pac_validate.ChecksumAndSignature.length < pac_validate.SignatureLength ) {
                return NT_STATUS_INVALID_PARAMETER;
        }
-       
-       srv_sig = data_blob_const(pac_validate.ChecksumAndSignature.data, 
+
+       srv_sig = data_blob_const(pac_validate.ChecksumAndSignature.data,
                                  pac_validate.ChecksumLength);
-       
+
        if (pac_validate.SignatureType == CKSUMTYPE_HMAC_MD5) {
                etype = ETYPE_ARCFOUR_HMAC_MD5;
        } else {
@@ -564,16 +619,16 @@ static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg,
                }
        }
 
-       ret = krb5_make_principal(kdc->smb_krb5_context->krb5_context, &principal, 
+       ret = krb5_make_principal(kdc->smb_krb5_context->krb5_context, &principal,
                                  lp_realm(kdc->task->lp_ctx),
-                                 "krbtgt", lp_realm(kdc->task->lp_ctx), 
+                                 "krbtgt", lp_realm(kdc->task->lp_ctx),
                                  NULL);
 
        if (ret != 0) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       ret = kdc->config->db[0]->hdb_fetch(kdc->smb_krb5_context->krb5_context, 
+       ret = kdc->config->db[0]->hdb_fetch(kdc->smb_krb5_context->krb5_context,
                                            kdc->config->db[0],
                                            principal,
                                            HDB_F_GET_KRBTGT | HDB_F_DECRYPT,
@@ -582,10 +637,10 @@ static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg,
        if (ret != 0) {
                hdb_free_entry(kdc->smb_krb5_context->krb5_context, &ent);
                krb5_free_principal(kdc->smb_krb5_context->krb5_context, principal);
-       
+
                return NT_STATUS_LOGON_FAILURE;
        }
-       
+
        ret = hdb_enctype2key(kdc->smb_krb5_context->krb5_context, &ent.entry, etype, &key);
 
        if (ret != 0) {
@@ -595,11 +650,11 @@ static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg,
        }
 
        keyblock = key->key;
-       
+
        kdc_sig.type = pac_validate.SignatureType;
        kdc_sig.signature = data_blob_const(&pac_validate.ChecksumAndSignature.data[pac_validate.ChecksumLength],
                                            pac_validate.SignatureLength);
-       ret = check_pac_checksum(msg, srv_sig, &kdc_sig, 
+       ret = check_pac_checksum(msg, srv_sig, &kdc_sig,
                           kdc->smb_krb5_context->krb5_context, &keyblock);
 
        hdb_free_entry(kdc->smb_krb5_context->krb5_context, &ent);
@@ -608,7 +663,7 @@ static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg,
        if (ret != 0) {
                return NT_STATUS_LOGON_FAILURE;
        }
-       
+
        return NT_STATUS_OK;
 }
 
@@ -656,21 +711,21 @@ static void kdc_task_init(struct task_server *task)
 
        ret = smb_krb5_init_context(kdc, task->event_ctx, task->lp_ctx, &kdc->smb_krb5_context);
        if (ret) {
-               DEBUG(1,("kdc_task_init: krb5_init_context failed (%s)\n", 
+               DEBUG(1,("kdc_task_init: krb5_init_context failed (%s)\n",
                         error_message(ret)));
                task_server_terminate(task, "kdc: krb5_init_context failed", true);
-               return; 
+               return;
        }
 
        krb5_add_et_list(kdc->smb_krb5_context->krb5_context, initialize_hdb_error_table_r);
 
-       ret = krb5_kdc_get_config(kdc->smb_krb5_context->krb5_context, 
+       ret = krb5_kdc_get_config(kdc->smb_krb5_context->krb5_context,
                                  &kdc->config);
        if(ret) {
                task_server_terminate(task, "kdc: failed to get KDC configuration", true);
                return;
        }
+
        kdc->config->logf = kdc->smb_krb5_context->logf;
        kdc->config->db = talloc(kdc, struct HDB *);
        if (!kdc->config->db) {
@@ -678,46 +733,46 @@ static void kdc_task_init(struct task_server *task)
                return;
        }
        kdc->config->num_db = 1;
-               
-       status = hdb_samba4_create_kdc(kdc, task->event_ctx, task->lp_ctx, 
-                                      kdc->smb_krb5_context->krb5_context, 
-                                      &kdc->config->db[0]);
-       if (!NT_STATUS_IS_OK(status)) {
-               task_server_terminate(task, "kdc: hdb_samba4_create_kdc (setup KDC database) failed", true);
-               return; 
-       }
 
        /* Register hdb-samba4 hooks for use as a keytab */
 
-       kdc->hdb_samba4_context = talloc(kdc, struct hdb_samba4_context);
-       if (!kdc->hdb_samba4_context) {
+       kdc->base_ctx = talloc_zero(kdc, struct samba_kdc_base_context);
+       if (!kdc->base_ctx) {
                task_server_terminate(task, "kdc: out of memory", true);
-               return; 
+               return;
        }
 
-       kdc->hdb_samba4_context->ev_ctx = task->event_ctx;
-       kdc->hdb_samba4_context->lp_ctx = task->lp_ctx;
+       kdc->base_ctx->ev_ctx = task->event_ctx;
+       kdc->base_ctx->lp_ctx = task->lp_ctx;
+
+       status = hdb_samba4_create_kdc(kdc->base_ctx,
+                                      kdc->smb_krb5_context->krb5_context,
+                                      &kdc->config->db[0]);
+       if (!NT_STATUS_IS_OK(status)) {
+               task_server_terminate(task, "kdc: hdb_samba4_create_kdc (setup KDC database) failed", true);
+               return;
+       }
 
-       ret = krb5_plugin_register(kdc->smb_krb5_context->krb5_context, 
+       ret = krb5_plugin_register(kdc->smb_krb5_context->krb5_context,
                                   PLUGIN_TYPE_DATA, "hdb",
                                   &hdb_samba4);
        if(ret) {
-               task_server_terminate(task, "kdc: failed to register hdb keytab", true);
+               task_server_terminate(task, "kdc: failed to register hdb plugin", true);
                return;
        }
 
        ret = krb5_kt_register(kdc->smb_krb5_context->krb5_context, &hdb_kt_ops);
        if(ret) {
-               task_server_terminate(task, "kdc: failed to register hdb keytab", true);
+               task_server_terminate(task, "kdc: failed to register keytab plugin", true);
                return;
        }
 
-       /* Registar WinDC hooks */
-       ret = krb5_plugin_register(kdc->smb_krb5_context->krb5_context, 
+       /* Register WinDC hooks */
+       ret = krb5_plugin_register(kdc->smb_krb5_context->krb5_context,
                                   PLUGIN_TYPE_DATA, "windc",
                                   &windc_plugin_table);
        if(ret) {
-               task_server_terminate(task, "kdc: failed to register hdb keytab", true);
+               task_server_terminate(task, "kdc: failed to register windc plugin", true);
                return;
        }
 
@@ -730,7 +785,7 @@ static void kdc_task_init(struct task_server *task)
                return;
        }
 
-       status = IRPC_REGISTER(task->msg_ctx, irpc, KDC_CHECK_GENERIC_KERBEROS, 
+       status = IRPC_REGISTER(task->msg_ctx, irpc, KDC_CHECK_GENERIC_KERBEROS,
                               kdc_check_generic_kerberos, kdc);
        if (!NT_STATUS_IS_OK(status)) {
                task_server_terminate(task, "nbtd failed to setup monitoring", true);