r4161: two more fixes for NT4 clients. Bugs found by kukks.
[samba.git] / source4 / rpc_server / dcerpc_server.c
index 14b7c14d2a695b5677cac524bd220332b2970226..6e608fd30b0c5ff0ff65c110d8e03039e03e6a86 100644 (file)
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/ndr_oxidresolver.h"
+#include "auth/auth.h"
+#include "dlinklist.h"
+#include "rpc_server/dcerpc_server.h"
 
 /*
   see if two endpoints match
 */
-static BOOL endpoints_match(const struct dcesrv_ep_description *ep1,
-                                                       const struct dcesrv_ep_description *ep2)
+static BOOL endpoints_match(const struct dcerpc_binding *ep1,
+                           const struct dcerpc_binding *ep2)
 {
-       if (ep1->type != ep2->type) {
+       if (ep1->transport != ep2->transport) {
                return False;
        }
 
-       switch (ep1->type) {
-               case ENDPOINT_SMB:
-                       if (strcasecmp(ep1->info.smb_pipe,ep2->info.smb_pipe)==0) {
-                               return True;
-                       }                       
-                       break;
-               case ENDPOINT_TCP:
-                       if (ep1->info.tcp_port == ep2->info.tcp_port) {
-                               return True;
-                       }
-                       break;
+       if (!ep1->endpoint || !ep2->endpoint) {
+               return ep1->endpoint == ep2->endpoint;
        }
 
-       return False;
+       if (strcasecmp(ep1->endpoint, ep2->endpoint) != 0) 
+               return False;
+
+       return True;
 }
 
 /*
   find an endpoint in the dcesrv_context
 */
 static struct dcesrv_endpoint *find_endpoint(struct dcesrv_context *dce_ctx,
-                                                      const struct dcesrv_ep_description *ep_description)
+                                            const struct dcerpc_binding *ep_description)
 {
        struct dcesrv_endpoint *ep;
        for (ep=dce_ctx->endpoint_list; ep; ep=ep->next) {
@@ -150,37 +149,28 @@ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
                                   const struct dcesrv_interface *iface,
                                   const struct security_descriptor *sd)
 {
-       struct dcesrv_ep_description ep_description;
        struct dcesrv_endpoint *ep;
        struct dcesrv_if_list *ifl;
-       BOOL tcp;
+       struct dcerpc_binding binding;
        BOOL add_ep = False;
+       NTSTATUS status;
+       
+       status = dcerpc_parse_binding(dce_ctx, ep_name, &binding);
 
-       tcp = (strncasecmp(ep_name, "TCP-", 4) == 0);
-
-       if (tcp) {
-               ep_description.type = ENDPOINT_TCP;
-               ep_description.info.tcp_port = atoi(ep_name+4);
-       } else {
-               ep_description.type = ENDPOINT_SMB;
-               ep_description.info.smb_pipe = ep_name;
+       if (NT_STATUS_IS_ERR(status)) {
+               DEBUG(0, ("Trouble parsing binding string '%s'\n", ep_name));
+               return status;
        }
 
        /* check if this endpoint exists
         */
-       if ((ep=find_endpoint(dce_ctx, &ep_description))==NULL) {
-               ep = talloc(dce_ctx->mem_ctx, sizeof(*ep));
+       if ((ep=find_endpoint(dce_ctx, &binding))==NULL) {
+               ep = talloc_p(dce_ctx, struct dcesrv_endpoint);
                if (!ep) {
                        return NT_STATUS_NO_MEMORY;
                }
                ZERO_STRUCTP(ep);
-               if (tcp) {
-                       ep->ep_description.type = ENDPOINT_TCP;
-                       ep->ep_description.info.tcp_port = atoi(ep_name+4);
-               } else {
-                       ep->ep_description.type = ENDPOINT_SMB;
-                       ep->ep_description.info.smb_pipe = smb_xstrdup(ep_name);
-               }
+               ep->ep_description = binding;
                add_ep = True;
        }
 
@@ -192,7 +182,7 @@ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
        }
 
        /* talloc a new interface list element */
-       ifl = talloc(dce_ctx->mem_ctx, sizeof(*ifl));
+       ifl = talloc_p(dce_ctx, struct dcesrv_if_list);
        if (!ifl) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -208,7 +198,7 @@ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
                 * we try to set it
                 */
                if (ep->sd == NULL) {
-                       ep->sd = copy_security_descriptor(dce_ctx->mem_ctx, sd);
+                       ep->sd = security_descriptor_copy(dce_ctx, sd);
                }
 
                /* if now there's no security descriptor given on the endpoint
@@ -250,10 +240,10 @@ static NTSTATUS dcesrv_inherited_session_key(struct dcesrv_connection *p,
 }
 
 NTSTATUS dcesrv_generic_session_key(struct dcesrv_connection *p,
-                                 DATA_BLOB *session_key)
+                                   DATA_BLOB *session_key)
 {
        /* this took quite a few CPU cycles to find ... */
-       session_key->data = "SystemLibraryDTC";
+       session_key->data = discard_const_p(uint8_t, "SystemLibraryDTC");
        session_key->length = 16;
        return NT_STATUS_OK;
 }
@@ -268,6 +258,29 @@ NTSTATUS dcesrv_fetch_session_key(struct dcesrv_connection *p,
 }
 
 
+/*
+  destroy a link to an endpoint
+*/
+static int dcesrv_endpoint_destructor(void *ptr)
+{
+       struct dcesrv_connection *p = ptr;
+       if (p->iface) {
+               p->iface->unbind(p, p->iface);
+       }
+
+       /* destroy any handles */
+       while (p->handles) {
+               dcesrv_handle_destroy(p, p->handles);
+       }
+
+       if (p->auth_state.gensec_security) {
+               gensec_end(&p->auth_state.gensec_security);
+       }
+
+       return 0;
+}
+
+
 /*
   connect to a dcerpc endpoint
 */
@@ -275,21 +288,12 @@ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
                                 const struct dcesrv_endpoint *ep,
                                 struct dcesrv_connection **p)
 {
-       TALLOC_CTX *mem_ctx;
-
-       mem_ctx = talloc_init("dcesrv_endpoint_connect");
-       if (!mem_ctx) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       *p = talloc_p(mem_ctx, struct dcesrv_connection);
+       *p = talloc_p(dce_ctx, struct dcesrv_connection);
        if (! *p) {
-               talloc_free(mem_ctx);
                return NT_STATUS_NO_MEMORY;
        }
 
        (*p)->dce_ctx = dce_ctx;
-       (*p)->mem_ctx = mem_ctx;
        (*p)->endpoint = ep;
        (*p)->iface = NULL;
        (*p)->private = NULL;
@@ -303,6 +307,8 @@ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
        (*p)->auth_state.session_key = dcesrv_generic_session_key;
        (*p)->srv_conn = NULL;
 
+       talloc_set_destructor(*p, dcesrv_endpoint_destructor);
+
        return NT_STATUS_OK;
 }
 
@@ -310,7 +316,7 @@ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
   search and connect to a dcerpc endpoint
 */
 NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx,
-                                       const struct dcesrv_ep_description *ep_description,
+                                       const struct dcerpc_binding *ep_description,
                                        struct auth_session_info *session_info,
                                        struct dcesrv_connection **dce_conn_p)
 {
@@ -341,31 +347,6 @@ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx,
 }
 
 
-/*
-  disconnect a link to an endpoint
-*/
-void dcesrv_endpoint_disconnect(struct dcesrv_connection *p)
-{
-       if (p->iface) {
-               p->iface->unbind(p, p->iface);
-       }
-
-       /* destroy any handles */
-       while (p->handles) {
-               dcesrv_handle_destroy(p, p->handles);
-       }
-
-       if (p->auth_state.gensec_security) {
-               gensec_end(&p->auth_state.gensec_security);
-       }
-
-       if (p->auth_state.session_info) {
-               free_session_info(&p->auth_state.session_info);
-       }
-
-       talloc_free(p->mem_ctx);
-}
-
 static void dcesrv_init_hdr(struct dcerpc_packet *pkt)
 {
        pkt->rpc_vers = 5;
@@ -400,12 +381,12 @@ static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t fault_code
        pkt.u.fault.cancel_count = 0;
        pkt.u.fault.status = fault_code;
 
-       rep = talloc_p(call->mem_ctx, struct dcesrv_call_reply);
+       rep = talloc_p(call, struct dcesrv_call_reply);
        if (!rep) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = dcerpc_push_auth(&rep->data, call->mem_ctx, &pkt, NULL);
+       status = dcerpc_push_auth(&rep->data, call, &pkt, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -437,12 +418,12 @@ static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32_t reason)
        pkt.u.bind_nak.reject_reason = reason;
        pkt.u.bind_nak.num_versions = 0;
 
-       rep = talloc_p(call->mem_ctx, struct dcesrv_call_reply);
+       rep = talloc_p(call, struct dcesrv_call_reply);
        if (!rep) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = dcerpc_push_auth(&rep->data, call->mem_ctx, &pkt, NULL);
+       status = dcerpc_push_auth(&rep->data, call, &pkt, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -474,13 +455,13 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        }
 
        if_version = call->pkt.u.bind.ctx_list[0].abstract_syntax.if_version;
-       uuid = GUID_string(call->mem_ctx, &call->pkt.u.bind.ctx_list[0].abstract_syntax.uuid);
+       uuid = GUID_string(call, &call->pkt.u.bind.ctx_list[0].abstract_syntax.uuid);
        if (!uuid) {
                return dcesrv_bind_nak(call, 0);
        }
 
        transfer_syntax_version = call->pkt.u.bind.ctx_list[0].transfer_syntaxes[0].if_version;
-       transfer_syntax = GUID_string(call->mem_ctx
+       transfer_syntax = GUID_string(call, 
                                      &call->pkt.u.bind.ctx_list[0].transfer_syntaxes[0].uuid);
        if (!transfer_syntax ||
            strcasecmp(NDR_GUID, transfer_syntax) != 0 ||
@@ -517,13 +498,14 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        pkt.u.bind_ack.max_recv_frag = 0x2000;
        pkt.u.bind_ack.assoc_group_id = call->pkt.u.bind.assoc_group_id;
        if (call->conn->iface && call->conn->iface->ndr) {
-               pkt.u.bind_ack.secondary_address = talloc_asprintf(call->mem_ctx, "\\PIPE\\%s", 
+               /* FIXME: Use pipe name as specified by endpoint instead of interface name */
+               pkt.u.bind_ack.secondary_address = talloc_asprintf(call, "\\PIPE\\%s", 
                                                                   call->conn->iface->ndr->name);
        } else {
                pkt.u.bind_ack.secondary_address = "";
        }
        pkt.u.bind_ack.num_results = 1;
-       pkt.u.bind_ack.ctx_list = talloc_p(call->mem_ctx, struct dcerpc_ack_ctx);
+       pkt.u.bind_ack.ctx_list = talloc_p(call, struct dcerpc_ack_ctx);
        if (!pkt.u.bind_ack.ctx_list) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -545,12 +527,12 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
                }
        }
 
-       rep = talloc_p(call->mem_ctx, struct dcesrv_call_reply);
+       rep = talloc_p(call, struct dcesrv_call_reply);
        if (!rep) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = dcerpc_push_auth(&rep->data, call->mem_ctx, &pkt, 
+       status = dcerpc_push_auth(&rep->data, call, &pkt, 
                                  call->conn->auth_state.auth_info);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -575,13 +557,72 @@ static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
                return dcesrv_fault(call, DCERPC_FAULT_OTHER);
        }
 
-       talloc_free(call->mem_ctx);
+       talloc_free(call);
 
        /* we don't send a reply to a auth3 request, except by a
           fault */
        return NT_STATUS_OK;
 }
 
+/*
+  handle a bind request
+*/
+static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
+{
+       struct dcerpc_packet pkt;
+       struct dcesrv_call_reply *rep;
+       NTSTATUS status;
+       uint32_t result=0, reason=0;
+
+       /* handle any authentication that is being requested */
+       if (!dcesrv_auth_alter(call)) {
+               /* TODO: work out the right reject code */
+               return dcesrv_bind_nak(call, 0);
+       }
+
+       /* setup a alter_ack */
+       dcesrv_init_hdr(&pkt);
+       pkt.auth_length = 0;
+       pkt.call_id = call->pkt.call_id;
+       pkt.ptype = DCERPC_PKT_ALTER_ACK;
+       pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
+       pkt.u.alter_ack.max_xmit_frag = 0x2000;
+       pkt.u.alter_ack.max_recv_frag = 0x2000;
+       pkt.u.alter_ack.assoc_group_id = call->pkt.u.bind.assoc_group_id;
+       pkt.u.alter_ack.secondary_address = NULL;
+       pkt.u.alter_ack.num_results = 1;
+       pkt.u.alter_ack.ctx_list = talloc_p(call, struct dcerpc_ack_ctx);
+       if (!pkt.u.alter_ack.ctx_list) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       pkt.u.alter_ack.ctx_list[0].result = result;
+       pkt.u.alter_ack.ctx_list[0].reason = reason;
+       GUID_from_string(NDR_GUID, &pkt.u.alter_ack.ctx_list[0].syntax.uuid);
+       pkt.u.alter_ack.ctx_list[0].syntax.if_version = NDR_GUID_VERSION;
+       pkt.u.alter_ack.auth_info = data_blob(NULL, 0);
+
+       if (!dcesrv_auth_alter_ack(call, &pkt)) {
+               return dcesrv_bind_nak(call, 0);
+       }
+
+       rep = talloc_p(call, struct dcesrv_call_reply);
+       if (!rep) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = dcerpc_push_auth(&rep->data, call, &pkt, 
+                                 call->conn->auth_state.auth_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       dcerpc_set_frag_length(&rep->data, rep->data.length);
+
+       DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
+       DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
+
+       return NT_STATUS_OK;
+}
 
 /*
   handle a dcerpc request packet
@@ -607,12 +648,16 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
                return dcesrv_fault(call, DCERPC_FAULT_OP_RNG_ERROR);
        }
 
-       pull = ndr_pull_init_blob(&call->pkt.u.request.stub_and_verifier, call->mem_ctx);
+       pull = ndr_pull_init_blob(&call->pkt.u.request.stub_and_verifier, call);
        if (!pull) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       r = talloc(call->mem_ctx, call->conn->iface->ndr->calls[opnum].struct_size);
+       if (call->pkt.pfc_flags & DCERPC_PFC_FLAG_ORPC) {
+               pull->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
+       }
+
+       r = talloc(call, call->conn->iface->ndr->calls[opnum].struct_size);
        if (!r) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -638,7 +683,7 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
        call->fault_code = 0;
 
        /* call the dispatch function */
-       status = call->conn->iface->dispatch(call, call->mem_ctx, r);
+       status = call->conn->iface->dispatch(call, call, r);
        if (!NT_STATUS_IS_OK(status)) {
                dcerpc_log_packet(call->conn->iface->ndr, opnum, NDR_IN, 
                                  &call->pkt.u.request.stub_and_verifier);
@@ -646,7 +691,7 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
        }
 
        /* form the reply NDR */
-       push = ndr_push_init_ctx(call->mem_ctx);
+       push = ndr_push_init_ctx(call);
        if (!push) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -674,7 +719,7 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
                struct dcesrv_call_reply *rep;
                struct dcerpc_packet pkt;
 
-               rep = talloc_p(call->mem_ctx, struct dcesrv_call_reply);
+               rep = talloc_p(call, struct dcesrv_call_reply);
                if (!rep) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -760,32 +805,25 @@ static void dce_partial_advance(struct dcesrv_connection *dce_conn, uint32_t off
 NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
 {
        struct ndr_pull *ndr;
-       TALLOC_CTX *mem_ctx;
        NTSTATUS status;
        struct dcesrv_call_state *call;
        DATA_BLOB blob;
 
-       mem_ctx = talloc_init("dcesrv_input");
-       if (!mem_ctx) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       call = talloc_p(mem_ctx, struct dcesrv_call_state);
+       call = talloc_p(dce_conn, struct dcesrv_call_state);
        if (!call) {
                talloc_free(dce_conn->partial_input.data);
-               talloc_free(mem_ctx);
                return NT_STATUS_NO_MEMORY;
        }
-       call->mem_ctx = mem_ctx;
        call->conn = dce_conn;
        call->replies = NULL;
 
        blob = dce_conn->partial_input;
        blob.length = dcerpc_get_frag_length(&blob);
 
-       ndr = ndr_pull_init_blob(&blob, mem_ctx);
+       ndr = ndr_pull_init_blob(&blob, call);
        if (!ndr) {
                talloc_free(dce_conn->partial_input.data);
-               talloc_free(mem_ctx);
+               talloc_free(call);
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -796,7 +834,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
        status = ndr_pull_dcerpc_packet(ndr, NDR_SCALARS|NDR_BUFFERS, &call->pkt);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(dce_conn->partial_input.data);
-               talloc_free(mem_ctx);
+               talloc_free(call);
                return status;
        }
 
@@ -811,7 +849,8 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
        dce_partial_advance(dce_conn, blob.length);
 
        /* see if this is a continued packet */
-       if (!(call->pkt.pfc_flags & DCERPC_PFC_FLAG_FIRST)) {
+       if (call->pkt.ptype == DCERPC_PKT_REQUEST &&
+           !(call->pkt.pfc_flags & DCERPC_PFC_FLAG_FIRST)) {
                struct dcesrv_call_state *call2 = call;
                uint32_t alloc_size;
 
@@ -839,7 +878,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
                }
 
                call->pkt.u.request.stub_and_verifier.data = 
-                       talloc_realloc(call->pkt.u.request.stub_and_verifier.data, alloc_size);
+                       talloc_realloc(call, call->pkt.u.request.stub_and_verifier.data, alloc_size);
                if (!call->pkt.u.request.stub_and_verifier.data) {
                        return dcesrv_fault(call2, DCERPC_FAULT_OTHER);
                }
@@ -851,11 +890,14 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
                        call2->pkt.u.request.stub_and_verifier.length;
 
                call->pkt.pfc_flags |= (call2->pkt.pfc_flags & DCERPC_PFC_FLAG_LAST);
+
+               talloc_free(call2);
        }
 
        /* this may not be the last pdu in the chain - if its isn't then
           just put it on the call_list and wait for the rest */
-       if (!(call->pkt.pfc_flags & DCERPC_PFC_FLAG_LAST)) {
+       if (call->pkt.ptype == DCERPC_PKT_REQUEST &&
+           !(call->pkt.pfc_flags & DCERPC_PFC_FLAG_LAST)) {
                DLIST_ADD_END(dce_conn->call_list, call, struct dcesrv_call_state *);
                return NT_STATUS_OK;
        }
@@ -867,6 +909,9 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
        case DCERPC_PKT_AUTH3:
                status = dcesrv_auth3(call);
                break;
+       case DCERPC_PKT_ALTER:
+               status = dcesrv_alter(call);
+               break;
        case DCERPC_PKT_REQUEST:
                status = dcesrv_request(call);
                break;
@@ -879,7 +924,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
           it to the list of pending calls. We add it to the end to keep the call
           list in the order we will answer */
        if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(mem_ctx);
+               talloc_free(call);
        }
 
        return status;
@@ -894,7 +939,8 @@ NTSTATUS dcesrv_input(struct dcesrv_connection *dce_conn, const DATA_BLOB *data)
 {
        NTSTATUS status;
 
-       dce_conn->partial_input.data = talloc_realloc(dce_conn->partial_input.data,
+       dce_conn->partial_input.data = talloc_realloc(dce_conn,
+                                                     dce_conn->partial_input.data,
                                                      dce_conn->partial_input.length + data->length);
        if (!dce_conn->partial_input.data) {
                return NT_STATUS_NO_MEMORY;
@@ -934,7 +980,6 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
        struct dcesrv_call_state *call;
        struct dcesrv_call_reply *rep;
        ssize_t nwritten;
-       NTSTATUS status = NT_STATUS_OK;
 
        call = dce_conn->call_list;
        if (!call || !call->replies) {
@@ -956,16 +1001,16 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
                /* we're done with this section of the call */
                DLIST_REMOVE(call->replies, rep);
        } else {
-               status = STATUS_BUFFER_OVERFLOW;
+               return STATUS_BUFFER_OVERFLOW;
        }
 
        if (call->replies == NULL) {
                /* we're done with the whole call */
                DLIST_REMOVE(dce_conn->call_list, call);
-               talloc_free(call->mem_ctx);
+               talloc_free(call);
        }
 
-       return status;
+       return NT_STATUS_OK;
 }
 
 
@@ -995,18 +1040,17 @@ NTSTATUS dcesrv_output_blob(struct dcesrv_connection *dce_conn,
 /*
   initialise the dcerpc server context
 */
-NTSTATUS dcesrv_init_context(struct dcesrv_context *dce_ctx)
+NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx, struct dcesrv_context **dce_ctx)
 {
        int i;
        const char **endpoint_servers = lp_dcerpc_endpoint_servers();
 
-       dce_ctx->mem_ctx = talloc_init("struct dcesrv_context");
-       if (!dce_ctx->mem_ctx) {
-               DEBUG(3,("dcesrv_init_context: talloc_init failed\n"));
+       (*dce_ctx) = talloc_p(mem_ctx, struct dcesrv_context);
+       if (! *dce_ctx) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       dce_ctx->endpoint_list = NULL;
+       (*dce_ctx)->endpoint_list = NULL;
 
        if (!endpoint_servers) {
                DEBUG(3,("dcesrv_init_context: no endpoint servers configured\n"));
@@ -1023,7 +1067,7 @@ NTSTATUS dcesrv_init_context(struct dcesrv_context *dce_ctx)
                        return NT_STATUS_UNSUCCESSFUL;
                }
 
-               ret = ep_server->init_server(dce_ctx, ep_server);
+               ret = ep_server->init_server(*dce_ctx, ep_server);
                if (!NT_STATUS_IS_OK(ret)) {
                        DEBUG(0,("dcesrv_init_context: failed to init endpoint server = '%s'\n", endpoint_servers[i]));
                        return ret;
@@ -1035,7 +1079,6 @@ NTSTATUS dcesrv_init_context(struct dcesrv_context *dce_ctx)
 
 static void dcesrv_init(struct server_service *service, const struct model_ops *model_ops)
 {
-       TALLOC_CTX *mem_ctx;
        struct dcesrv_context *dce_ctx;
        int i;
        const char **endpoint_servers = lp_dcerpc_endpoint_servers();
@@ -1047,16 +1090,13 @@ static void dcesrv_init(struct server_service *service, const struct model_ops *
                return;
        }
 
-       mem_ctx = talloc_init("struct dcesrv_context");
-
-       dce_ctx = talloc_p(mem_ctx, struct dcesrv_context);
+       dce_ctx = talloc_p(service, struct dcesrv_context);
        if (!dce_ctx) {
                DEBUG(0,("talloc_p(mem_ctx, struct dcesrv_context) failed\n"));
                return;
        }
 
        ZERO_STRUCTP(dce_ctx);
-       dce_ctx->mem_ctx        = mem_ctx;
        dce_ctx->endpoint_list  = NULL;
 
        for (i=0;endpoint_servers[i];i++) {
@@ -1076,46 +1116,43 @@ static void dcesrv_init(struct server_service *service, const struct model_ops *
                }
        }
 
-       dcesrv_tcp_init(service, model_ops, dce_ctx);
+       dcesrv_sock_init(service, model_ops, dce_ctx);
 
        return; 
 }
 
 static void dcesrv_accept(struct server_connection *srv_conn)
 {
-       dcesrv_tcp_accept(srv_conn);
-}
-
-static void dcesrv_recv(struct server_connection *srv_conn, time_t t, uint16_t flags)
-{
-       dcesrv_tcp_recv(srv_conn, t, flags);
+       dcesrv_sock_accept(srv_conn);
 }
 
-static void dcesrv_send(struct server_connection *srv_conn, time_t t, uint16_t flags)
+static void dcesrv_recv(struct server_connection *srv_conn, 
+                       struct timeval t, uint16_t flags)
 {
-       dcesrv_tcp_send(srv_conn, t, flags);
+       dcesrv_sock_recv(srv_conn, t, flags);
 }
 
-static void dcesrv_idle(struct server_connection *srv_conn, time_t t)
+static void dcesrv_send(struct server_connection *srv_conn, 
+                       struct timeval t, uint16_t flags)
 {
-       dcesrv_tcp_idle(srv_conn, t);
+       dcesrv_sock_send(srv_conn, t, flags);
 }
 
 static void dcesrv_close(struct server_connection *srv_conn, const char *reason)
 {
-       dcesrv_tcp_close(srv_conn, reason);
+       dcesrv_sock_close(srv_conn, reason);
        return; 
 }
 
 static void dcesrv_exit(struct server_service *service, const char *reason)
 {
-       dcesrv_tcp_exit(service, reason);
+       dcesrv_sock_exit(service, reason);
        return; 
 }
 
 /* the list of currently registered DCERPC endpoint servers.
  */
-static struct {
+static struct ep_server {
        struct dcesrv_endpoint_server *ep_server;
 } *ep_servers = NULL;
 static int num_ep_servers;
@@ -1128,7 +1165,7 @@ static int num_ep_servers;
 
   The 'type' is used to specify whether this is for a disk, printer or IPC$ share
 */
-static NTSTATUS dcerpc_register_ep_server(const void *_ep_server)
+NTSTATUS dcerpc_register_ep_server(const void *_ep_server)
 {
        const struct dcesrv_endpoint_server *ep_server = _ep_server;
        
@@ -1139,7 +1176,7 @@ static NTSTATUS dcerpc_register_ep_server(const void *_ep_server)
                return NT_STATUS_OBJECT_NAME_COLLISION;
        }
 
-       ep_servers = Realloc(ep_servers, sizeof(ep_servers[0]) * (num_ep_servers+1));
+       ep_servers = realloc_p(ep_servers, struct ep_server, num_ep_servers+1);
        if (!ep_servers) {
                smb_panic("out of memory in dcerpc_register");
        }
@@ -1183,7 +1220,6 @@ const struct dcesrv_critical_sizes *dcerpc_module_version(void)
                sizeof(struct dcesrv_context),
                sizeof(struct dcesrv_endpoint),
                sizeof(struct dcesrv_endpoint_server),
-               sizeof(struct dcesrv_ep_description),
                sizeof(struct dcesrv_interface),
                sizeof(struct dcesrv_if_list),
                sizeof(struct dcesrv_connection),
@@ -1195,32 +1231,13 @@ const struct dcesrv_critical_sizes *dcerpc_module_version(void)
        return &critical_sizes;
 }
 
-/*
-  initialise the DCERPC subsystem
-*/
-BOOL subsystem_dcerpc_init(void)
-{
-       NTSTATUS status;
-
-       status = register_subsystem("dcerpc", dcerpc_register_ep_server); 
-       if (!NT_STATUS_IS_OK(status)) {
-               return False;
-       }
-
-       /* FIXME: Perhaps panic if a basic endpoint server, such as EPMAPER, fails to initialise? */
-       static_init_dcerpc;
-
-       DEBUG(3,("DCERPC subsystem version %d initialised\n", DCERPC_MODULE_VERSION));
-       return True;
-}
-
 static const struct server_service_ops dcesrv_ops = {
        .name                   = "rpc",
        .service_init           = dcesrv_init,
        .accept_connection      = dcesrv_accept,
        .recv_handler           = dcesrv_recv,
        .send_handler           = dcesrv_send,
-       .idle_handler           = dcesrv_idle,
+       .idle_handler           = NULL,
        .close_connection       = dcesrv_close,
        .service_exit           = dcesrv_exit,  
 };