r12608: Remove some unused #include lines.
[abartlet/samba.git/.git] / source4 / rpc_server / dcerpc_server.c
index cb1cdc9416d9ef6ea748ab70ad9f8d854d32bd99..bd8c40e6fdeab9f4e01a7e249d78191c45d5aa57 100644 (file)
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
-#include "librpc/gen_ndr/ndr_oxidresolver.h"
+#include "librpc/gen_ndr/ndr_dcerpc.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"
+#include "smb_build.h"
 
 /*
   see if two endpoints match
@@ -84,15 +85,8 @@ static struct dcesrv_connection_context *dcesrv_find_context(struct dcesrv_conne
 static BOOL interface_match(const struct dcesrv_interface *if1,
                                                        const struct dcesrv_interface *if2)
 {
-       if (if1->if_version != if2->if_version) {
-               return False;
-       }
-
-       if (strcmp(if1->uuid, if2->uuid)==0) {
-               return True;
-       }                       
-
-       return False;
+       return (if1->if_version == if2->if_version && 
+                       GUID_equal(&if1->uuid, &if2->uuid));
 }
 
 /*
@@ -114,24 +108,16 @@ 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 struct GUID *uuid, uint32_t if_version)
 {
-       if (iface->if_version != if_version) {
-               return False;
-       }
-
-       if (strcmp(iface->uuid, uuid)==0) {
-               return True;
-       }                       
-
-       return False;
+       return (iface->if_version == if_version && GUID_equal(&iface->uuid, uuid));
 }
 
 /*
   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 struct GUID *uuid, uint32_t if_version)
 {
        struct dcesrv_if_list *ifl;
        for (ifl=endpoint->interface_list; ifl; ifl=ifl->next) {
@@ -320,6 +306,7 @@ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
        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);
 
@@ -363,7 +350,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;
@@ -382,8 +369,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 */
@@ -397,19 +384,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(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;    
@@ -421,8 +408,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 */
@@ -434,19 +421,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(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;    
@@ -458,16 +445,16 @@ static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32_t reason)
 */
 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 GUID uuid, *transfer_syntax_uuid;
+       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);
        }
@@ -480,24 +467,25 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        }
 
        if_version = call->pkt.u.bind.ctx_list[0].abstract_syntax.if_version;
-       uuid = GUID_string(call, &call->pkt.u.bind.ctx_list[0].abstract_syntax.uuid);
-       if (!uuid) {
-               return dcesrv_bind_nak(call, 0);
-       }
+       uuid = call->pkt.u.bind.ctx_list[0].abstract_syntax.uuid;
 
        transfer_syntax_version = call->pkt.u.bind.ctx_list[0].transfer_syntaxes[0].if_version;
-       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 ||
-           NDR_GUID_VERSION != transfer_syntax_version) {
+       transfer_syntax_uuid = &call->pkt.u.bind.ctx_list[0].transfer_syntaxes[0].uuid;
+       if (!GUID_equal(&ndr_transfer_syntax.uuid, transfer_syntax_uuid) != 0 ||
+           ndr_transfer_syntax.if_version != transfer_syntax_version) {
+               char *uuid_str = GUID_string(call, transfer_syntax_uuid);
                /* we only do NDR encoded dcerpc */
+               DEBUG(0,("Non NDR transfer syntax requested - %s\n", uuid_str));
+               talloc_free(uuid_str);
                return dcesrv_bind_nak(call, 0);
        }
 
-       iface = find_interface_by_uuid(call->conn->endpoint, uuid, if_version);
+       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));
+               char *uuid_str = GUID_string(call, &uuid);
+               DEBUG(2,("Request for unknown dcerpc interface %s/%d\n", uuid_str, if_version));
+               talloc_free(uuid_str);
+
                /* we don't know about that interface */
                result = DCERPC_BIND_PROVIDER_REJECT;
                reason = DCERPC_BIND_REASON_ASYNTAX;            
@@ -551,8 +539,7 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        }
        pkt.u.bind_ack.ctx_list[0].result = result;
        pkt.u.bind_ack.ctx_list[0].reason = reason;
-       GUID_from_string(NDR_GUID, &pkt.u.bind_ack.ctx_list[0].syntax.uuid);
-       pkt.u.bind_ack.ctx_list[0].syntax.if_version = NDR_GUID_VERSION;
+       pkt.u.bind_ack.ctx_list[0].syntax = ndr_transfer_syntax;
        pkt.u.bind_ack.auth_info = data_blob(NULL, 0);
 
        if (!dcesrv_auth_bind_ack(call, &pkt)) {
@@ -562,26 +549,28 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        if (iface) {
                status = iface->bind(call, iface);
                if (!NT_STATUS_IS_OK(status)) {
+                       char *uuid_str = GUID_string(call, &uuid);
                        DEBUG(2,("Request for dcerpc interface %s/%d rejected: %s\n", 
-                                uuid, if_version, nt_errstr(status)));
+                                uuid_str, if_version, nt_errstr(status)));
+                       talloc_free(uuid_str);
                        return dcesrv_bind_nak(call, 0);
                }
        }
 
-       rep = talloc(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;
@@ -612,29 +601,26 @@ static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
 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;
+       struct GUID uuid, *transfer_syntax_uuid;
 
        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;
-       }
+       uuid = call->pkt.u.alter.ctx_list[0].abstract_syntax.uuid;
 
        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) {
+       transfer_syntax_uuid = &call->pkt.u.alter.ctx_list[0].transfer_syntaxes[0].uuid;
+       if (!GUID_equal(transfer_syntax_uuid, &ndr_transfer_syntax.uuid) ||
+           ndr_transfer_syntax.if_version != transfer_syntax_version) {
                /* we only do NDR encoded dcerpc */
-               return NT_STATUS_NO_MEMORY;
+               return NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED;
        }
 
-       iface = find_interface_by_uuid(call->conn->endpoint, uuid, if_version);
+       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));
+               char *uuid_str = GUID_string(call, &uuid);
+               DEBUG(2,("Request for unknown dcerpc interface %s/%d\n", uuid_str, if_version));
+               talloc_free(uuid_str);
                return NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED;
        }
 
@@ -656,12 +642,12 @@ static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_
 
 
 /*
-  handle a bind request
+  handle a alter context request
 */
 static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
 {
-       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;
@@ -701,8 +687,7 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
        }
        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.ctx_list[0].syntax = ndr_transfer_syntax;
        pkt.u.alter_resp.auth_info = data_blob(NULL, 0);
        pkt.u.alter_resp.secondary_address = "";
 
@@ -710,20 +695,20 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
                return dcesrv_bind_nak(call, 0);
        }
 
-       rep = talloc(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;
@@ -742,6 +727,12 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
        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);
@@ -750,6 +741,8 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
        pull = ndr_pull_init_blob(&call->pkt.u.request.stub_and_verifier, call);
        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;
@@ -777,6 +770,10 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
        /* call the dispatch function */
        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);
        }
 
@@ -828,10 +825,10 @@ NTSTATUS dcesrv_reply(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(call, struct dcesrv_call_reply);
+               rep = talloc(call, struct data_blob_list_item);
                NT_STATUS_HAVE_NO_MEMORY(rep);
 
                length = stub.length;
@@ -859,13 +856,13 @@ NTSTATUS dcesrv_reply(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;
@@ -933,9 +930,10 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
                talloc_free(dce_conn->partial_input.data);
                return NT_STATUS_NO_MEMORY;
        }
-       call->conn = dce_conn;
-       call->replies = NULL;
-       call->context = 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);
@@ -951,7 +949,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);
@@ -1089,20 +1087,19 @@ 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) {
@@ -1117,21 +1114,15 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
        }
        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);
-       } else {
-               return STATUS_BUFFER_OVERFLOW;
        }
 
        if (call->replies == NULL) {
@@ -1140,31 +1131,7 @@ 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);
+       return status;
 }
 
 static NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx, const char **endpoint_servers, uint32_t state_flags, struct dcesrv_context **_dce_ctx)
@@ -1301,12 +1268,13 @@ const struct dcesrv_critical_sizes *dcerpc_module_version(void)
 }
 
 /*
-  initialise the dcerpc server context for socket based services
+  initialise the dcerpc server context 
 */
 static NTSTATUS dcesrv_init(struct event_context *event_context, const struct model_ops *model_ops)
 {
        NTSTATUS status;
        struct dcesrv_context *dce_ctx;
+       struct dcesrv_endpoint *e;
 
        status = dcesrv_init_context(event_context,
                                     lp_dcerpc_endpoint_servers(),
@@ -1314,11 +1282,50 @@ static NTSTATUS dcesrv_init(struct event_context *event_context, const struct mo
                                     &dce_ctx);
        NT_STATUS_NOT_OK_RETURN(status);
 
-       return dcesrv_sock_init(dce_ctx, event_context, model_ops);
-}
+       /* 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)
 {
+       init_module_fn static_init[] = STATIC_DCERPC_MODULES;
+       init_module_fn *shared_init = load_samba_modules(NULL, "rpc_server");
+
+       run_init_functions(static_init);
+       run_init_functions(shared_init);
+
+       talloc_free(shared_init);
+       
        return register_server_service("rpc", dcesrv_init);
 }