r11289: Fix comment.
[bbaumbach/samba-autobuild/.git] / source4 / rpc_server / dcerpc_server.c
index 11e385153e89a9f1967ca1e6c15c35243a7ed845..17a097a4cc63a0203fae48ce7f22542402185c52 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_dcerpc.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"
+#include "system/filesys.h"
 
 /*
   see if two endpoints match
@@ -56,24 +60,37 @@ static struct dcesrv_endpoint *find_endpoint(struct dcesrv_context *dce_ctx,
 {
        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;
        }                       
 
@@ -84,7 +101,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) {
@@ -101,11 +118,11 @@ static const struct dcesrv_interface *find_interface(const struct dcesrv_endpoin
 static BOOL interface_match_by_uuid(const struct dcesrv_interface *iface,
                                    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;
        }                       
 
@@ -151,7 +168,7 @@ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
 {
        struct dcesrv_endpoint *ep;
        struct dcesrv_if_list *ifl;
-       struct dcerpc_binding binding;
+       struct dcerpc_binding *binding;
        BOOL add_ep = False;
        NTSTATUS status;
        
@@ -164,25 +181,25 @@ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
 
        /* check if this endpoint exists
         */
-       if ((ep=find_endpoint(dce_ctx, &binding))==NULL) {
-               ep = talloc_p(dce_ctx, struct dcesrv_endpoint);
+       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);
-               ep->ep_description = binding;
+               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_p(dce_ctx, struct dcesrv_if_list);
+       ifl = talloc(dce_ctx, struct dcesrv_if_list);
        if (!ifl) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -198,7 +215,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, sd);
+                       ep->sd = security_descriptor_copy(dce_ctx, sd);
                }
 
                /* if now there's no security descriptor given on the endpoint
@@ -208,7 +225,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;
@@ -224,7 +241,7 @@ 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;
 }
@@ -243,7 +260,7 @@ 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(char, "SystemLibraryDTC");
+       session_key->data = discard_const_p(uint8_t, "SystemLibraryDTC");
        session_key->length = 16;
        return NT_STATUS_OK;
 }
@@ -264,17 +281,15 @@ NTSTATUS dcesrv_fetch_session_key(struct dcesrv_connection *p,
 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);
-       }
+       while (p->contexts) {
+               struct dcesrv_connection_context *c = p->contexts;
 
-       if (p->auth_state.gensec_security) {
-               gensec_end(&p->auth_state.gensec_security);
+               DLIST_REMOVE(p->contexts, c);
+
+               if (c->iface) {
+                       c->iface->unbind(c, c->iface);
+               }
        }
 
        return 0;
@@ -285,30 +300,33 @@ static int dcesrv_endpoint_destructor(void *ptr)
   connect to a dcerpc endpoint
 */
 NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
+                                TALLOC_CTX *mem_ctx,
                                 const struct dcesrv_endpoint *ep,
-                                struct dcesrv_connection **p)
+                                struct stream_connection *srv_conn,
+                                struct dcesrv_connection **_p)
 {
-       *p = talloc_p(dce_ctx, struct dcesrv_connection);
-       if (! *p) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       (*p)->dce_ctx = dce_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.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 = NULL;
-
-       talloc_set_destructor(*p, dcesrv_endpoint_destructor);
-
+       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;
+       p->processing = False;
+
+       talloc_set_destructor(p, dcesrv_endpoint_destructor);
+
+       *_p = p;
        return NT_STATUS_OK;
 }
 
@@ -316,8 +334,10 @@ 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,
+                                       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;
@@ -329,13 +349,12 @@ 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;
        }
 
-       session_info->refcount++;
-       (*dce_conn_p)->auth_state.session_info = session_info;
+       (*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 
@@ -347,7 +366,7 @@ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx,
 }
 
 
-static void dcesrv_init_hdr(struct dcerpc_packet *pkt)
+static void dcesrv_init_hdr(struct ncacn_packet *pkt)
 {
        pkt->rpc_vers = 5;
        pkt->rpc_vers_minor = 0;
@@ -366,8 +385,8 @@ static void dcesrv_init_hdr(struct dcerpc_packet *pkt)
 */
 static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t fault_code)
 {
-       struct dcerpc_packet pkt;
-       struct dcesrv_call_reply *rep;
+       struct ncacn_packet pkt;
+       struct data_blob_list_item *rep;
        NTSTATUS status;
 
        /* setup a bind_ack */
@@ -381,19 +400,19 @@ 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, struct dcesrv_call_reply);
+       rep = talloc(call, struct data_blob_list_item);
        if (!rep) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = dcerpc_push_auth(&rep->data, call, &pkt, NULL);
+       status = ncacn_push_auth(&rep->blob, call, &pkt, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       dcerpc_set_frag_length(&rep->data, rep->data.length);
+       dcerpc_set_frag_length(&rep->blob, rep->blob.length);
 
-       DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
+       DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
        DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
 
        return NT_STATUS_OK;    
@@ -405,8 +424,8 @@ static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t fault_code
 */
 static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32_t reason)
 {
-       struct dcerpc_packet pkt;
-       struct dcesrv_call_reply *rep;
+       struct ncacn_packet pkt;
+       struct data_blob_list_item *rep;
        NTSTATUS status;
 
        /* setup a bind_nak */
@@ -418,19 +437,19 @@ 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, struct dcesrv_call_reply);
+       rep = talloc(call, struct data_blob_list_item);
        if (!rep) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = dcerpc_push_auth(&rep->data, call, &pkt, NULL);
+       status = ncacn_push_auth(&rep->blob, call, &pkt, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       dcerpc_set_frag_length(&rep->data, rep->data.length);
+       dcerpc_set_frag_length(&rep->blob, rep->blob.length);
 
-       DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
+       DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
        DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
 
        return NT_STATUS_OK;    
@@ -444,16 +463,25 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
 {
        const char *uuid, *transfer_syntax;
        uint32_t if_version, transfer_syntax_version;
-       struct dcerpc_packet pkt;
-       struct dcesrv_call_reply *rep;
+       struct ncacn_packet pkt;
+       struct data_blob_list_item *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 ||
+       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, &call->pkt.u.bind.ctx_list[0].abstract_syntax.uuid);
        if (!uuid) {
@@ -467,17 +495,34 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
            strcasecmp(NDR_GUID, transfer_syntax) != 0 ||
            NDR_GUID_VERSION != transfer_syntax_version) {
                /* we only do NDR encoded dcerpc */
+               DEBUG(0,("Non NDR transfer syntax requested - %s\n", transfer_syntax));
                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;
        }
@@ -497,15 +542,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) {
+       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", 
-                                                                  call->conn->iface->ndr->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, 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;
        }
@@ -519,28 +563,29 @@ 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: %s\n", uuid, if_version, nt_errstr(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, struct dcesrv_call_reply);
+       rep = talloc(call, struct data_blob_list_item);
        if (!rep) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = dcerpc_push_auth(&rep->data, call, &pkt, 
+       status = ncacn_push_auth(&rep->blob, 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);
+       dcerpc_set_frag_length(&rep->blob, rep->blob.length);
 
-       DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
+       DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
        DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
 
        return NT_STATUS_OK;
@@ -565,54 +610,174 @@ static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
 }
 
 
+/*
+  handle a bind request
+*/
+static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_t context_id)
+{
+       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;
+       }
+
+       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;
+       }
+
+       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 ncacn_packet pkt;
+       struct data_blob_list_item *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;
+
+       /* 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;            
+               }
+       }
+
+       /* 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 = "";
+
+       if (!dcesrv_auth_alter_ack(call, &pkt)) {
+               return dcesrv_bind_nak(call, 0);
+       }
+
+       rep = talloc(call, struct data_blob_list_item);
+       if (!rep) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = ncacn_push_auth(&rep->blob, call, &pkt, 
+                                 call->conn->auth_state.auth_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       dcerpc_set_frag_length(&rep->blob, rep->blob.length);
+
+       DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
+       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;
-       struct ndr_push *push;
-       uint16_t opnum;
-       void *r;
        NTSTATUS status;
-       DATA_BLOB stub;
-       uint32_t total_length;
+       struct dcesrv_connection_context *context;
 
+       call->fault_code        = 0;
+       call->state_flags       = call->conn->dce_ctx->state_flags;
+       call->time              = timeval_current();
 
-       if (!call->conn->iface) {
-               return dcesrv_fault(call, DCERPC_FAULT_UNK_IF);
+       /* 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;
        }
 
-       opnum = call->pkt.u.request.opnum;
-
-       if (opnum >= call->conn->iface->ndr->num_calls) {
-               return dcesrv_fault(call, DCERPC_FAULT_OP_RNG_ERROR);
+       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);
-       if (!pull) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       NT_STATUS_HAVE_NO_MEMORY(pull);
+
+       pull->flags |= LIBNDR_FLAG_REF_ALLOC;
+
+       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;
        }
 
-       r = talloc(call, call->conn->iface->ndr->calls[opnum].struct_size);
-       if (!r) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
        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)) {
-               dcerpc_log_packet(call->conn->iface->ndr, opnum, NDR_IN, 
-                                 &call->pkt.u.request.stub_and_verifier);
-               return dcesrv_fault(call, DCERPC_FAULT_NDR);
+               return dcesrv_fault(call, call->fault_code);
        }
 
        if (pull->offset != pull->data_size) {
@@ -621,34 +786,56 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
                dump_data(10, pull->data+pull->offset, pull->data_size - pull->offset);
        }
 
-       call->fault_code = 0;
-
        /* call the dispatch function */
-       status = call->conn->iface->dispatch(call, call, r);
+       status = context->iface->dispatch(call, call, call->r);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(5,("dcerpc fault in call %s:%02x - %s\n",
+                        context->iface->name, 
+                        call->pkt.u.request.opnum,
+                        dcerpc_errstr(pull, call->fault_code)));
+               return dcesrv_fault(call, call->fault_code);
+       }
+
+       /* 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)) {
-               dcerpc_log_packet(call->conn->iface->ndr, opnum, NDR_IN, 
-                                 &call->pkt.u.request.stub_and_verifier);
                return dcesrv_fault(call, call->fault_code);
        }
 
        /* form the reply NDR */
        push = ndr_push_init_ctx(call);
-       if (!push) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       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 = pull->ptr_count;
+       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);
@@ -657,13 +844,11 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
 
        do {
                uint32_t length;
-               struct dcesrv_call_reply *rep;
-               struct dcerpc_packet pkt;
+               struct data_blob_list_item *rep;
+               struct ncacn_packet pkt;
 
-               rep = talloc_p(call, struct dcesrv_call_reply);
-               if (!rep) {
-                       return NT_STATUS_NO_MEMORY;
-               }
+               rep = talloc(call, struct data_blob_list_item);
+               NT_STATUS_HAVE_NO_MEMORY(rep);
 
                length = stub.length;
                if (length + DCERPC_RESPONSE_LENGTH > call->conn->cli_max_recv_frag) {
@@ -690,20 +875,29 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
                pkt.u.response.stub_and_verifier.data = stub.data;
                pkt.u.response.stub_and_verifier.length = length;
 
-               if (!dcesrv_auth_response(call, &rep->data, &pkt)) {
+               if (!dcesrv_auth_response(call, &rep->blob, &pkt)) {
                        return dcesrv_fault(call, DCERPC_FAULT_OTHER);          
                }
 
-               dcerpc_set_frag_length(&rep->data, rep->data.length);
+               dcerpc_set_frag_length(&rep->blob, rep->blob.length);
 
-               DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
+               DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
                
                stub.data += length;
                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;
 }
 
@@ -750,13 +944,15 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
        struct dcesrv_call_state *call;
        DATA_BLOB blob;
 
-       call = talloc_p(dce_conn, struct dcesrv_call_state);
+       call = talloc(dce_conn, struct dcesrv_call_state);
        if (!call) {
                talloc_free(dce_conn->partial_input.data);
                return NT_STATUS_NO_MEMORY;
        }
-       call->conn = dce_conn;
-       call->replies = NULL;
+       call->conn      = dce_conn;
+       call->replies   = NULL;
+       call->context   = NULL;
+       call->event_ctx = dce_conn->srv_conn->event.ctx;
 
        blob = dce_conn->partial_input;
        blob.length = dcerpc_get_frag_length(&blob);
@@ -772,7 +968,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
                ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
 
-       status = ndr_pull_dcerpc_packet(ndr, NDR_SCALARS|NDR_BUFFERS, &call->pkt);
+       status = ndr_pull_ncacn_packet(ndr, NDR_SCALARS|NDR_BUFFERS, &call->pkt);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(dce_conn->partial_input.data);
                talloc_free(call);
@@ -784,13 +980,14 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
        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_LOGON_FAILURE);          
+               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;
 
@@ -818,7 +1015,9 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
                }
 
                call->pkt.u.request.stub_and_verifier.data = 
-                       talloc_realloc(call, 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);
                }
@@ -836,7 +1035,8 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
 
        /* 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;
        }
@@ -848,6 +1048,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;
@@ -877,6 +1080,7 @@ NTSTATUS dcesrv_input(struct dcesrv_connection *dce_conn, const DATA_BLOB *data)
 
        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;
@@ -902,38 +1106,40 @@ NTSTATUS dcesrv_input(struct dcesrv_connection *dce_conn, const DATA_BLOB *data)
 
   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 the number of bytes to be sent.
-
-  write_fn() should return the number of bytes successfully written.
+  will be a pointer to a size_t variable that will be set to the
+  number of bytes that are consumed from the output.
 
-  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 *, DATA_BLOB *))
+                      void *private_data,
+                      NTSTATUS (*write_fn)(void *private_data, DATA_BLOB *output, size_t *nwritten))
 {
+       NTSTATUS status;
        struct dcesrv_call_state *call;
-       struct dcesrv_call_reply *rep;
-       ssize_t nwritten;
+       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;
 
-       nwritten = write_fn(private, &rep->data);
-       if (nwritten == -1) {
-               /* TODO: hmm, how do we cope with this? destroy the
-                  connection perhaps? */
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       status = write_fn(private_data, &rep->blob, &nwritten);
+       NT_STATUS_IS_ERR_RETURN(status);
 
-       rep->data.length -= nwritten;
-       rep->data.data += nwritten;
+       rep->blob.length -= nwritten;
+       rep->blob.data += nwritten;
 
-       if (rep->data.length == 0) {
+       if (rep->blob.length == 0) {
                /* we're done with this section of the call */
                DLIST_REMOVE(call->replies, rep);
        }
@@ -944,149 +1150,64 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
                talloc_free(call);
        }
 
-       return NT_STATUS_OK;
-}
-
-
-/*
-  write_fn() for dcesrv_output_blob()
-*/
-static ssize_t dcesrv_output_blob_write_fn(void *private, DATA_BLOB *out)
-{
-       DATA_BLOB *blob = private;
-       if (out->length < blob->length) {
-               blob->length = out->length;
-       }
-       memcpy(blob->data, out->data, blob->length);
-       return blob->length;
-}
-
-/*
-  a simple wrapper for dcesrv_output() for when we want to output
-  into a data blob
-*/
-NTSTATUS dcesrv_output_blob(struct dcesrv_connection *dce_conn, 
-                           DATA_BLOB *blob)
-{
-       return dcesrv_output(dce_conn, blob, dcesrv_output_blob_write_fn);
-}
-
-/*
-  initialise the dcerpc server context
-*/
-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) = talloc_p(mem_ctx, struct dcesrv_context);
-       if (! *dce_ctx) {
-               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;
-       }
-
-       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;
-               }
-
-               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;
-               }
-       }
-
-       return NT_STATUS_OK;
+       return status;
 }
 
-static void dcesrv_init(struct server_service *service, const struct model_ops *model_ops)
+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();
-
-       DEBUG(1,("dcesrv_init\n"));
 
        if (!endpoint_servers) {
                DEBUG(0,("dcesrv_init_context: no endpoint servers configured\n"));
-               return;
-       }
-
-       dce_ctx = talloc_p(service, struct dcesrv_context);
-       if (!dce_ctx) {
-               DEBUG(0,("talloc_p(mem_ctx, struct dcesrv_context) failed\n"));
-               return;
+               return NT_STATUS_INTERNAL_ERROR;
        }
 
-       ZERO_STRUCTP(dce_ctx);
+       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;
+                       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;
+               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;
                }
        }
 
-       dcesrv_sock_init(service, model_ops, dce_ctx);
-
-       return; 
-}
-
-static void dcesrv_accept(struct server_connection *srv_conn)
-{
-       dcesrv_sock_accept(srv_conn);
-}
-
-static void dcesrv_recv(struct server_connection *srv_conn, 
-                       struct timeval t, uint16_t flags)
-{
-       dcesrv_sock_recv(srv_conn, t, flags);
+       *_dce_ctx = dce_ctx;
+       return NT_STATUS_OK;
 }
 
-static void dcesrv_send(struct server_connection *srv_conn, 
-                       struct timeval t, uint16_t flags)
+/*
+  initialise the dcerpc server context for ncacn_np based services
+*/
+NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct dcesrv_context **_dce_ctx)
 {
-       dcesrv_sock_send(srv_conn, t, flags);
-}
+       NTSTATUS status;
+       struct dcesrv_context *dce_ctx;
 
-static void dcesrv_close(struct server_connection *srv_conn, const char *reason)
-{
-       dcesrv_sock_close(srv_conn, reason);
-       return; 
-}
+       status = dcesrv_init_context(mem_ctx, lp_dcerpc_endpoint_servers(), 0, &dce_ctx);
+       NT_STATUS_NOT_OK_RETURN(status);
 
-static void dcesrv_exit(struct server_service *service, const char *reason)
-{
-       dcesrv_sock_exit(service, reason);
-       return; 
+       *_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;
@@ -1110,7 +1231,7 @@ 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");
        }
@@ -1165,23 +1286,57 @@ const struct dcesrv_critical_sizes *dcerpc_module_version(void)
        return &critical_sizes;
 }
 
-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           = NULL,
-       .close_connection       = dcesrv_close,
-       .service_exit           = dcesrv_exit,  
-};
-
-const struct server_service_ops *dcesrv_get_ops(void)
+/*
+  initialise the dcerpc server context 
+*/
+static NTSTATUS dcesrv_init(struct event_context *event_context, const struct model_ops *model_ops)
 {
-       return &dcesrv_ops;
+       NTSTATUS status;
+       struct dcesrv_context *dce_ctx;
+       struct dcesrv_endpoint *e;
+
+       status = dcesrv_init_context(event_context,
+                                    lp_dcerpc_endpoint_servers(),
+                                    DCESRV_CALL_STATE_FLAG_MAY_ASYNC,
+                                    &dce_ctx);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       /* Make sure the directory for NCALRPC exists */
+       if (!directory_exist(lp_ncalrpc_dir())) {
+               mkdir(lp_ncalrpc_dir(), 0755);
+       }
+
+       for (e=dce_ctx->endpoint_list;e;e=e->next) {
+               switch (e->ep_description->transport) {
+               case NCACN_UNIX_STREAM:
+                       status = dcesrv_add_ep_unix(dce_ctx, e, event_context, model_ops);
+                       NT_STATUS_NOT_OK_RETURN(status);
+                       break;
+               
+               case NCALRPC:
+                       status = dcesrv_add_ep_ncalrpc(dce_ctx, e, event_context, model_ops);
+                       NT_STATUS_NOT_OK_RETURN(status);
+                       break;
+
+               case NCACN_IP_TCP:
+                       status = dcesrv_add_ep_tcp(dce_ctx, e, event_context, model_ops);
+                       NT_STATUS_NOT_OK_RETURN(status);
+                       break;
+                       
+               case NCACN_NP:
+/*                     FIXME: status = dcesrv_add_ep_np(dce_ctx, e, event_context, model_ops);
+                       NT_STATUS_NOT_OK_RETURN(status); */
+                       break;
+
+               default:
+                       return NT_STATUS_NOT_SUPPORTED;
+               }
+       }
+
+       return NT_STATUS_OK;    
 }
 
 NTSTATUS server_service_rpc_init(void)
 {
-       return NT_STATUS_OK;    
+       return register_server_service("rpc", dcesrv_init);
 }