s4-drs: implement more of DsUpdateRefs
[nivanova/samba-autobuild/.git] / source4 / rpc_server / dcerpc_server.c
index 063e3ff3bdbbe53e0709b31cd072bb797c5a09a2..df0c2e73453a2f3106ea80ebfed5c684765112d4 100644 (file)
 #include "libcli/security/security.h"
 #include "param/param.h"
 
-#define SAMBA_ASSOC_GROUP 0x12345678
+/* this is only used when the client asks for an unknown interface */
+#define DUMMY_ASSOC_GROUP 0x0FFFFFFF
 
 extern const struct dcesrv_interface dcesrv_mgmt_interface;
 
+
+/*
+  find an association group given a assoc_group_id
+ */
+static struct dcesrv_assoc_group *dcesrv_assoc_group_find(struct dcesrv_context *dce_ctx,
+                                                         uint32_t id)
+{
+       void *id_ptr;
+
+       id_ptr = idr_find(dce_ctx->assoc_groups_idr, id);
+       if (id_ptr == NULL) {
+               return NULL;
+       }
+       return talloc_get_type_abort(id_ptr, struct dcesrv_assoc_group);
+}
+
+/*
+  take a reference to an existing association group
+ */
+static struct dcesrv_assoc_group *dcesrv_assoc_group_reference(TALLOC_CTX *mem_ctx,
+                                                              struct dcesrv_context *dce_ctx,
+                                                              uint32_t id)
+{
+       struct dcesrv_assoc_group *assoc_group;
+
+       assoc_group = dcesrv_assoc_group_find(dce_ctx, id);
+       if (assoc_group == NULL) {
+               DEBUG(0,(__location__ ": Failed to find assoc_group 0x%08x\n", id));
+               return NULL;
+       }
+       return talloc_reference(mem_ctx, assoc_group);
+}
+
+static int dcesrv_assoc_group_destructor(struct dcesrv_assoc_group *assoc_group)
+{
+       int ret;
+       ret = idr_remove(assoc_group->dce_ctx->assoc_groups_idr, assoc_group->id);
+       if (ret != 0) {
+               DEBUG(0,(__location__ ": Failed to remove assoc_group 0x%08x\n",
+                        assoc_group->id));
+       }
+       return 0;
+}
+
+/*
+  allocate a new association group
+ */
+static struct dcesrv_assoc_group *dcesrv_assoc_group_new(TALLOC_CTX *mem_ctx,
+                                                        struct dcesrv_context *dce_ctx)
+{
+       struct dcesrv_assoc_group *assoc_group;
+       int id;
+
+       assoc_group = talloc_zero(mem_ctx, struct dcesrv_assoc_group);
+       if (assoc_group == NULL) {
+               return NULL;
+       }
+       
+       id = idr_get_new_random(dce_ctx->assoc_groups_idr, assoc_group, UINT16_MAX);
+       if (id == -1) {
+               talloc_free(assoc_group);
+               DEBUG(0,(__location__ ": Out of association groups!\n"));
+               return NULL;
+       }
+
+       assoc_group->id = id;
+       assoc_group->dce_ctx = dce_ctx;
+
+       talloc_set_destructor(assoc_group, dcesrv_assoc_group_destructor);
+
+       return assoc_group;
+}
+
+
 /*
   see if two endpoints match
 */
@@ -288,26 +363,6 @@ _PUBLIC_ NTSTATUS dcesrv_fetch_session_key(struct dcesrv_connection *p,
        return NT_STATUS_OK;
 }
 
-
-/*
-  destroy a link to an endpoint
-*/
-static int dcesrv_endpoint_destructor(struct dcesrv_connection *p)
-{
-       while (p->contexts) {
-               struct dcesrv_connection_context *c = p->contexts;
-
-               DLIST_REMOVE(p->contexts, c);
-
-               if (c->iface) {
-                       c->iface->unbind(c, c->iface);
-               }
-       }
-
-       return 0;
-}
-
-
 /*
   connect to a dcerpc endpoint
 */
@@ -315,7 +370,7 @@ _PUBLIC_ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
                                 TALLOC_CTX *mem_ctx,
                                 const struct dcesrv_endpoint *ep,
                                 struct auth_session_info *session_info,
-                                struct event_context *event_ctx,
+                                struct tevent_context *event_ctx,
                                 struct messaging_context *msg_ctx,
                                 struct server_id server_id,
                                 uint32_t state_flags,
@@ -355,50 +410,10 @@ _PUBLIC_ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
        p->state_flags = state_flags;
        ZERO_STRUCT(p->transport);
 
-       talloc_set_destructor(p, dcesrv_endpoint_destructor);
-
        *_p = p;
        return NT_STATUS_OK;
 }
 
-/*
-  search and connect to a dcerpc endpoint
-*/
-_PUBLIC_ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx,
-                                       TALLOC_CTX *mem_ctx,
-                                       const struct dcerpc_binding *ep_description,
-                                       struct auth_session_info *session_info,
-                                       struct event_context *event_ctx,
-                                       struct messaging_context *msg_ctx,
-                                       struct server_id server_id,
-                                       uint32_t state_flags,
-                                       struct dcesrv_connection **dce_conn_p)
-{
-       NTSTATUS status;
-       const struct dcesrv_endpoint *ep;
-
-       /* make sure this endpoint exists */
-       ep = find_endpoint(dce_ctx, ep_description);
-       if (!ep) {
-               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
-       }
-
-       status = dcesrv_endpoint_connect(dce_ctx, mem_ctx, ep, session_info,
-                                        event_ctx, msg_ctx, server_id,
-                                        state_flags, dce_conn_p);
-       NT_STATUS_NOT_OK_RETURN(status);
-
-       (*dce_conn_p)->auth_state.session_key = dcesrv_inherited_session_key;
-
-       /* TODO: check security descriptor of the endpoint here 
-        *       if it's a smb named pipe
-        *       if it's failed free dce_conn_p
-        */
-
-       return NT_STATUS_OK;
-}
-
-
 static void dcesrv_init_hdr(struct ncacn_packet *pkt, bool bigendian)
 {
        pkt->rpc_vers = 5;
@@ -489,6 +504,12 @@ static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t fault_code
        DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
        dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
+       if (call->conn->call_list && call->conn->call_list->replies) {
+               if (call->conn->transport.report_output_data) {
+                       call->conn->transport.report_output_data(call->conn);
+               }
+       }
+
        return NT_STATUS_OK;    
 }
 
@@ -528,9 +549,25 @@ static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32_t reason)
        DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
        dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
+       if (call->conn->call_list && call->conn->call_list->replies) {
+               if (call->conn->transport.report_output_data) {
+                       call->conn->transport.report_output_data(call->conn);
+               }
+       }
+
        return NT_STATUS_OK;    
 }
 
+static int dcesrv_connection_context_destructor(struct dcesrv_connection_context *c)
+{
+       DLIST_REMOVE(c->conn->contexts, c);
+
+       if (c->iface) {
+               c->iface->unbind(c, c->iface);
+       }
+
+       return 0;
+}
 
 /*
   handle a bind request
@@ -548,18 +585,11 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        uint32_t extra_flags = 0;
 
        /*
-        * Association groups allow policy handles to be shared across
-        * multiple client connections.  We don't implement this yet.
-        *
-        * So we just allow 0 if the client wants to create a new
-        * association group.
-        *
-        * And we allow the 0x12345678 value, we give away as
-        * assoc_group_id back to the clients
+         if provided, check the assoc_group is valid
         */
        if (call->pkt.u.bind.assoc_group_id != 0 &&
            lp_parm_bool(call->conn->dce_ctx->lp_ctx, NULL, "dcesrv","assoc group checking", true) &&
-           call->pkt.u.bind.assoc_group_id != SAMBA_ASSOC_GROUP) {
+           dcesrv_assoc_group_find(call->conn->dce_ctx, call->pkt.u.bind.assoc_group_id) == NULL) {
                return dcesrv_bind_nak(call, 0);        
        }
 
@@ -610,19 +640,38 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
                context->conn = call->conn;
                context->iface = iface;
                context->context_id = context_id;
-               /*
-                * we need to send a non zero assoc_group_id here to make longhorn happy,
-                * it also matches samba3
-                */
-               context->assoc_group_id = SAMBA_ASSOC_GROUP;
-               context->private = NULL;
-               context->handles = NULL;
+               if (call->pkt.u.bind.assoc_group_id != 0) {
+                       context->assoc_group = dcesrv_assoc_group_reference(context,
+                                                                           call->conn->dce_ctx, 
+                                                                           call->pkt.u.bind.assoc_group_id);
+               } else {
+                       context->assoc_group = dcesrv_assoc_group_new(context, call->conn->dce_ctx);
+               }
+               if (context->assoc_group == NULL) {
+                       talloc_free(context);
+                       return dcesrv_bind_nak(call, 0);
+               }
+               context->private_data = NULL;
                DLIST_ADD(call->conn->contexts, context);
                call->context = context;
+               talloc_set_destructor(context, dcesrv_connection_context_destructor);
+
+               status = iface->bind(call, iface);
+               if (!NT_STATUS_IS_OK(status)) {
+                       char *uuid_str = GUID_string(call, &uuid);
+                       DEBUG(2,("Request for dcerpc interface %s/%d rejected: %s\n",
+                                uuid_str, if_version, nt_errstr(status)));
+                       talloc_free(uuid_str);
+                       /* we don't want to trigger the iface->unbind() hook */
+                       context->iface = NULL;
+                       talloc_free(call->context);
+                       call->context = NULL;
+                       return dcesrv_bind_nak(call, 0);
+               }
        }
 
        if (call->conn->cli_max_recv_frag == 0) {
-               call->conn->cli_max_recv_frag = call->pkt.u.bind.max_recv_frag;
+               call->conn->cli_max_recv_frag = MIN(0x2000, call->pkt.u.bind.max_recv_frag);
        }
 
        if ((call->pkt.pfc_flags & DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN) &&
@@ -633,6 +682,8 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
 
        /* handle any authentication that is being requested */
        if (!dcesrv_auth_bind(call)) {
+               talloc_free(call->context);
+               call->context = NULL;
                return dcesrv_bind_nak(call, DCERPC_BIND_REASON_INVALID_AUTH_TYPE);
        }
 
@@ -642,9 +693,21 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        pkt.call_id = call->pkt.call_id;
        pkt.ptype = DCERPC_PKT_BIND_ACK;
        pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST | extra_flags;
-       pkt.u.bind_ack.max_xmit_frag = 0x2000;
+       pkt.u.bind_ack.max_xmit_frag = call->conn->cli_max_recv_frag;
        pkt.u.bind_ack.max_recv_frag = 0x2000;
-       pkt.u.bind_ack.assoc_group_id = call->context->assoc_group_id;
+
+       /*
+         make it possible for iface->bind() to specify the assoc_group_id
+         This helps the openchange mapiproxy plugin to work correctly.
+         
+         metze
+       */
+       if (call->context) {
+               pkt.u.bind_ack.assoc_group_id = call->context->assoc_group->id;
+       } else {
+               pkt.u.bind_ack.assoc_group_id = DUMMY_ASSOC_GROUP;
+       }
+
        if (iface) {
                /* FIXME: Use pipe name as specified by endpoint instead of interface name */
                pkt.u.bind_ack.secondary_address = talloc_asprintf(call, "\\PIPE\\%s", iface->name);
@@ -654,6 +717,8 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        pkt.u.bind_ack.num_results = 1;
        pkt.u.bind_ack.ctx_list = talloc(call, struct dcerpc_ack_ctx);
        if (!pkt.u.bind_ack.ctx_list) {
+               talloc_free(call->context);
+               call->context = NULL;
                return NT_STATUS_NO_MEMORY;
        }
        pkt.u.bind_ack.ctx_list[0].result = result;
@@ -663,30 +728,22 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
 
        status = dcesrv_auth_bind_ack(call, &pkt);
        if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(call->context);
+               call->context = NULL;
                return dcesrv_bind_nak(call, 0);
        }
 
-       if (iface) {
-               status = iface->bind(call, iface);
-               if (!NT_STATUS_IS_OK(status)) {
-                       char *uuid_str = GUID_string(call, &uuid);
-                       DEBUG(2,("Request for dcerpc interface %s/%d rejected: %s\n", 
-                                uuid_str, if_version, nt_errstr(status)));
-                       talloc_free(uuid_str);
-                       return dcesrv_bind_nak(call, 0);
-               }
-       }
-
-       /* the iface->bind() might change the assoc_group_id */
-       pkt.u.bind_ack.assoc_group_id = call->context->assoc_group_id;
-
        rep = talloc(call, struct data_blob_list_item);
        if (!rep) {
+               talloc_free(call->context);
+               call->context = NULL;
                return NT_STATUS_NO_MEMORY;
        }
 
        status = ncacn_push_auth(&rep->blob, call, lp_iconv_convenience(call->conn->dce_ctx->lp_ctx), &pkt, call->conn->auth_state.auth_info);
        if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(call->context);
+               call->context = NULL;
                return status;
        }
 
@@ -695,6 +752,12 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
        dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
+       if (call->conn->call_list && call->conn->call_list->replies) {
+               if (call->conn->transport.report_output_data) {
+                       call->conn->transport.report_output_data(call->conn);
+               }
+       }
+
        return NT_STATUS_OK;
 }
 
@@ -755,17 +818,30 @@ static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_
        context->conn = call->conn;
        context->iface = iface;
        context->context_id = context_id;
-       context->assoc_group_id = SAMBA_ASSOC_GROUP;
-       context->private = NULL;
-       context->handles = NULL;
+       if (call->pkt.u.alter.assoc_group_id != 0) {
+               context->assoc_group = dcesrv_assoc_group_reference(context,
+                                                                   call->conn->dce_ctx, 
+                                                                   call->pkt.u.alter.assoc_group_id);
+       } else {
+               context->assoc_group = dcesrv_assoc_group_new(context, call->conn->dce_ctx);
+       }
+       if (context->assoc_group == NULL) {
+               talloc_free(context);
+               call->context = NULL;
+               return NT_STATUS_NO_MEMORY;
+       }
+       context->private_data = NULL;
        DLIST_ADD(call->conn->contexts, context);
        call->context = context;
+       talloc_set_destructor(context, dcesrv_connection_context_destructor);
 
-       if (iface) {
-               status = iface->bind(call, iface);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
+       status = iface->bind(call, iface);
+       if (!NT_STATUS_IS_OK(status)) {
+               /* we don't want to trigger the iface->unbind() hook */
+               context->iface = NULL;
+               talloc_free(context);
+               call->context = NULL;
+               return status;
        }
 
        return NT_STATUS_OK;
@@ -807,8 +883,10 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
        if (result == 0 &&
            call->pkt.u.alter.assoc_group_id != 0 &&
            lp_parm_bool(call->conn->dce_ctx->lp_ctx, NULL, "dcesrv","assoc group checking", true) &&
-           call->pkt.u.alter.assoc_group_id != call->context->assoc_group_id) {
-               /* TODO: work out what to return here */
+           call->pkt.u.alter.assoc_group_id != call->context->assoc_group->id) {
+               DEBUG(0,(__location__ ": Failed attempt to use new assoc_group in alter context (0x%08x 0x%08x)\n",
+                        call->context->assoc_group->id, call->pkt.u.alter.assoc_group_id));
+               /* TODO: can they ask for a new association group? */
                result = DCERPC_BIND_PROVIDER_REJECT;
                reason = DCERPC_BIND_REASON_ASYNTAX;
        }
@@ -822,7 +900,7 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
        pkt.u.alter_resp.max_xmit_frag = 0x2000;
        pkt.u.alter_resp.max_recv_frag = 0x2000;
        if (result == 0) {
-               pkt.u.alter_resp.assoc_group_id = call->context->assoc_group_id;
+               pkt.u.alter_resp.assoc_group_id = call->context->assoc_group->id;
        } else {
                pkt.u.alter_resp.assoc_group_id = 0;
        }
@@ -863,6 +941,12 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
        DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
        dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
+       if (call->conn->call_list && call->conn->call_list->replies) {
+               if (call->conn->transport.report_output_data) {
+                       call->conn->transport.report_output_data(call->conn);
+               }
+       }
+
        return NT_STATUS_OK;
 }
 
@@ -1053,37 +1137,6 @@ _PUBLIC_ struct socket_address *dcesrv_connection_get_peer_addr(struct dcesrv_co
        return conn->transport.get_peer_addr(conn, mem_ctx);
 }
 
-/*
-  work out if we have a full packet yet
-*/
-static bool dce_full_packet(const DATA_BLOB *data)
-{
-       if (data->length < DCERPC_FRAG_LEN_OFFSET+2) {
-               return false;
-       }
-       if (dcerpc_get_frag_length(data) > data->length) {
-               return false;
-       }
-       return true;
-}
-
-/*
-  we might have consumed only part of our input - advance past that part
-*/
-static void dce_partial_advance(struct dcesrv_connection *dce_conn, uint32_t offset)
-{
-       DATA_BLOB blob;
-
-       if (dce_conn->partial_input.length == offset) {
-               data_blob_free(&dce_conn->partial_input);
-               return;
-       }
-
-       blob = dce_conn->partial_input;
-       dce_conn->partial_input = data_blob(blob.data + offset,
-                                           blob.length - offset);
-       data_blob_free(&blob);
-}
 
 /*
   remove the call from the right list when freed
@@ -1097,17 +1150,17 @@ static int dcesrv_call_dequeue(struct dcesrv_call_state *call)
 /*
   process some input to a dcerpc endpoint server.
 */
-NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
+NTSTATUS dcesrv_process_ncacn_packet(struct dcesrv_connection *dce_conn,
+                                    struct ncacn_packet *pkt,
+                                    DATA_BLOB blob)
 {
-       struct ndr_pull *ndr;
-       enum ndr_err_code ndr_err;
        NTSTATUS status;
        struct dcesrv_call_state *call;
-       DATA_BLOB blob;
 
        call = talloc_zero(dce_conn, struct dcesrv_call_state);
        if (!call) {
-               talloc_free(dce_conn->partial_input.data);
+               data_blob_free(&blob);
+               talloc_free(pkt);
                return NT_STATUS_NO_MEMORY;
        }
        call->conn              = dce_conn;
@@ -1117,43 +1170,19 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
        call->time              = timeval_current();
        call->list              = DCESRV_LIST_NONE;
 
-       talloc_set_destructor(call, dcesrv_call_dequeue);
-
-       blob = dce_conn->partial_input;
-       blob.length = dcerpc_get_frag_length(&blob);
+       talloc_steal(call, pkt);
+       talloc_steal(call, blob.data);
+       call->pkt = *pkt;
 
-       ndr = ndr_pull_init_blob(&blob, call, lp_iconv_convenience(call->conn->dce_ctx->lp_ctx));
-       if (!ndr) {
-               talloc_free(dce_conn->partial_input.data);
-               talloc_free(call);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!(CVAL(blob.data, DCERPC_DREP_OFFSET) & DCERPC_DREP_LE)) {
-               ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
-       }
-
-       if (CVAL(blob.data, DCERPC_PFC_OFFSET) & DCERPC_PFC_FLAG_OBJECT_UUID) {
-               ndr->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
-       }
-
-       ndr_err = ndr_pull_ncacn_packet(ndr, NDR_SCALARS|NDR_BUFFERS, &call->pkt);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               talloc_free(dce_conn->partial_input.data);
-               talloc_free(call);
-               return ndr_map_error2ntstatus(ndr_err);
-       }
+       talloc_set_destructor(call, dcesrv_call_dequeue);
 
        /* we have to check the signing here, before combining the
           pdus */
        if (call->pkt.ptype == DCERPC_PKT_REQUEST &&
            !dcesrv_auth_request(call, &blob)) {
-               dce_partial_advance(dce_conn, blob.length);
                return dcesrv_fault(call, DCERPC_FAULT_ACCESS_DENIED);          
        }
 
-       dce_partial_advance(dce_conn, blob.length);
-
        /* see if this is a continued packet */
        if (call->pkt.ptype == DCERPC_PKT_REQUEST &&
            !(call->pkt.pfc_flags & DCERPC_PFC_FLAG_FIRST)) {
@@ -1241,90 +1270,6 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
        return status;
 }
 
-
-/*
-  provide some input to a dcerpc endpoint server. This passes data
-  from a dcerpc client into the server
-*/
-_PUBLIC_ NTSTATUS dcesrv_input(struct dcesrv_connection *dce_conn, const DATA_BLOB *data)
-{
-       NTSTATUS status;
-
-       dce_conn->partial_input.data = talloc_realloc(dce_conn,
-                                                     dce_conn->partial_input.data,
-                                                     uint8_t,
-                                                     dce_conn->partial_input.length + data->length);
-       if (!dce_conn->partial_input.data) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       memcpy(dce_conn->partial_input.data + dce_conn->partial_input.length,
-              data->data, data->length);
-       dce_conn->partial_input.length += data->length;
-
-       while (dce_full_packet(&dce_conn->partial_input)) {
-               status = dcesrv_input_process(dce_conn);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
-       }
-
-       return NT_STATUS_OK;
-}
-
-/*
-  retrieve some output from a dcerpc server
-  The caller supplies a function that will be called to do the
-  actual output. 
-
-  The first argument to write_fn() will be 'private', the second will
-  be a pointer to a buffer containing the data to be sent and the 3rd
-  will be a pointer to a size_t variable that will be set to the
-  number of bytes that are consumed from the output.
-
-  from the current fragment
-*/
-_PUBLIC_ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn, 
-                      void *private_data,
-                      NTSTATUS (*write_fn)(void *private_data, DATA_BLOB *output, size_t *nwritten))
-{
-       NTSTATUS status;
-       struct dcesrv_call_state *call;
-       struct data_blob_list_item *rep;
-       size_t nwritten;
-
-       call = dce_conn->call_list;
-       if (!call || !call->replies) {
-               if (dce_conn->pending_call_list) {
-                       /* TODO: we need to say act async here
-                        *       as we know we have pending requests
-                        *       which will be finished at a time
-                        */
-                       return NT_STATUS_FOOBAR;
-               }
-               return NT_STATUS_FOOBAR;
-       }
-       rep = call->replies;
-
-       status = write_fn(private_data, &rep->blob, &nwritten);
-       NT_STATUS_IS_ERR_RETURN(status);
-
-       rep->blob.length -= nwritten;
-       rep->blob.data += nwritten;
-
-       if (rep->blob.length == 0) {
-               /* we're done with this section of the call */
-               DLIST_REMOVE(call->replies, rep);
-       }
-
-       if (call->replies == NULL) {
-               /* we're done with the whole call */
-               dcesrv_call_set_list(call, DCESRV_LIST_NONE);
-               talloc_free(call);
-       }
-
-       return status;
-}
-
 _PUBLIC_ NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx, 
                                      struct loadparm_context *lp_ctx,
                                      const char **endpoint_servers, struct dcesrv_context **_dce_ctx)
@@ -1342,6 +1287,8 @@ _PUBLIC_ NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx,
        NT_STATUS_HAVE_NO_MEMORY(dce_ctx);
        dce_ctx->endpoint_list  = NULL;
        dce_ctx->lp_ctx = lp_ctx;
+       dce_ctx->assoc_groups_idr = idr_init(dce_ctx);
+       NT_STATUS_HAVE_NO_MEMORY(dce_ctx->assoc_groups_idr);
 
        for (i=0;endpoint_servers[i];i++) {
                const struct dcesrv_endpoint_server *ep_server;
@@ -1422,6 +1369,38 @@ const struct dcesrv_endpoint_server *dcesrv_ep_server_byname(const char *name)
        return NULL;
 }
 
+void dcerpc_server_init(struct loadparm_context *lp_ctx)
+{
+       static bool initialized;
+       extern NTSTATUS dcerpc_server_wkssvc_init(void);
+       extern NTSTATUS dcerpc_server_drsuapi_init(void);
+       extern NTSTATUS dcerpc_server_winreg_init(void);
+       extern NTSTATUS dcerpc_server_spoolss_init(void);
+       extern NTSTATUS dcerpc_server_epmapper_init(void);
+       extern NTSTATUS dcerpc_server_srvsvc_init(void);
+       extern NTSTATUS dcerpc_server_netlogon_init(void);
+       extern NTSTATUS dcerpc_server_rpcecho_init(void);
+       extern NTSTATUS dcerpc_server_unixinfo_init(void);
+       extern NTSTATUS dcerpc_server_samr_init(void);
+       extern NTSTATUS dcerpc_server_remote_init(void);
+       extern NTSTATUS dcerpc_server_lsa_init(void);
+       extern NTSTATUS dcerpc_server_browser_init(void);
+       init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES };
+       init_module_fn *shared_init;
+
+       if (initialized) {
+               return;
+       }
+       initialized = true;
+
+       shared_init = load_samba_modules(NULL, lp_ctx, "dcerpc_server");
+
+       run_init_functions(static_init);
+       run_init_functions(shared_init);
+
+       talloc_free(shared_init);
+}
+
 /*
   return the DCERPC module version, and the size of some critical types
   This can be used by endpoint server modules to either detect compilation errors, or provide
@@ -1445,20 +1424,3 @@ const struct dcesrv_critical_sizes *dcerpc_module_version(void)
        return &critical_sizes;
 }
 
-/*
-  initialise the dcerpc server context for ncacn_np based services
-*/
-_PUBLIC_ NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
-                                         struct dcesrv_context **_dce_ctx)
-{
-       NTSTATUS status;
-       struct dcesrv_context *dce_ctx;
-
-       status = dcesrv_init_context(mem_ctx, lp_ctx, lp_dcerpc_endpoint_servers(lp_ctx), &dce_ctx);
-       NT_STATUS_NOT_OK_RETURN(status);
-
-       *_dce_ctx = dce_ctx;
-       return NT_STATUS_OK;
-}
-
-