dsdb: acl_read fix a missed talloc_steal
[kai/samba.git] / source4 / kdc / kdc.c
index dfd62c55a47dff1e87a948dfba67aae0bb33255b..784b98b07278b08670c66d5f7ac302de3805df92 100644 (file)
@@ -1,9 +1,9 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    KDC Server startup
 
-   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005-2008
    Copyright (C) Andrew Tridgell       2005
    Copyright (C) Stefan Metzmacher     2005
 
    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/>.
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
-#include "smbd/service_stream.h"
 #include "smbd/process_model.h"
-#include "lib/events/events.h"
-#include "lib/socket/socket.h"
-#include "system/network.h"
-#include "lib/util/dlinklist.h"
+#include "lib/tsocket/tsocket.h"
+#include "libcli/util/tstream.h"
 #include "lib/messaging/irpc.h"
+#include "librpc/gen_ndr/ndr_irpc.h"
+#include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "lib/stream/packet.h"
-#include "librpc/gen_ndr/samr.h"
 #include "lib/socket/netif.h"
 #include "param/param.h"
-#include "kdc/kdc.h"
+#include "kdc/kdc-glue.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/session.h"
 
+NTSTATUS server_service_kdc_init(void);
 
-/* Disgusting hack to get a mem_ctx and lp_ctx into the hdb plugin, when 
- * used as a keytab */
-TALLOC_CTX *kdc_mem_ctx;
-struct loadparm_context *kdc_lp_ctx;
+extern struct krb5plugin_windc_ftable windc_plugin_table;
+extern struct hdb_method hdb_samba4;
 
-/* hold all the info needed to send a reply */
-struct kdc_reply {
-       struct kdc_reply *next, *prev;
-       struct socket_address *dest;
-       DATA_BLOB packet;
-};
+static NTSTATUS kdc_proxy_unavailable_error(struct kdc_server *kdc,
+                                           TALLOC_CTX *mem_ctx,
+                                           DATA_BLOB *out)
+{
+       int kret;
+       krb5_data k5_error_blob;
+
+       kret = krb5_mk_error(kdc->smb_krb5_context->krb5_context,
+                            KRB5KDC_ERR_SVC_UNAVAILABLE, NULL, NULL,
+                            NULL, NULL, NULL, NULL, &k5_error_blob);
+       if (kret != 0) {
+               DEBUG(2,(__location__ ": Unable to form krb5 error reply\n"));
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       *out = data_blob_talloc(mem_ctx, k5_error_blob.data, k5_error_blob.length);
+       krb5_data_free(&k5_error_blob);
+       if (!out->data) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-typedef bool (*kdc_process_fn_t)(struct kdc_server *kdc,
-                                TALLOC_CTX *mem_ctx, 
-                                DATA_BLOB *input, 
-                                DATA_BLOB *reply,
-                                struct socket_address *peer_addr, 
-                                struct socket_address *my_addr, 
-                                int datagram);
+       return NT_STATUS_OK;
+}
+
+typedef enum kdc_process_ret (*kdc_process_fn_t)(struct kdc_server *kdc,
+                                                TALLOC_CTX *mem_ctx,
+                                                DATA_BLOB *input,
+                                                DATA_BLOB *reply,
+                                                struct tsocket_address *peer_addr,
+                                                struct tsocket_address *my_addr,
+                                                int datagram);
 
 /* hold information about one kdc socket */
 struct kdc_socket {
-       struct socket_context *sock;
        struct kdc_server *kdc;
-       struct fd_event *fde;
-
-       /* a queue of outgoing replies that have been deferred */
-       struct kdc_reply *send_queue;
-
+       struct tsocket_address *local_address;
        kdc_process_fn_t process;
 };
+
+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];
+};
+
 /*
   state of an open tcp connection
 */
@@ -77,483 +95,782 @@ struct kdc_tcp_connection {
        struct stream_connection *conn;
 
        /* the kdc_server the connection belongs to */
-       struct kdc_server *kdc;
+       struct kdc_socket *kdc_socket;
 
-       struct packet_context *packet;
+       struct tstream_context *tstream;
 
-       kdc_process_fn_t process;
+       struct tevent_queue *send_queue;
 };
 
-/*
-  handle fd send events on a KDC socket
+
+static void kdc_tcp_terminate_connection(struct kdc_tcp_connection *kdcconn, const char *reason)
+{
+       stream_terminate_connection(kdcconn->conn, reason);
+}
+
+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);
+       /* this should never be triggered! */
+       kdc_tcp_terminate_connection(kdcconn, "kdc_tcp_recv: called");
+}
+
+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);
+       /* this should never be triggered! */
+       kdc_tcp_terminate_connection(kdcconn, "kdc_tcp_send: called");
+}
+
+/**
+   Wrapper for krb5_kdc_process_krb5_request, converting to/from Samba
+   calling conventions
 */
-static void kdc_send_handler(struct kdc_socket *kdc_socket)
+
+static enum kdc_process_ret kdc_process(struct kdc_server *kdc,
+                                       TALLOC_CTX *mem_ctx,
+                                       DATA_BLOB *input,
+                                       DATA_BLOB *reply,
+                                       struct tsocket_address *peer_addr,
+                                       struct tsocket_address *my_addr,
+                                       int datagram_reply)
 {
-       while (kdc_socket->send_queue) {
-               struct kdc_reply *rep = kdc_socket->send_queue;
-               NTSTATUS status;
-               size_t sendlen;
-
-               status = socket_sendto(kdc_socket->sock, &rep->packet, &sendlen,
-                                      rep->dest);
-               if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
-                       break;
-               }
-               if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_BUFFER_SIZE)) {
-                       /* Replace with a krb err, response to big */
-               }
-               
-               DLIST_REMOVE(kdc_socket->send_queue, rep);
-               talloc_free(rep);
+       int ret;
+       char *pa;
+       struct sockaddr_storage ss;
+       krb5_data k5_reply;
+       krb5_data_zero(&k5_reply);
+
+       krb5_kdc_update_time(NULL);
+
+       ret = tsocket_address_bsd_sockaddr(peer_addr, (struct sockaddr *) &ss,
+                               sizeof(struct sockaddr_storage));
+       if (ret < 0) {
+               return KDC_PROCESS_FAILED;
+       }
+       pa = tsocket_address_string(peer_addr, mem_ctx);
+       if (pa == NULL) {
+               return KDC_PROCESS_FAILED;
+       }
+
+       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,
+                                           kdc->config,
+                                           input->data, input->length,
+                                           &k5_reply,
+                                           pa,
+                                           (struct sockaddr *) &ss,
+                                           datagram_reply);
+       if (ret == -1) {
+               *reply = data_blob(NULL, 0);
+               return KDC_PROCESS_FAILED;
+       }
+
+       if (ret == HDB_ERR_NOT_FOUND_HERE) {
+               *reply = data_blob(NULL, 0);
+               return KDC_PROCESS_PROXY;
        }
 
-       if (kdc_socket->send_queue == NULL) {
-               EVENT_FD_NOT_WRITEABLE(kdc_socket->fde);
+       if (k5_reply.length) {
+               *reply = data_blob_talloc(mem_ctx, k5_reply.data, k5_reply.length);
+               krb5_data_free(&k5_reply);
+       } else {
+               *reply = data_blob(NULL, 0);
        }
+       return KDC_PROCESS_OK;
 }
 
+static void kdc_tcp_call_proxy_done(struct tevent_req *subreq);
+static void kdc_tcp_call_writev_done(struct tevent_req *subreq);
 
-/*
-  handle fd recv events on a KDC socket
-*/
-static void kdc_recv_handler(struct kdc_socket *kdc_socket)
+static void kdc_tcp_call_loop(struct tevent_req *subreq)
 {
+       struct kdc_tcp_connection *kdc_conn = tevent_req_callback_data(subreq,
+                                     struct kdc_tcp_connection);
+       struct kdc_tcp_call *call;
        NTSTATUS status;
-       TALLOC_CTX *tmp_ctx = talloc_new(kdc_socket);
-       DATA_BLOB blob;
-       struct kdc_reply *rep;
-       DATA_BLOB reply;
-       size_t nread, dsize;
-       struct socket_address *src;
-       struct socket_address *my_addr;
-       int ret;
+       enum kdc_process_ret ret;
+
+       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;
+       }
+       call->kdc_conn = kdc_conn;
 
-       status = socket_pending(kdc_socket->sock, &dsize);
+       status = tstream_read_pdu_blob_recv(subreq,
+                                           call,
+                                           &call->in);
+       TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(tmp_ctx);
+               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);
+               }
+
+               kdc_tcp_terminate_connection(kdc_conn, reason);
                return;
        }
 
-       blob = data_blob_talloc(tmp_ctx, NULL, dsize);
-       if (blob.data == NULL) {
-               /* hope this is a temporary low memory condition */
-               talloc_free(tmp_ctx);
+       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 */
+       ret = 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 (ret == KDC_PROCESS_FAILED) {
+               kdc_tcp_terminate_connection(kdc_conn,
+                               "kdc_tcp_call_loop: process function failed");
                return;
        }
 
-       status = socket_recvfrom(kdc_socket->sock, blob.data, blob.length, &nread,
-                                tmp_ctx, &src);
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(tmp_ctx);
+       if (ret == KDC_PROCESS_PROXY) {
+               uint16_t port;
+
+               if (!kdc_conn->kdc_socket->kdc->am_rodc) {
+                       kdc_tcp_terminate_connection(kdc_conn,
+                                                    "kdc_tcp_call_loop: proxying requested when not RODC");
+                       return;
+               }
+               port = tsocket_address_inet_port(kdc_conn->conn->local_address);
+
+               subreq = kdc_tcp_proxy_send(call,
+                                           kdc_conn->conn->event.ctx,
+                                           kdc_conn->kdc_socket->kdc,
+                                           port,
+                                           call->in);
+               if (subreq == NULL) {
+                       kdc_tcp_terminate_connection(kdc_conn,
+                               "kdc_tcp_call_loop: kdc_tcp_proxy_send failed");
+                       return;
+               }
+               tevent_req_set_callback(subreq, kdc_tcp_call_proxy_done, call);
                return;
        }
-       blob.length = nread;
-       
-       DEBUG(10,("Received krb5 UDP packet of length %lu from %s:%u\n", 
-                (long)blob.length, src->addr, (uint16_t)src->port));
-       
-       my_addr = socket_get_my_addr(kdc_socket->sock, tmp_ctx);
-       if (!my_addr) {
-               talloc_free(tmp_ctx);
+
+       /* First add the length of the out buffer */
+       RSIVAL(call->out_hdr, 0, call->out.length);
+       call->out_iov[0].iov_base = (char *) call->out_hdr;
+       call->out_iov[0].iov_len = 4;
+
+       call->out_iov[1].iov_base = (char *) 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);
+}
 
+static void kdc_tcp_call_proxy_done(struct tevent_req *subreq)
+{
+       struct kdc_tcp_call *call = tevent_req_callback_data(subreq,
+                       struct kdc_tcp_call);
+       struct kdc_tcp_connection *kdc_conn = call->kdc_conn;
+       NTSTATUS status;
 
-       /* Call krb5 */
-       ret = kdc_socket->process(kdc_socket->kdc, 
-                                 tmp_ctx, 
-                                 &blob,  
-                                 &reply,
-                                 src, my_addr,
-                                 1 /* Datagram */);
-       if (!ret) {
-               talloc_free(tmp_ctx);
-               return;
+       status = kdc_tcp_proxy_recv(subreq, call, &call->out);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               /* generate an error packet */
+               status = kdc_proxy_unavailable_error(kdc_conn->kdc_socket->kdc,
+                                                    call, &call->out);
        }
 
-       /* queue a pending reply */
-       rep = talloc(kdc_socket, struct kdc_reply);
-       if (rep == NULL) {
-               talloc_free(tmp_ctx);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *reason;
+
+               reason = talloc_asprintf(call, "kdc_tcp_call_proxy_done: "
+                                        "kdc_proxy_unavailable_error - %s",
+                                        nt_errstr(status));
+               if (!reason) {
+                       reason = "kdc_tcp_call_proxy_done: kdc_proxy_unavailable_error() failed";
+               }
+
+               kdc_tcp_terminate_connection(call->kdc_conn, reason);
                return;
        }
-       rep->dest         = talloc_steal(rep, src);
-       rep->packet       = reply;
-       talloc_steal(rep, reply.data);
 
-       if (rep->packet.data == NULL) {
-               talloc_free(rep);
-               talloc_free(tmp_ctx);
+       /* First add the length of the out buffer */
+       RSIVAL(call->out_hdr, 0, call->out.length);
+       call->out_iov[0].iov_base = (char *) call->out_hdr;
+       call->out_iov[0].iov_len = 4;
+
+       call->out_iov[1].iov_base = (char *) 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;
        }
-
-       DLIST_ADD_END(kdc_socket->send_queue, rep, struct kdc_reply *);
-       EVENT_FD_WRITEABLE(kdc_socket->fde);
-       talloc_free(tmp_ctx);
+       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);
 }
 
-/*
-  handle fd events on a KDC socket
-*/
-static void kdc_socket_handler(struct event_context *ev, struct fd_event *fde,
-                              uint16_t flags, void *private)
+static void kdc_tcp_call_writev_done(struct tevent_req *subreq)
 {
-       struct kdc_socket *kdc_socket = talloc_get_type(private, struct kdc_socket);
-       if (flags & EVENT_FD_WRITE) {
-               kdc_send_handler(kdc_socket);
-       } 
-       if (flags & EVENT_FD_READ) {
-               kdc_recv_handler(kdc_socket);
+       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;
        }
-}
 
-static void kdc_tcp_terminate_connection(struct kdc_tcp_connection *kdcconn, const char *reason)
-{
-       stream_terminate_connection(kdcconn->conn, reason);
+       /* We don't care about errors */
+
+       talloc_free(call);
 }
 
 /*
-  receive a full packet on a KDC connection
+  called when we get a new connection
 */
-static NTSTATUS kdc_tcp_recv(void *private, DATA_BLOB blob)
+static void kdc_tcp_accept(struct stream_connection *conn)
 {
-       struct kdc_tcp_connection *kdcconn = talloc_get_type(private, 
-                                                            struct kdc_tcp_connection);
-       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       TALLOC_CTX *tmp_ctx = talloc_new(kdcconn);
-       int ret;
-       DATA_BLOB input, reply;
-       struct socket_address *src_addr;
-       struct socket_address *my_addr;
-
-       talloc_steal(tmp_ctx, blob.data);
-
-       src_addr = socket_get_peer_addr(kdcconn->conn->socket, tmp_ctx);
-       if (!src_addr) {
-               talloc_free(tmp_ctx);
-               return NT_STATUS_NO_MEMORY;
+       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;
        }
 
-       my_addr = socket_get_my_addr(kdcconn->conn->socket, tmp_ctx);
-       if (!my_addr) {
-               talloc_free(tmp_ctx);
-               return NT_STATUS_NO_MEMORY;
+       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;
        }
 
-       /* Call krb5 */
-       input = data_blob_const(blob.data + 4, blob.length - 4); 
-
-       ret = kdcconn->process(kdcconn->kdc, 
-                              tmp_ctx,
-                              &input,
-                              &reply,
-                              src_addr,
-                              my_addr,
-                              0 /* Not datagram */);
-       if (!ret) {
-               talloc_free(tmp_ctx);
-               return NT_STATUS_INTERNAL_ERROR;
+       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;
        }
 
-       /* 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;
+       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;
        }
+       tevent_req_set_callback(subreq, kdc_tcp_call_loop, kdc_conn);
+}
 
-       RSIVAL(blob.data, 0, reply.length);
-       memcpy(blob.data + 4, reply.data, reply.length);        
+static const struct stream_server_ops kdc_tcp_stream_ops = {
+       .name                   = "kdc_tcp",
+       .accept_connection      = kdc_tcp_accept,
+       .recv_handler           = kdc_tcp_recv,
+       .send_handler           = kdc_tcp_send
+};
 
-       status = packet_send(kdcconn->packet, blob);
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(tmp_ctx);
-               return status;
-       }
+/* hold information about one kdc/kpasswd udp socket */
+struct kdc_udp_socket {
+       struct kdc_socket *kdc_socket;
+       struct tdgram_context *dgram;
+       struct tevent_queue *send_queue;
+};
 
-       /* the call isn't needed any more */
-       talloc_free(tmp_ctx);
-       return NT_STATUS_OK;
-}
+struct kdc_udp_call {
+       struct kdc_udp_socket *sock;
+       struct tsocket_address *src;
+       DATA_BLOB in;
+       DATA_BLOB out;
+};
 
-/*
-  receive some data on a KDC connection
-*/
-static void kdc_tcp_recv_handler(struct stream_connection *conn, uint16_t flags)
-{
-       struct kdc_tcp_connection *kdcconn = talloc_get_type(conn->private, 
-                                                            struct kdc_tcp_connection);
-       packet_recv(kdcconn->packet);
-}
+static void kdc_udp_call_proxy_done(struct tevent_req *subreq);
+static void kdc_udp_call_sendto_done(struct tevent_req *subreq);
 
-/*
-  called on a tcp recv error
-*/
-static void kdc_tcp_recv_error(void *private, NTSTATUS status)
+static void kdc_udp_call_loop(struct tevent_req *subreq)
 {
-       struct kdc_tcp_connection *kdcconn = talloc_get_type(private, struct kdc_tcp_connection);
-       kdc_tcp_terminate_connection(kdcconn, nt_errstr(status));
-}
+       struct kdc_udp_socket *sock = tevent_req_callback_data(subreq,
+                                     struct kdc_udp_socket);
+       struct kdc_udp_call *call;
+       uint8_t *buf;
+       ssize_t len;
+       int sys_errno;
+       enum kdc_process_ret ret;
+
+       call = talloc(sock, struct kdc_udp_call);
+       if (call == NULL) {
+               talloc_free(call);
+               goto done;
+       }
+       call->sock = sock;
+
+       len = tdgram_recvfrom_recv(subreq, &sys_errno,
+                                  call, &buf, &call->src);
+       TALLOC_FREE(subreq);
+       if (len == -1) {
+               talloc_free(call);
+               goto done;
+       }
 
-/*
-  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, 
-                                                            struct kdc_tcp_connection);
-       packet_queue_run(kdcconn->packet);
-}
+       call->in.data = buf;
+       call->in.length = len;
 
-/**
-   Wrapper for krb5_kdc_process_krb5_request, converting to/from Samba
-   calling conventions
-*/
+       DEBUG(10,("Received krb5 UDP packet of length %lu from %s\n",
+                (long)call->in.length,
+                tsocket_address_string(call->src, call)));
 
-static bool kdc_process(struct kdc_server *kdc,
-                       TALLOC_CTX *mem_ctx, 
-                       DATA_BLOB *input, 
-                       DATA_BLOB *reply,
-                       struct socket_address *peer_addr, 
-                       struct socket_address *my_addr,
-                       int datagram_reply)
-{
-       int ret;        
-       krb5_data k5_reply;
-       krb5_data_zero(&k5_reply);
+       /* 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 == KDC_PROCESS_FAILED) {
+               talloc_free(call);
+               goto done;
+       }
 
-       krb5_kdc_update_time(NULL);
+       if (ret == KDC_PROCESS_PROXY) {
+               uint16_t port;
 
-       DEBUG(10,("Received KDC packet of length %lu from %s:%d\n", 
-                 (long)input->length - 4, peer_addr->addr, peer_addr->port));
+               if (!sock->kdc_socket->kdc->am_rodc) {
+                       DEBUG(0,("kdc_udp_call_loop: proxying requested when not RODC"));
+                       talloc_free(call);
+                       goto done;
+               }
 
-       ret = krb5_kdc_process_krb5_request(kdc->smb_krb5_context->krb5_context, 
-                                           kdc->config,
-                                           input->data, input->length,
-                                           &k5_reply,
-                                           peer_addr->addr,
-                                           peer_addr->sockaddr,
-                                           datagram_reply);
-       if (ret == -1) {
-               *reply = data_blob(NULL, 0);
-               return false;
+               port = tsocket_address_inet_port(sock->kdc_socket->local_address);
+
+               subreq = kdc_udp_proxy_send(call,
+                                           sock->kdc_socket->kdc->task->event_ctx,
+                                           sock->kdc_socket->kdc,
+                                           port,
+                                           call->in);
+               if (subreq == NULL) {
+                       talloc_free(call);
+                       goto done;
+               }
+               tevent_req_set_callback(subreq, kdc_udp_call_proxy_done, call);
+               goto done;
        }
-       if (k5_reply.length) {
-               *reply = data_blob_talloc(mem_ctx, k5_reply.data, k5_reply.length);
-               krb5_free_data_contents(kdc->smb_krb5_context->krb5_context, &k5_reply);
-       } else {
-               *reply = data_blob(NULL, 0);    
+
+       subreq = tdgram_sendto_queue_send(call,
+                                         sock->kdc_socket->kdc->task->event_ctx,
+                                         sock->dgram,
+                                         sock->send_queue,
+                                         call->out.data,
+                                         call->out.length,
+                                         call->src);
+       if (subreq == NULL) {
+               talloc_free(call);
+               goto done;
        }
-       return true;
+       tevent_req_set_callback(subreq, kdc_udp_call_sendto_done, call);
+
+done:
+       subreq = tdgram_recvfrom_send(sock,
+                                     sock->kdc_socket->kdc->task->event_ctx,
+                                     sock->dgram);
+       if (subreq == NULL) {
+               task_server_terminate(sock->kdc_socket->kdc->task,
+                                     "no memory for tdgram_recvfrom_send",
+                                     true);
+               return;
+       }
+       tevent_req_set_callback(subreq, kdc_udp_call_loop, sock);
 }
 
-/*
-  called when we get a new connection
-*/
-static void kdc_tcp_generic_accept(struct stream_connection *conn, kdc_process_fn_t process_fn)
+static void kdc_udp_call_proxy_done(struct tevent_req *subreq)
 {
-       struct kdc_server *kdc = talloc_get_type(conn->private, struct kdc_server);
-       struct kdc_tcp_connection *kdcconn;
+       struct kdc_udp_call *call =
+               tevent_req_callback_data(subreq,
+               struct kdc_udp_call);
+       NTSTATUS status;
 
-       kdcconn = talloc_zero(conn, struct kdc_tcp_connection);
-       if (!kdcconn) {
-               stream_terminate_connection(conn, "kdc_tcp_accept: out of memory");
+       status = kdc_udp_proxy_recv(subreq, call, &call->out);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               /* generate an error packet */
+               status = kdc_proxy_unavailable_error(call->sock->kdc_socket->kdc,
+                                                    call, &call->out);
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(call);
                return;
        }
-       kdcconn->conn    = conn;
-       kdcconn->kdc     = kdc;
-       kdcconn->process = process_fn;
-       conn->private    = kdcconn;
 
-       kdcconn->packet = packet_init(kdcconn);
-       if (kdcconn->packet == NULL) {
-               kdc_tcp_terminate_connection(kdcconn, "kdc_tcp_accept: out of memory");
+       subreq = tdgram_sendto_queue_send(call,
+                                         call->sock->kdc_socket->kdc->task->event_ctx,
+                                         call->sock->dgram,
+                                         call->sock->send_queue,
+                                         call->out.data,
+                                         call->out.length,
+                                         call->src);
+       if (subreq == NULL) {
+               talloc_free(call);
                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_udp_call_sendto_done, call);
 }
 
-static void kdc_tcp_accept(struct stream_connection *conn)
+static void kdc_udp_call_sendto_done(struct tevent_req *subreq)
 {
-       kdc_tcp_generic_accept(conn, kdc_process);
-}
+       struct kdc_udp_call *call = tevent_req_callback_data(subreq,
+                                      struct kdc_udp_call);
+       ssize_t ret;
+       int sys_errno;
 
-static const struct stream_server_ops kdc_tcp_stream_ops = {
-       .name                   = "kdc_tcp",
-       .accept_connection      = kdc_tcp_accept,
-       .recv_handler           = kdc_tcp_recv_handler,
-       .send_handler           = kdc_tcp_send
-};
+       ret = tdgram_sendto_queue_recv(subreq, &sys_errno);
 
-static void kpasswdd_tcp_accept(struct stream_connection *conn)
-{
-       kdc_tcp_generic_accept(conn, kpasswdd_process);
-}
+       /* We don't care about errors */
 
-static const struct stream_server_ops kpasswdd_tcp_stream_ops = {
-       .name                   = "kpasswdd_tcp",
-       .accept_connection      = kpasswdd_tcp_accept,
-       .recv_handler           = kdc_tcp_recv_handler,
-       .send_handler           = kdc_tcp_send
-};
+       talloc_free(call);
+}
 
 /*
   start listening on the given address
 */
-static NTSTATUS kdc_add_socket(struct kdc_server *kdc, const char *address,
-                              uint16_t kdc_port, uint16_t kpasswd_port)
+static NTSTATUS kdc_add_socket(struct kdc_server *kdc,
+                              const struct model_ops *model_ops,
+                              const char *name,
+                              const char *address,
+                              uint16_t port,
+                              kdc_process_fn_t process,
+                              bool udp_only)
 {
-       const struct model_ops *model_ops;
-       struct kdc_socket *kdc_socket;
-       struct kdc_socket *kpasswd_socket;
-       struct socket_address *kdc_address, *kpasswd_address;
+       struct kdc_socket *kdc_socket;
+       struct kdc_udp_socket *kdc_udp_socket;
+       struct tevent_req *udpsubreq;
        NTSTATUS status;
+       int ret;
 
        kdc_socket = talloc(kdc, struct kdc_socket);
        NT_STATUS_HAVE_NO_MEMORY(kdc_socket);
 
-       kpasswd_socket = talloc(kdc, struct kdc_socket);
-       NT_STATUS_HAVE_NO_MEMORY(kpasswd_socket);
+       kdc_socket->kdc = kdc;
+       kdc_socket->process = process;
 
-       status = socket_create("ip", SOCKET_TYPE_DGRAM, &kdc_socket->sock, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(kdc_socket);
+       ret = tsocket_address_inet_from_strings(kdc_socket, "ip",
+                                               address, port,
+                                               &kdc_socket->local_address);
+       if (ret != 0) {
+               status = map_nt_error_from_unix(errno);
                return status;
        }
 
-       status = socket_create("ip", SOCKET_TYPE_DGRAM, &kpasswd_socket->sock, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(kpasswd_socket);
-               return status;
+       if (!udp_only) {
+               status = stream_setup_socket(kdc->task,
+                                            kdc->task->event_ctx,
+                                            kdc->task->lp_ctx,
+                                            model_ops,
+                                            &kdc_tcp_stream_ops,
+                                            "ip", address, &port,
+                                            lpcfg_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",
+                                address, port, nt_errstr(status)));
+                       talloc_free(kdc_socket);
+                       return status;
+               }
        }
 
-       kdc_socket->kdc = kdc;
-       kdc_socket->send_queue = NULL;
-       kdc_socket->process = kdc_process;
-
-       talloc_steal(kdc_socket, kdc_socket->sock);
-
-       kdc_socket->fde = event_add_fd(kdc->task->event_ctx, kdc, 
-                                      socket_get_fd(kdc_socket->sock), EVENT_FD_READ,
-                                      kdc_socket_handler, kdc_socket);
+       kdc_udp_socket = talloc(kdc_socket, struct kdc_udp_socket);
+       NT_STATUS_HAVE_NO_MEMORY(kdc_udp_socket);
 
-       kdc_address = socket_address_from_strings(kdc_socket, kdc_socket->sock->backend_name, 
-                                                 address, kdc_port);
-       NT_STATUS_HAVE_NO_MEMORY(kdc_address);
+       kdc_udp_socket->kdc_socket = kdc_socket;
 
-       status = socket_listen(kdc_socket->sock, kdc_address, 0, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("Failed to bind to %s:%d UDP for kdc - %s\n", 
-                        address, kdc_port, nt_errstr(status)));
-               talloc_free(kdc_socket);
+       ret = tdgram_inet_udp_socket(kdc_socket->local_address,
+                                    NULL,
+                                    kdc_udp_socket,
+                                    &kdc_udp_socket->dgram);
+       if (ret != 0) {
+               status = map_nt_error_from_unix(errno);
+               DEBUG(0,("Failed to bind to %s:%u UDP - %s\n",
+                        address, port, nt_errstr(status)));
                return status;
        }
 
-       kpasswd_socket->kdc = kdc;
-       kpasswd_socket->send_queue = NULL;
-       kpasswd_socket->process = kpasswdd_process;
+       kdc_udp_socket->send_queue = tevent_queue_create(kdc_udp_socket,
+                                                        "kdc_udp_send_queue");
+       NT_STATUS_HAVE_NO_MEMORY(kdc_udp_socket->send_queue);
 
-       talloc_steal(kpasswd_socket, kpasswd_socket->sock);
+       udpsubreq = tdgram_recvfrom_send(kdc_udp_socket,
+                                        kdc->task->event_ctx,
+                                        kdc_udp_socket->dgram);
+       NT_STATUS_HAVE_NO_MEMORY(udpsubreq);
+       tevent_req_set_callback(udpsubreq, kdc_udp_call_loop, kdc_udp_socket);
 
-       kpasswd_socket->fde = event_add_fd(kdc->task->event_ctx, kdc, 
-                                          socket_get_fd(kpasswd_socket->sock), EVENT_FD_READ,
-                                          kdc_socket_handler, kpasswd_socket);
-       
-       kpasswd_address = socket_address_from_strings(kpasswd_socket, kpasswd_socket->sock->backend_name, 
-                                                     address, kpasswd_port);
-       NT_STATUS_HAVE_NO_MEMORY(kpasswd_address);
+       return NT_STATUS_OK;
+}
 
-       status = socket_listen(kpasswd_socket->sock, kpasswd_address, 0, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("Failed to bind to %s:%d UDP for kpasswd - %s\n", 
-                        address, kpasswd_port, nt_errstr(status)));
-               talloc_free(kpasswd_socket);
-               return status;
-       }
+
+/*
+  setup our listening sockets on the configured network interfaces
+*/
+static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc, struct loadparm_context *lp_ctx,
+                                      struct interface *ifaces)
+{
+       const struct model_ops *model_ops;
+       int num_interfaces;
+       TALLOC_CTX *tmp_ctx = talloc_new(kdc);
+       NTSTATUS status;
+       int i;
+       uint16_t kdc_port = lpcfg_krb5_port(lp_ctx);
+       uint16_t kpasswd_port = lpcfg_kpasswd_port(lp_ctx);
+       bool done_wildcard = false;
 
        /* within the kdc task we want to be a single process, so
           ask for the single process model ops and pass these to the
           stream_setup_socket() call. */
-       model_ops = process_model_byname("single");
+       model_ops = process_model_startup("single");
        if (!model_ops) {
                DEBUG(0,("Can't find 'single' process model_ops\n"));
-               talloc_free(kdc_socket);
                return NT_STATUS_INTERNAL_ERROR;
        }
 
-       status = stream_setup_socket(kdc->task->event_ctx, 
-                                    kdc->task->lp_ctx,
-                                    model_ops, 
-                                    &kdc_tcp_stream_ops, 
-                                    "ip", address, &kdc_port, 
-                                    lp_socket_options(kdc->task->lp_ctx), 
-                                    kdc);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("Failed to bind to %s:%u TCP - %s\n",
-                        address, kdc_port, nt_errstr(status)));
-               talloc_free(kdc_socket);
-               return status;
+       num_interfaces = iface_count(ifaces);
+
+       /* if we are allowing incoming packets from any address, then
+          we need to bind to the wildcard address */
+       if (!lpcfg_bind_interfaces_only(lp_ctx)) {
+               if (kdc_port) {
+                       status = kdc_add_socket(kdc, model_ops,
+                                               "kdc", "0.0.0.0", kdc_port,
+                                               kdc_process, false);
+                       NT_STATUS_NOT_OK_RETURN(status);
+               }
+
+               if (kpasswd_port) {
+                       status = kdc_add_socket(kdc, model_ops,
+                                               "kpasswd", "0.0.0.0", kpasswd_port,
+                                               kpasswdd_process, false);
+                       NT_STATUS_NOT_OK_RETURN(status);
+               }
+               done_wildcard = true;
        }
 
-       status = stream_setup_socket(kdc->task->event_ctx, 
-                                    kdc->task->lp_ctx,
-                                    model_ops, 
-                                    &kpasswdd_tcp_stream_ops, 
-                                    "ip", address, &kpasswd_port, 
-                                    lp_socket_options(kdc->task->lp_ctx), 
-                                    kdc);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("Failed to bind to %s:%u TCP - %s\n",
-                        address, kpasswd_port, nt_errstr(status)));
-               talloc_free(kdc_socket);
-               return status;
+       for (i=0; i<num_interfaces; i++) {
+               const char *address = talloc_strdup(tmp_ctx, iface_n_ip(ifaces, i));
+
+               if (kdc_port) {
+                       status = kdc_add_socket(kdc, model_ops,
+                                               "kdc", address, kdc_port,
+                                               kdc_process, done_wildcard);
+                       NT_STATUS_NOT_OK_RETURN(status);
+               }
+
+               if (kpasswd_port) {
+                       status = kdc_add_socket(kdc, model_ops,
+                                               "kpasswd", address, kpasswd_port,
+                                               kpasswdd_process, done_wildcard);
+                       NT_STATUS_NOT_OK_RETURN(status);
+               }
        }
 
+       talloc_free(tmp_ctx);
+
        return NT_STATUS_OK;
 }
 
 
-/*
-  setup our listening sockets on the configured network interfaces
-*/
-static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc, struct loadparm_context *lp_ctx,
-                                      struct interface *ifaces)
+static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg,
+                                struct kdc_check_generic_kerberos *r)
 {
-       int num_interfaces;
-       TALLOC_CTX *tmp_ctx = talloc_new(kdc);
-       NTSTATUS status;
-       int i;
+       struct PAC_Validate pac_validate;
+       DATA_BLOB srv_sig;
+       struct PAC_SIGNATURE_DATA kdc_sig;
+       struct kdc_server *kdc = talloc_get_type(msg->private_data, struct kdc_server);
+       enum ndr_err_code ndr_err;
+       krb5_enctype etype;
+       int ret;
+       hdb_entry_ex ent;
+       krb5_principal principal;
+       krb5_keyblock keyblock;
+       Key *key;
+
+       /* 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, &pac_validate,
+                                      (ndr_pull_flags_fn_t)ndr_pull_PAC_Validate);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-       num_interfaces = iface_count(ifaces);
+       if (pac_validate.MessageType != 3) {
+               /* We don't implement any other message types - such as certificate validation - yet */
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (pac_validate.ChecksumAndSignature.length != (pac_validate.ChecksumLength + pac_validate.SignatureLength)
+           || pac_validate.ChecksumAndSignature.length < pac_validate.ChecksumLength
+           || pac_validate.ChecksumAndSignature.length < pac_validate.SignatureLength ) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       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 {
+               ret = krb5_cksumtype_to_enctype(kdc->smb_krb5_context->krb5_context, pac_validate.SignatureType,
+                                               &etype);
+               if (ret != 0) {
+                       return NT_STATUS_LOGON_FAILURE;
+               }
+       }
+
+       ret = krb5_make_principal(kdc->smb_krb5_context->krb5_context, &principal,
+                                 lpcfg_realm(kdc->task->lp_ctx),
+                                 "krbtgt", lpcfg_realm(kdc->task->lp_ctx),
+                                 NULL);
+
+       if (ret != 0) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       ret = kdc->config->db[0]->hdb_fetch_kvno(kdc->smb_krb5_context->krb5_context,
+                                                kdc->config->db[0],
+                                                principal,
+                                                HDB_F_GET_KRBTGT | HDB_F_DECRYPT,
+                                                0,
+                                                &ent);
        
-       for (i=0; i<num_interfaces; i++) {
-               const char *address = talloc_strdup(tmp_ctx, iface_n_ip(ifaces, i));
-               status = kdc_add_socket(kdc, address, lp_krb5_port(lp_ctx), 
-                                       lp_kpasswd_port(lp_ctx));
-               NT_STATUS_NOT_OK_RETURN(status);
+       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;
        }
 
-       talloc_free(tmp_ctx);
+       ret = hdb_enctype2key(kdc->smb_krb5_context->krb5_context, &ent.entry, etype, &key);
+
+       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;
+       }
+
+       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,
+                          kdc->smb_krb5_context->krb5_context, &keyblock);
+
+       hdb_free_entry(kdc->smb_krb5_context->krb5_context, &ent);
+       krb5_free_principal(kdc->smb_krb5_context->krb5_context, principal);
+
+       if (ret != 0) {
+               return NT_STATUS_LOGON_FAILURE;
+       }
 
        return NT_STATUS_OK;
 }
 
-static struct krb5plugin_windc_ftable windc_plugin_table = {
-       .minor_version = KRB5_WINDC_PLUGING_MINOR,
-       .init = samba_kdc_plugin_init,
-       .fini = samba_kdc_plugin_fini,
-       .pac_generate = samba_kdc_get_pac,
-       .pac_verify = samba_kdc_reget_pac,
-       .client_access = samba_kdc_check_client_access,
-};
-
 
 /*
   startup the kdc task
@@ -564,95 +881,151 @@ static void kdc_task_init(struct task_server *task)
        NTSTATUS status;
        krb5_error_code ret;
        struct interface *ifaces;
+       int ldb_ret;
 
-       switch (lp_server_role(task->lp_ctx)) {
+       switch (lpcfg_server_role(task->lp_ctx)) {
        case ROLE_STANDALONE:
-               task_server_terminate(task, "kdc: no KDC required in standalone configuration");
+               task_server_terminate(task, "kdc: no KDC required in standalone configuration", false);
                return;
        case ROLE_DOMAIN_MEMBER:
-               task_server_terminate(task, "kdc: no KDC required in member server configuration");
+               task_server_terminate(task, "kdc: no KDC required in member server configuration", false);
                return;
        case ROLE_DOMAIN_CONTROLLER:
                /* Yes, we want a KDC */
                break;
        }
 
-       load_interfaces(task, lp_interfaces(task->lp_ctx), &ifaces);
+       load_interfaces(task, lpcfg_interfaces(task->lp_ctx), &ifaces);
 
        if (iface_count(ifaces) == 0) {
-               task_server_terminate(task, "kdc: no network interfaces configured");
+               task_server_terminate(task, "kdc: no network interfaces configured", false);
                return;
        }
 
        task_server_set_title(task, "task[kdc]");
 
-       kdc = talloc(task, struct kdc_server);
+       kdc = talloc_zero(task, struct kdc_server);
        if (kdc == NULL) {
-               task_server_terminate(task, "kdc: out of memory");
+               task_server_terminate(task, "kdc: out of memory", true);
                return;
        }
 
        kdc->task = task;
 
+
+       /* get a samdb connection */
+       kdc->samdb = samdb_connect(kdc, kdc->task->event_ctx, kdc->task->lp_ctx,
+                                  system_session(kdc->task->lp_ctx), 0);
+       if (!kdc->samdb) {
+               DEBUG(1,("kdc_task_init: unable to connect to samdb\n"));
+               task_server_terminate(task, "kdc: krb5_init_context samdb connect failed", true);
+               return;
+       }
+
+       ldb_ret = samdb_rodc(kdc->samdb, &kdc->am_rodc);
+       if (ldb_ret != LDB_SUCCESS) {
+               DEBUG(1, ("kdc_task_init: Cannot determine if we are an RODC: %s\n",
+                         ldb_errstring(kdc->samdb)));
+               task_server_terminate(task, "kdc: krb5_init_context samdb RODC connect failed", true);
+               return;
+       }
+
+       kdc->proxy_timeout = lpcfg_parm_int(kdc->task->lp_ctx, NULL, "kdc", "proxy timeout", 5);
+
        initialize_krb5_error_table();
 
        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");
-               return; 
+               task_server_terminate(task, "kdc: krb5_init_context failed", true);
+               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");
+               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) {
-               task_server_terminate(task, "kdc: out of memory");
+               task_server_terminate(task, "kdc: out of memory", true);
                return;
        }
        kdc->config->num_db = 1;
-               
-       status = kdc_hdb_ldb_create(kdc, task->event_ctx, task->lp_ctx, 
-                                   kdc->smb_krb5_context->krb5_context, 
-                                   &kdc->config->db[0], NULL);
+
+       /* Register hdb-samba4 hooks for use as a keytab */
+
+       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;
+       }
+
+       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_ldb_create (setup KDC database) failed");
-               return; 
+               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,
+                                  PLUGIN_TYPE_DATA, "hdb",
+                                  &hdb_samba4);
+       if(ret) {
+               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");
+               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");
+               task_server_terminate(task, "kdc: failed to register windc plugin", true);
                return;
        }
 
-       krb5_kdc_windc_init(kdc->smb_krb5_context->krb5_context);
+       ret = krb5_kdc_windc_init(kdc->smb_krb5_context->krb5_context);
 
-       kdc_mem_ctx = kdc->smb_krb5_context;
-       kdc_lp_ctx = task->lp_ctx;
+       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);
        if (!NT_STATUS_IS_OK(status)) {
-               task_server_terminate(task, "kdc failed to setup interfaces");
+               task_server_terminate(task, "kdc failed to setup interfaces", true);
+               return;
+       }
+
+       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, "kdc failed to setup monitoring", true);
                return;
        }