r6714: We can only ask GENSEC questions if we are authenticated.
[samba.git] / source / rpc_server / dcerpc_server.c
index 683be7225b93a208d1c4f23c62fa3613a6d1bda9..52da43a35e44c019f16a1f0829b635e600224797 100644 (file)
@@ -3,8 +3,8 @@
 
    server side dcerpc core code
 
-   Copyright (C) Andrew Tridgell 2003
-   Copyright (C) Stefan (metze) Metzmacher 2004
+   Copyright (C) Andrew Tridgell 2003-2005
+   Copyright (C) Stefan (metze) Metzmacher 2004-2005
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 */
 
 #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"
+#include "lib/events/events.h"
+#include "smbd/service_stream.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) {
-               if (endpoints_match(&ep->ep_description, ep_description)) {
+               if (endpoints_match(ep->ep_description, ep_description)) {
                        return ep;
                }
        }
        return NULL;
 }
 
+/*
+  find a registered context_id from a bind or alter_context
+*/
+static struct dcesrv_connection_context *dcesrv_find_context(struct dcesrv_connection *conn, 
+                                                                  uint32_t context_id)
+{
+       struct dcesrv_connection_context *c;
+       for (c=conn->contexts;c;c=c->next) {
+               if (c->context_id == context_id) return c;
+       }
+       return NULL;
+}
+
 /*
   see if a uuid and if_version match to an interface
 */
 static BOOL interface_match(const struct dcesrv_interface *if1,
                                                        const struct dcesrv_interface *if2)
 {
-       if (if1->ndr->if_version != if2->ndr->if_version) {
+       if (if1->if_version != if2->if_version) {
                return False;
        }
 
-       if (strcmp(if1->ndr->uuid, if2->ndr->uuid)==0) {
+       if (strcmp(if1->uuid, if2->uuid)==0) {
                return True;
        }                       
 
@@ -85,7 +99,7 @@ static BOOL interface_match(const struct dcesrv_interface *if1,
   find the interface operations on an endpoint
 */
 static const struct dcesrv_interface *find_interface(const struct dcesrv_endpoint *endpoint,
-                                                      const struct dcesrv_interface *iface)
+                                                    const struct dcesrv_interface *iface)
 {
        struct dcesrv_if_list *ifl;
        for (ifl=endpoint->interface_list; ifl; ifl=ifl->next) {
@@ -100,13 +114,13 @@ static const struct dcesrv_interface *find_interface(const struct dcesrv_endpoin
   see if a uuid and if_version match to an interface
 */
 static BOOL interface_match_by_uuid(const struct dcesrv_interface *iface,
-                                                       const char *uuid, uint32_t if_version)
+                                   const char *uuid, uint32_t if_version)
 {
-       if (iface->ndr->if_version != if_version) {
+       if (iface->if_version != if_version) {
                return False;
        }
 
-       if (strcmp(iface->ndr->uuid, uuid)==0) {
+       if (strcmp(iface->uuid, uuid)==0) {
                return True;
        }                       
 
@@ -117,7 +131,7 @@ static BOOL interface_match_by_uuid(const struct dcesrv_interface *iface,
   find the interface operations on an endpoint by uuid
 */
 static const struct dcesrv_interface *find_interface_by_uuid(const struct dcesrv_endpoint *endpoint,
-                                                      const char *uuid, uint32_t if_version)
+                                                            const char *uuid, uint32_t if_version)
 {
        struct dcesrv_if_list *ifl;
        for (ifl=endpoint->interface_list; ifl; ifl=ifl->next) {
@@ -146,53 +160,44 @@ static struct dcesrv_call_state *dcesrv_find_call(struct dcesrv_connection *dce_
   register an interface on an endpoint
 */
 NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
-                               const char *ep_name,
-                               const struct dcesrv_interface *iface,
-                               const struct security_descriptor *sd)
+                                  const char *ep_name,
+                                  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(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 = talloc_reference(ep, binding);
                add_ep = True;
        }
 
        /* see if the interface is already registered on te endpoint */
        if (find_interface(ep, iface)!=NULL) {
                DEBUG(0,("dcesrv_interface_register: interface '%s' already registered on endpoint '%s'\n",
-                       iface->ndr->name, ep_name));
+                       iface->name, ep_name));
                return NT_STATUS_OBJECT_NAME_COLLISION;
        }
 
        /* talloc a new interface list element */
-       ifl = talloc(dce_ctx->mem_ctx, sizeof(*ifl));
+       ifl = talloc(dce_ctx, struct dcesrv_if_list);
        if (!ifl) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -208,7 +213,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
@@ -218,7 +223,7 @@ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
                if (ep->sd != NULL) {
                        DEBUG(0,("dcesrv_interface_register: interface '%s' failed to setup a security descriptor\n"
                                 "                           on endpoint '%s'\n",
-                               iface->ndr->name, ep_name));
+                               iface->name, ep_name));
                        if (add_ep) free(ep);
                        free(ifl);
                        return NT_STATUS_OBJECT_NAME_COLLISION;
@@ -234,60 +239,102 @@ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
        }
 
        DEBUG(4,("dcesrv_interface_register: interface '%s' registered on endpoint '%s'\n",
-               iface->ndr->name, ep_name));
+               iface->name, ep_name));
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS dcesrv_inherited_session_key(struct dcesrv_connection *p,
+                                             DATA_BLOB *session_key)
+{
+       if (p->auth_state.session_info->session_key.length) {
+               *session_key = p->auth_state.session_info->session_key;
+               return NT_STATUS_OK;
+       }
+       return NT_STATUS_NO_USER_SESSION_KEY;
+}
 
+NTSTATUS dcesrv_generic_session_key(struct dcesrv_connection *p,
+                                   DATA_BLOB *session_key)
+{
+       /* this took quite a few CPU cycles to find ... */
+       session_key->data = discard_const_p(uint8_t, "SystemLibraryDTC");
+       session_key->length = 16;
        return NT_STATUS_OK;
 }
 
 /*
-  connect to a dcerpc endpoint
+  fetch the user session key - may be default (above) or the SMB session key
 */
-NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
-                                const struct dcesrv_endpoint *ep,
-                                struct dcesrv_connection **p)
+NTSTATUS dcesrv_fetch_session_key(struct dcesrv_connection *p,
+                                 DATA_BLOB *session_key)
 {
-       TALLOC_CTX *mem_ctx;
+       return p->auth_state.session_key(p, session_key);
+}
 
-       mem_ctx = talloc_init("dcesrv_endpoint_connect");
-       if (!mem_ctx) {
-               return NT_STATUS_NO_MEMORY;
-       }
 
-       *p = talloc_p(mem_ctx, struct dcesrv_connection);
-       if (! *p) {
-               talloc_destroy(mem_ctx);
-               return NT_STATUS_NO_MEMORY;
-       }
+/*
+  destroy a link to an endpoint
+*/
+static int dcesrv_endpoint_destructor(void *ptr)
+{
+       struct dcesrv_connection *p = ptr;
 
-       (*p)->dce_ctx = dce_ctx;
-       (*p)->mem_ctx = mem_ctx;
-       (*p)->endpoint = ep;
-       (*p)->iface = NULL;
-       (*p)->private = NULL;
-       (*p)->call_list = NULL;
-       (*p)->cli_max_recv_frag = 0;
-       (*p)->handles = NULL;
-       (*p)->partial_input = data_blob(NULL, 0);
-       (*p)->auth_state.ntlmssp_state = NULL;
-       (*p)->auth_state.auth_info = NULL;
-       (*p)->session_key = data_blob(NULL, 0);
+       while (p->contexts) {
+               struct dcesrv_connection_context *c = p->contexts;
 
-       return NT_STATUS_OK;
+               DLIST_REMOVE(p->contexts, c);
+
+               if (c->iface) {
+                       c->iface->unbind(c, c->iface);
+               }
+       }
+
+       return 0;
 }
 
+
 /*
-  set the transport level session key
+  connect to a dcerpc endpoint
 */
-void dcesrv_set_session_key(struct dcesrv_connection *p, DATA_BLOB key)
+NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
+                                TALLOC_CTX *mem_ctx,
+                                const struct dcesrv_endpoint *ep,
+                                struct stream_connection *srv_conn,
+                                struct dcesrv_connection **_p)
 {
-       p->session_key = data_blob_talloc(p->mem_ctx, key.data, key.length);
+       struct dcesrv_connection *p;
+
+       p = talloc(mem_ctx, struct dcesrv_connection);
+       NT_STATUS_HAVE_NO_MEMORY(p);
+
+       p->dce_ctx = dce_ctx;
+       p->endpoint = ep;
+       p->contexts = NULL;
+       p->call_list = NULL;
+       p->pending_call_list = NULL;
+       p->cli_max_recv_frag = 0;
+       p->partial_input = data_blob(NULL, 0);
+       p->auth_state.auth_info = NULL;
+       p->auth_state.gensec_security = NULL;
+       p->auth_state.session_info = NULL;
+       p->auth_state.session_key = dcesrv_generic_session_key;
+       p->srv_conn = srv_conn;
+
+       talloc_set_destructor(p, dcesrv_endpoint_destructor);
+
+       *_p = p;
+       return NT_STATUS_OK;
 }
 
 /*
   search and connect to a dcerpc endpoint
 */
 NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx,
-                                       const struct dcesrv_ep_description *ep_description,
+                                       TALLOC_CTX *mem_ctx,
+                                       const struct dcerpc_binding *ep_description,
+                                       struct auth_session_info *session_info,
+                                       struct stream_connection *srv_conn,
                                        struct dcesrv_connection **dce_conn_p)
 {
        NTSTATUS status;
@@ -299,11 +346,14 @@ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx,
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       status = dcesrv_endpoint_connect(dce_ctx, ep, dce_conn_p);
+       status = dcesrv_endpoint_connect(dce_ctx, mem_ctx, ep, srv_conn, dce_conn_p);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
+       (*dce_conn_p)->auth_state.session_info = talloc_reference((*dce_conn_p), session_info);
+       (*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
@@ -313,23 +363,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);
-       }
-       
-       talloc_destroy(p->mem_ctx);
-}
-
 static void dcesrv_init_hdr(struct dcerpc_packet *pkt)
 {
        pkt->rpc_vers = 5;
@@ -364,12 +397,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(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;
        }
@@ -401,12 +434,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(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;
        }
@@ -431,20 +464,29 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        struct dcesrv_call_reply *rep;
        NTSTATUS status;
        uint32_t result=0, reason=0;
+       uint32_t context_id;
+       const struct dcesrv_interface *iface;
 
        if (call->pkt.u.bind.num_contexts != 1 ||
            call->pkt.u.bind.ctx_list[0].num_transfer_syntaxes < 1) {
                return dcesrv_bind_nak(call, 0);
        }
 
+       context_id = call->pkt.u.bind.ctx_list[0].context_id;
+
+       /* you can't bind twice on one context */
+       if (dcesrv_find_context(call->conn, context_id) != NULL) {
+               return dcesrv_bind_nak(call, 0);
+       }
+
        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 ||
@@ -453,14 +495,30 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
                return dcesrv_bind_nak(call, 0);
        }
 
-       call->conn->iface = find_interface_by_uuid(call->conn->endpoint, uuid, if_version);
-       if (!call->conn->iface) {
+       iface = find_interface_by_uuid(call->conn->endpoint, uuid, if_version);
+       if (iface == NULL) {
                DEBUG(2,("Request for unknown dcerpc interface %s/%d\n", uuid, if_version));
                /* we don't know about that interface */
                result = DCERPC_BIND_PROVIDER_REJECT;
                reason = DCERPC_BIND_REASON_ASYNTAX;            
        }
 
+       if (iface) {
+               /* add this context to the list of available context_ids */
+               struct dcesrv_connection_context *context = talloc(call->conn, 
+                                                                  struct dcesrv_connection_context);
+               if (context == NULL) {
+                       return dcesrv_bind_nak(call, 0);
+               }
+               context->conn = call->conn;
+               context->iface = iface;
+               context->context_id = context_id;
+               context->private = NULL;
+               context->handles = NULL;
+               DLIST_ADD(call->conn->contexts, context);
+               call->context = context;
+       }
+
        if (call->conn->cli_max_recv_frag == 0) {
                call->conn->cli_max_recv_frag = call->pkt.u.bind.max_recv_frag;
        }
@@ -480,14 +538,14 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        pkt.u.bind_ack.max_xmit_frag = 0x2000;
        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", 
-                                                                  call->conn->iface->ndr->name);
+       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);
        } 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(call, struct dcerpc_ack_ctx);
        if (!pkt.u.bind_ack.ctx_list) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -501,20 +559,21 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
                return dcesrv_bind_nak(call, 0);
        }
 
-       if (call->conn->iface) {
-               status = call->conn->iface->bind(call, call->conn->iface);
+       if (iface) {
+               status = iface->bind(call, iface);
                if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(2,("Request for dcerpc interface %s/%d rejected\n", uuid, if_version));
-                       return status;
+                       DEBUG(2,("Request for dcerpc interface %s/%d rejected: %s\n", 
+                                uuid, if_version, nt_errstr(status)));
+                       return dcesrv_bind_nak(call, 0);
                }
        }
 
-       rep = talloc_p(call->mem_ctx, struct dcesrv_call_reply);
+       rep = talloc(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;
@@ -539,7 +598,7 @@ static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
                return dcesrv_fault(call, DCERPC_FAULT_OTHER);
        }
 
-       talloc_destroy(call->mem_ctx);
+       talloc_free(call);
 
        /* we don't send a reply to a auth3 request, except by a
           fault */
@@ -548,70 +607,225 @@ static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
 
 
 /*
-  handle a dcerpc request packet
+  handle a bind request
 */
-static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
+static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_t context_id)
 {
-       struct ndr_pull *pull;
-       struct ndr_push *push;
-       uint16_t opnum;
-       void *r;
-       NTSTATUS status;
-       DATA_BLOB stub;
-       uint32_t total_length;
+       uint32_t if_version, transfer_syntax_version;
+       const char *uuid, *transfer_syntax;
+       struct dcesrv_connection_context *context;
+       const struct dcesrv_interface *iface;
 
+       if_version = call->pkt.u.alter.ctx_list[0].abstract_syntax.if_version;
+       uuid = GUID_string(call, &call->pkt.u.alter.ctx_list[0].abstract_syntax.uuid);
+       if (!uuid) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       if (!call->conn->iface) {
-               return dcesrv_fault(call, DCERPC_FAULT_UNK_IF);
+       transfer_syntax_version = call->pkt.u.alter.ctx_list[0].transfer_syntaxes[0].if_version;
+       transfer_syntax = GUID_string(call, 
+                                     &call->pkt.u.alter.ctx_list[0].transfer_syntaxes[0].uuid);
+       if (!transfer_syntax ||
+           strcasecmp(NDR_GUID, transfer_syntax) != 0 ||
+           NDR_GUID_VERSION != transfer_syntax_version) {
+               /* we only do NDR encoded dcerpc */
+               return NT_STATUS_NO_MEMORY;
        }
 
-       opnum = call->pkt.u.request.opnum;
+       iface = find_interface_by_uuid(call->conn->endpoint, uuid, if_version);
+       if (iface == NULL) {
+               DEBUG(2,("Request for unknown dcerpc interface %s/%d\n", uuid, if_version));
+               return NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED;
+       }
+
+       /* add this context to the list of available context_ids */
+       context = talloc(call->conn, struct dcesrv_connection_context);
+       if (context == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       context->conn = call->conn;
+       context->iface = iface;
+       context->context_id = context_id;
+       context->private = NULL;
+       context->handles = NULL;
+       DLIST_ADD(call->conn->contexts, context);
+       call->context = context;
+
+       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;
+       uint32_t context_id;
+
+       /* handle any authentication that is being requested */
+       if (!dcesrv_auth_alter(call)) {
+               /* TODO: work out the right reject code */
+               result = DCERPC_BIND_PROVIDER_REJECT;
+               reason = DCERPC_BIND_REASON_ASYNTAX;            
+       }
+
+       context_id = call->pkt.u.alter.ctx_list[0].context_id;
 
-       if (opnum >= call->conn->iface->ndr->num_calls) {
-               return dcesrv_fault(call, DCERPC_FAULT_OP_RNG_ERROR);
+       /* see if they are asking for a new interface */
+       if (result == 0 &&
+           dcesrv_find_context(call->conn, context_id) == NULL) {
+               status = dcesrv_alter_new_context(call, context_id);
+               if (!NT_STATUS_IS_OK(status)) {
+                       result = DCERPC_BIND_PROVIDER_REJECT;
+                       reason = DCERPC_BIND_REASON_ASYNTAX;            
+               }
        }
 
-       pull = ndr_pull_init_blob(&call->pkt.u.request.stub_and_verifier, call->mem_ctx);
-       if (!pull) {
+       /* setup a alter_resp */
+       dcesrv_init_hdr(&pkt);
+       pkt.auth_length = 0;
+       pkt.call_id = call->pkt.call_id;
+       pkt.ptype = DCERPC_PKT_ALTER_RESP;
+       pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
+       pkt.u.alter_resp.max_xmit_frag = 0x2000;
+       pkt.u.alter_resp.max_recv_frag = 0x2000;
+       pkt.u.alter_resp.assoc_group_id = call->pkt.u.alter.assoc_group_id;
+       pkt.u.alter_resp.num_results = 1;
+       pkt.u.alter_resp.ctx_list = talloc_array(call, struct dcerpc_ack_ctx, 1);
+       if (!pkt.u.alter_resp.ctx_list) {
                return NT_STATUS_NO_MEMORY;
        }
+       pkt.u.alter_resp.ctx_list[0].result = result;
+       pkt.u.alter_resp.ctx_list[0].reason = reason;
+       GUID_from_string(NDR_GUID, &pkt.u.alter_resp.ctx_list[0].syntax.uuid);
+       pkt.u.alter_resp.ctx_list[0].syntax.if_version = NDR_GUID_VERSION;
+       pkt.u.alter_resp.auth_info = data_blob(NULL, 0);
+       pkt.u.alter_resp.secondary_address = "";
 
-       r = talloc(call->mem_ctx, call->conn->iface->ndr->calls[opnum].struct_size);
-       if (!r) {
+       if (!dcesrv_auth_alter_ack(call, &pkt)) {
+               return dcesrv_bind_nak(call, 0);
+       }
+
+       rep = talloc(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
+*/
+static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
+{
+       struct ndr_pull *pull;
+       NTSTATUS status;
+       struct dcesrv_connection_context *context;
+
+       call->fault_code        = 0;
+       call->state_flags       = call->conn->dce_ctx->state_flags;
+       call->time              = timeval_current();
+
+       /* if authenticated, and the mech we use can't do async replies, don't use them... */
+       if (call->conn->auth_state.gensec_security && 
+           !gensec_have_feature(call->conn->auth_state.gensec_security, GENSEC_FEATURE_ASYNC_REPLIES)) {
+               call->state_flags &= ~DCESRV_CALL_STATE_FLAG_MAY_ASYNC;
+       }
+
+       context = dcesrv_find_context(call->conn, call->pkt.u.request.context_id);
+       if (context == NULL) {
+               return dcesrv_fault(call, DCERPC_FAULT_UNK_IF);
+       }
+
+       pull = ndr_pull_init_blob(&call->pkt.u.request.stub_and_verifier, call);
+       NT_STATUS_HAVE_NO_MEMORY(pull);
+
+       call->context   = context;
+       call->event_ctx = context->conn->srv_conn->event.ctx;
+       call->ndr_pull  = pull;
+
+       if (call->pkt.pfc_flags & DCERPC_PFC_FLAG_ORPC) {
+               pull->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
+       }
+
        if (!(call->pkt.drep[0] & DCERPC_DREP_LE)) {
                pull->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
 
        /* unravel the NDR for the packet */
-       status = call->conn->iface->ndr->calls[opnum].ndr_pull(pull, NDR_IN, r);
+       status = context->iface->ndr_pull(call, call, pull, &call->r);
        if (!NT_STATUS_IS_OK(status)) {
-               return dcesrv_fault(call, DCERPC_FAULT_NDR);
+               return dcesrv_fault(call, call->fault_code);
        }
 
-       call->fault_code = 0;
+       if (pull->offset != pull->data_size) {
+               DEBUG(3,("Warning: %d extra bytes in incoming RPC request\n", 
+                        pull->data_size - pull->offset));
+               dump_data(10, pull->data+pull->offset, pull->data_size - pull->offset);
+       }
 
        /* call the dispatch function */
-       status = call->conn->iface->dispatch(call, call->mem_ctx, r);
+       status = context->iface->dispatch(call, call, call->r);
        if (!NT_STATUS_IS_OK(status)) {
                return dcesrv_fault(call, call->fault_code);
        }
 
-       /* form the reply NDR */
-       push = ndr_push_init_ctx(call->mem_ctx);
-       if (!push) {
-               return NT_STATUS_NO_MEMORY;
+       /* add the call to the pending list */
+       DLIST_ADD_END(call->conn->pending_call_list, call, struct dcesrv_call_state *);
+
+       if (call->state_flags & DCESRV_CALL_STATE_FLAG_ASYNC) {
+               return NT_STATUS_OK;
+       }
+
+       return dcesrv_reply(call);
+}
+
+NTSTATUS dcesrv_reply(struct dcesrv_call_state *call)
+{
+       struct ndr_push *push;
+       NTSTATUS status;
+       DATA_BLOB stub;
+       uint32_t total_length;
+       struct dcesrv_connection_context *context = call->context;
+
+       /* call the reply function */
+       status = context->iface->reply(call, call, call->r);
+       if (!NT_STATUS_IS_OK(status)) {
+               return dcesrv_fault(call, call->fault_code);
        }
 
+       /* form the reply NDR */
+       push = ndr_push_init_ctx(call);
+       NT_STATUS_HAVE_NO_MEMORY(push);
+
+       /* carry over the pointer count to the reply in case we are
+          using full pointer. See NDR specification for full
+          pointers */
+       push->ptr_count = call->ndr_pull->ptr_count;
+
        if (lp_rpc_big_endian()) {
                push->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
 
-       status = call->conn->iface->ndr->calls[opnum].ndr_push(push, NDR_OUT, r);
+       status = context->iface->ndr_push(call, call, push, call->r);
        if (!NT_STATUS_IS_OK(status)) {
-               return dcesrv_fault(call, DCERPC_FAULT_NDR);
+               return dcesrv_fault(call, call->fault_code);
        }
 
        stub = ndr_push_blob(push);
@@ -623,10 +837,8 @@ 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);
-               if (!rep) {
-                       return NT_STATUS_NO_MEMORY;
-               }
+               rep = talloc(call, struct dcesrv_call_reply);
+               NT_STATUS_HAVE_NO_MEMORY(rep);
 
                length = stub.length;
                if (length + DCERPC_RESPONSE_LENGTH > call->conn->cli_max_recv_frag) {
@@ -665,8 +877,17 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
                stub.length -= length;
        } while (stub.length != 0);
 
+       /* move the call from the pending to the finished calls list */
+       DLIST_REMOVE(call->conn->pending_call_list, call);
        DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
 
+       if (call->conn->call_list && call->conn->call_list->replies) {
+               if (call->conn->srv_conn &&
+                   call->conn->srv_conn->event.fde) {
+                       EVENT_FD_WRITEABLE(call->conn->srv_conn->event.fde);
+               }
+       }
+
        return NT_STATUS_OK;
 }
 
@@ -709,32 +930,26 @@ 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(dce_conn, struct dcesrv_call_state);
        if (!call) {
-               talloc_free(dce_conn->mem_ctx, dce_conn->partial_input.data);
-               talloc_destroy(mem_ctx);
+               talloc_free(dce_conn->partial_input.data);
                return NT_STATUS_NO_MEMORY;
        }
-       call->mem_ctx = mem_ctx;
        call->conn = dce_conn;
        call->replies = NULL;
+       call->context = 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->mem_ctx, dce_conn->partial_input.data);
-               talloc_destroy(mem_ctx);
+               talloc_free(dce_conn->partial_input.data);
+               talloc_free(call);
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -744,22 +959,24 @@ 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->mem_ctx, dce_conn->partial_input.data);
-               talloc_destroy(mem_ctx);
+               talloc_free(dce_conn->partial_input.data);
+               talloc_free(call);
                return status;
        }
 
-       dce_partial_advance(dce_conn, blob.length);
-
        /* we have to check the signing here, before combining the
           pdus */
        if (call->pkt.ptype == DCERPC_PKT_REQUEST &&
-           !dcesrv_auth_request(call)) {
-               return dcesrv_fault(call, DCERPC_FAULT_OTHER);          
+           !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.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;
 
@@ -787,8 +1004,9 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
                }
 
                call->pkt.u.request.stub_and_verifier.data = 
-                       talloc_realloc(call->mem_ctx,
-                                      call->pkt.u.request.stub_and_verifier.data, alloc_size);
+                       talloc_realloc(call, 
+                                      call->pkt.u.request.stub_and_verifier.data, 
+                                      uint8_t, alloc_size);
                if (!call->pkt.u.request.stub_and_verifier.data) {
                        return dcesrv_fault(call2, DCERPC_FAULT_OTHER);
                }
@@ -800,11 +1018,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;
        }
@@ -816,6 +1037,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;
@@ -828,7 +1052,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_destroy(mem_ctx);
+               talloc_free(call);
        }
 
        return status;
@@ -843,34 +1067,10 @@ NTSTATUS dcesrv_input(struct dcesrv_connection *dce_conn, const DATA_BLOB *data)
 {
        NTSTATUS status;
 
-       /* handle the very common case that the input contains a full packet and there
-          is no partial packet pending. In this case we can avoid a copy of the
-          data */
-       if (dce_conn->partial_input.length == 0) {
-               dce_conn->partial_input = *data;
-               /* make sure that dce_partial_advance doesn't free this data */
-               dce_conn->partial_input.free = NULL;
-               while (dce_full_packet(&dce_conn->partial_input)) {
-                       status = dcesrv_input_process(dce_conn);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               return status;
-                       }
-               }
-               if (dce_conn->partial_input.length) {
-                       /* there was some data left over. We have to copy this
-                          as the caller may free the data */
-                       dce_conn->partial_input = 
-                               data_blob(dce_conn->partial_input.data,
-                                         dce_conn->partial_input.length);
-                       if (!dce_conn->partial_input.data) {
-                               return NT_STATUS_NO_MEMORY;
-                       }
-               }
-               return NT_STATUS_OK;
-       }
-
-       dce_conn->partial_input.data = Realloc(dce_conn->partial_input.data,
-                                         dce_conn->partial_input.length + data->length);
+       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;
        }
@@ -898,10 +1098,13 @@ NTSTATUS dcesrv_input(struct dcesrv_connection *dce_conn, const DATA_BLOB *data)
   will be the number of bytes to be sent.
 
   write_fn() should return the number of bytes successfully written.
+
+  this will return STATUS_BUFFER_OVERFLOW if there is more to be read
+  from the current fragment
 */
 NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn, 
                       void *private,
-                      ssize_t (*write_fn)(void *, const void *, size_t))
+                      ssize_t (*write_fn)(void *, DATA_BLOB *))
 {
        struct dcesrv_call_state *call;
        struct dcesrv_call_reply *rep;
@@ -909,11 +1112,18 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
 
        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;
 
-       nwritten = write_fn(private, rep->data.data, rep->data.length);
+       nwritten = write_fn(private, &rep->data);
        if (nwritten == -1) {
                /* TODO: hmm, how do we cope with this? destroy the
                   connection perhaps? */
@@ -926,12 +1136,14 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
        if (rep->data.length == 0) {
                /* we're done with this section of the call */
                DLIST_REMOVE(call->replies, rep);
+       } else {
+               return STATUS_BUFFER_OVERFLOW;
        }
 
        if (call->replies == NULL) {
                /* we're done with the whole call */
                DLIST_REMOVE(dce_conn->call_list, call);
-               talloc_destroy(call->mem_ctx);
+               talloc_free(call);
        }
 
        return NT_STATUS_OK;
@@ -941,13 +1153,13 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
 /*
   write_fn() for dcesrv_output_blob()
 */
-static ssize_t dcesrv_output_blob_write_fn(void *private, const void *buf, size_t count)
+static ssize_t dcesrv_output_blob_write_fn(void *private, DATA_BLOB *out)
 {
        DATA_BLOB *blob = private;
-       if (count < blob->length) {
-               blob->length = count;
+       if (out->length < blob->length) {
+               blob->length = out->length;
        }
-       memcpy(blob->data, buf, blob->length);
+       memcpy(blob->data, out->data, blob->length);
        return blob->length;
 }
 
@@ -961,50 +1173,61 @@ NTSTATUS dcesrv_output_blob(struct dcesrv_connection *dce_conn,
        return dcesrv_output(dce_conn, blob, dcesrv_output_blob_write_fn);
 }
 
-/*
-  initialise the dcerpc server context
-*/
-NTSTATUS dcesrv_init_context(struct dcesrv_context *dce_ctx)
+static NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx, const char **endpoint_servers, uint32_t state_flags, struct dcesrv_context **_dce_ctx)
 {
+       NTSTATUS status;
+       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"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       dce_ctx->endpoint_list = NULL;
 
        if (!endpoint_servers) {
-               DEBUG(3,("dcesrv_init_context: no endpoint servers configured\n"));
-               return NT_STATUS_OK;
+               DEBUG(0,("dcesrv_init_context: no endpoint servers configured\n"));
+               return NT_STATUS_INTERNAL_ERROR;
        }
 
+       dce_ctx = talloc(mem_ctx, struct dcesrv_context);
+       NT_STATUS_HAVE_NO_MEMORY(dce_ctx);
+       dce_ctx->endpoint_list  = NULL;
+       dce_ctx->state_flags    = state_flags;
+
        for (i=0;endpoint_servers[i];i++) {
-               NTSTATUS ret;
                const struct dcesrv_endpoint_server *ep_server;
-               
+
                ep_server = dcesrv_ep_server_byname(endpoint_servers[i]);
                if (!ep_server) {
                        DEBUG(0,("dcesrv_init_context: failed to find endpoint server = '%s'\n", endpoint_servers[i]));
-                       return NT_STATUS_UNSUCCESSFUL;
+                       return NT_STATUS_INTERNAL_ERROR;
                }
 
-               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;
+               status = ep_server->init_server(dce_ctx, ep_server);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("dcesrv_init_context: failed to init endpoint server = '%s': %s\n", endpoint_servers[i],
+                               nt_errstr(status)));
+                       return status;
                }
        }
 
+       *_dce_ctx = dce_ctx;
+       return NT_STATUS_OK;
+}
+
+/*
+  initialise the dcerpc server context for ncacn_np based services
+*/
+NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct dcesrv_context **_dce_ctx)
+{
+       NTSTATUS status;
+       struct dcesrv_context *dce_ctx;
+
+       status = dcesrv_init_context(mem_ctx, lp_dcerpc_endpoint_servers(), 0, &dce_ctx);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       *_dce_ctx = dce_ctx;
        return NT_STATUS_OK;
 }
 
 /* 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;
@@ -1017,7 +1240,7 @@ static int num_ep_servers;
 
   The 'type' is used to specify whether this is for a disk, printer or IPC$ share
 */
-static NTSTATUS decrpc_register_ep_server(void *_ep_server)
+NTSTATUS dcerpc_register_ep_server(const void *_ep_server)
 {
        const struct dcesrv_endpoint_server *ep_server = _ep_server;
        
@@ -1028,9 +1251,9 @@ static NTSTATUS decrpc_register_ep_server(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 decrpc_register");
+               smb_panic("out of memory in dcerpc_register");
        }
 
        ep_servers[num_ep_servers].ep_server = smb_xmemdup(ep_server, sizeof(*ep_server));
@@ -1072,7 +1295,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),
@@ -1085,20 +1307,24 @@ const struct dcesrv_critical_sizes *dcerpc_module_version(void)
 }
 
 /*
-  initialise the DCERPC subsystem
+  initialise the dcerpc server context for socket based services
 */
-BOOL dcesrv_init(void)
+static NTSTATUS dcesrv_init(struct event_context *event_context, const struct model_ops *model_ops)
 {
        NTSTATUS status;
+       struct dcesrv_context *dce_ctx;
 
-       status = register_subsystem("dcerpc", decrpc_register_ep_server); 
-       if (!NT_STATUS_IS_OK(status)) {
-               return False;
-       }
+       status = dcesrv_init_context(event_context,
+                                    lp_dcerpc_endpoint_servers(),
+                                    DCESRV_CALL_STATE_FLAG_MAY_ASYNC,
+                                    &dce_ctx);
+       NT_STATUS_NOT_OK_RETURN(status);
 
-       /* FIXME: Perhaps panic if a basic endpoint server, such as EPMAPER, fails to initialise? */
-       static_init_dcerpc;
+       return dcesrv_sock_init(dce_ctx, event_context, model_ops);
+}
 
-       DEBUG(3,("DCERPC subsystem version %d initialised\n", DCERPC_MODULE_VERSION));
-       return True;
+
+NTSTATUS server_service_rpc_init(void)
+{
+       return register_server_service("rpc", dcesrv_init);
 }