CVE-2016-2118: s4:rpc_server: make it possible to define a min_auth_level on a presen...
[samba.git] / source4 / rpc_server / dcerpc_server.c
index d27a8b90de7069daf1ab5dcf87d1a227b8b64837..264b101e8400bcbbe427b43206433fe673fdea3d 100644 (file)
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "auth/auth.h"
 #include "auth/gensec/gensec.h"
 #include "../lib/util/dlinklist.h"
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/dcerpc_server_proto.h"
+#include "rpc_server/common/proto.h"
 #include "librpc/rpc/dcerpc_proto.h"
-#include "lib/events/events.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
-#include "smbd/service.h"
 #include "system/filesys.h"
 #include "libcli/security/security.h"
 #include "param/param.h"
+#include "../lib/tsocket/tsocket.h"
+#include "../libcli/named_pipe_auth/npa_tstream.h"
+#include "smbd/service_stream.h"
+#include "../lib/tsocket/tsocket.h"
+#include "lib/socket/socket.h"
+#include "smbd/process_model.h"
+#include "lib/messaging/irpc.h"
+#include "librpc/rpc/rpc_common.h"
+#include "lib/util/samba_modules.h"
+#include "librpc/gen_ndr/ndr_dcerpc.h"
 
-#define SAMBA_ASSOC_GROUP 0x12345678
+/* this is only used when the client asks for an unknown interface */
+#define DUMMY_ASSOC_GROUP 0x0FFFFFFF
 
 extern const struct dcesrv_interface dcesrv_mgmt_interface;
 
+
+/*
+  find an association group given a assoc_group_id
+ */
+static struct dcesrv_assoc_group *dcesrv_assoc_group_find(struct dcesrv_context *dce_ctx,
+                                                         uint32_t id)
+{
+       void *id_ptr;
+
+       id_ptr = idr_find(dce_ctx->assoc_groups_idr, id);
+       if (id_ptr == NULL) {
+               return NULL;
+       }
+       return talloc_get_type_abort(id_ptr, struct dcesrv_assoc_group);
+}
+
+/*
+  take a reference to an existing association group
+ */
+static struct dcesrv_assoc_group *dcesrv_assoc_group_reference(TALLOC_CTX *mem_ctx,
+                                                              struct dcesrv_context *dce_ctx,
+                                                              uint32_t id)
+{
+       struct dcesrv_assoc_group *assoc_group;
+
+       assoc_group = dcesrv_assoc_group_find(dce_ctx, id);
+       if (assoc_group == NULL) {
+               DEBUG(0,(__location__ ": Failed to find assoc_group 0x%08x\n", id));
+               return NULL;
+       }
+       return talloc_reference(mem_ctx, assoc_group);
+}
+
+static int dcesrv_assoc_group_destructor(struct dcesrv_assoc_group *assoc_group)
+{
+       int ret;
+       ret = idr_remove(assoc_group->dce_ctx->assoc_groups_idr, assoc_group->id);
+       if (ret != 0) {
+               DEBUG(0,(__location__ ": Failed to remove assoc_group 0x%08x\n",
+                        assoc_group->id));
+       }
+       return 0;
+}
+
+/*
+  allocate a new association group
+ */
+static struct dcesrv_assoc_group *dcesrv_assoc_group_new(TALLOC_CTX *mem_ctx,
+                                                        struct dcesrv_context *dce_ctx)
+{
+       struct dcesrv_assoc_group *assoc_group;
+       int id;
+
+       assoc_group = talloc_zero(mem_ctx, struct dcesrv_assoc_group);
+       if (assoc_group == NULL) {
+               return NULL;
+       }
+       
+       id = idr_get_new_random(dce_ctx->assoc_groups_idr, assoc_group, UINT16_MAX);
+       if (id == -1) {
+               talloc_free(assoc_group);
+               DEBUG(0,(__location__ ": Out of association groups!\n"));
+               return NULL;
+       }
+
+       assoc_group->id = id;
+       assoc_group->dce_ctx = dce_ctx;
+
+       talloc_set_destructor(assoc_group, dcesrv_assoc_group_destructor);
+
+       return assoc_group;
+}
+
+
 /*
   see if two endpoints match
 */
 static bool endpoints_match(const struct dcerpc_binding *ep1,
                            const struct dcerpc_binding *ep2)
 {
-       if (ep1->transport != ep2->transport) {
+       enum dcerpc_transport_t t1;
+       enum dcerpc_transport_t t2;
+       const char *e1;
+       const char *e2;
+
+       t1 = dcerpc_binding_get_transport(ep1);
+       t2 = dcerpc_binding_get_transport(ep2);
+
+       e1 = dcerpc_binding_get_string_option(ep1, "endpoint");
+       e2 = dcerpc_binding_get_string_option(ep2, "endpoint");
+
+       if (t1 != t2) {
                return false;
        }
 
-       if (!ep1->endpoint || !ep2->endpoint) {
-               return ep1->endpoint == ep2->endpoint;
+       if (!e1 || !e2) {
+               return e1 == e2;
        }
 
-       if (strcasecmp(ep1->endpoint, ep2->endpoint) != 0) 
+       if (strcasecmp(e1, e2) != 0) {
                return false;
+       }
 
        return true;
 }
@@ -181,11 +274,11 @@ _PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
                        return NT_STATUS_NO_MEMORY;
                }
                ZERO_STRUCTP(ep);
-               ep->ep_description = talloc_reference(ep, binding);
+               ep->ep_description = talloc_move(ep, &binding);
                add_ep = true;
 
                /* add mgmt interface */
-               ifl = talloc(dce_ctx, struct dcesrv_if_list);
+               ifl = talloc(ep, struct dcesrv_if_list);
                if (!ifl) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -204,7 +297,7 @@ _PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
        }
 
        /* talloc a new interface list element */
-       ifl = talloc(dce_ctx, struct dcesrv_if_list);
+       ifl = talloc(ep, struct dcesrv_if_list);
        if (!ifl) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -220,7 +313,7 @@ _PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
                 * we try to set it
                 */
                if (ep->sd == NULL) {
-                       ep->sd = security_descriptor_copy(dce_ctx, sd);
+                       ep->sd = security_descriptor_copy(ep, sd);
                }
 
                /* if now there's no security descriptor given on the endpoint
@@ -261,15 +354,6 @@ NTSTATUS dcesrv_inherited_session_key(struct dcesrv_connection *p,
        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;
-}
-
 /*
   fetch the user session key - may be default (above) or the SMB session key
 
@@ -295,8 +379,8 @@ _PUBLIC_ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
                                 TALLOC_CTX *mem_ctx,
                                 const struct dcesrv_endpoint *ep,
                                 struct auth_session_info *session_info,
-                                struct event_context *event_ctx,
-                                struct messaging_context *msg_ctx,
+                                struct tevent_context *event_ctx,
+                                struct imessaging_context *msg_ctx,
                                 struct server_id server_id,
                                 uint32_t state_flags,
                                 struct dcesrv_connection **_p)
@@ -307,7 +391,7 @@ _PUBLIC_ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       p = talloc(mem_ctx, struct dcesrv_connection);
+       p = talloc_zero(mem_ctx, struct dcesrv_connection);
        NT_STATUS_HAVE_NO_MEMORY(p);
 
        if (!talloc_reference(p, session_info)) {
@@ -317,80 +401,18 @@ _PUBLIC_ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
 
        p->dce_ctx = dce_ctx;
        p->endpoint = ep;
-       p->contexts = NULL;
-       p->call_list = NULL;
-       p->packet_log_dir = lp_lockdir(dce_ctx->lp_ctx);
-       p->incoming_fragmented_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->packet_log_dir = lpcfg_lock_directory(dce_ctx->lp_ctx);
        p->auth_state.session_info = session_info;
        p->auth_state.session_key = dcesrv_generic_session_key;
        p->event_ctx = event_ctx;
        p->msg_ctx = msg_ctx;
        p->server_id = server_id;
-       p->processing = false;
        p->state_flags = state_flags;
-       ZERO_STRUCT(p->transport);
 
        *_p = p;
        return NT_STATUS_OK;
 }
 
-/*
-  search and connect to a dcerpc endpoint
-*/
-_PUBLIC_ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx,
-                                       TALLOC_CTX *mem_ctx,
-                                       const struct dcerpc_binding *ep_description,
-                                       struct auth_session_info *session_info,
-                                       struct event_context *event_ctx,
-                                       struct messaging_context *msg_ctx,
-                                       struct server_id server_id,
-                                       uint32_t state_flags,
-                                       struct dcesrv_connection **dce_conn_p)
-{
-       NTSTATUS status;
-       const struct dcesrv_endpoint *ep;
-
-       /* make sure this endpoint exists */
-       ep = find_endpoint(dce_ctx, ep_description);
-       if (!ep) {
-               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
-       }
-
-       status = dcesrv_endpoint_connect(dce_ctx, mem_ctx, ep, session_info,
-                                        event_ctx, msg_ctx, server_id,
-                                        state_flags, dce_conn_p);
-       NT_STATUS_NOT_OK_RETURN(status);
-
-       (*dce_conn_p)->auth_state.session_key = dcesrv_inherited_session_key;
-
-       /* TODO: check security descriptor of the endpoint here 
-        *       if it's a smb named pipe
-        *       if it's failed free dce_conn_p
-        */
-
-       return NT_STATUS_OK;
-}
-
-
-static void dcesrv_init_hdr(struct ncacn_packet *pkt, bool bigendian)
-{
-       pkt->rpc_vers = 5;
-       pkt->rpc_vers_minor = 0;
-       if (bigendian) {
-               pkt->drep[0] = 0;
-       } else {
-               pkt->drep[0] = DCERPC_DREP_LE;
-       }
-       pkt->drep[1] = 0;
-       pkt->drep[2] = 0;
-       pkt->drep[3] = 0;
-}
-
 /*
   move a call from an existing linked list to the specified list. This
   prevents bugs where we forget to remove the call from a previous
@@ -417,59 +439,17 @@ static void dcesrv_call_set_list(struct dcesrv_call_state *call,
        case DCESRV_LIST_NONE:
                break;
        case DCESRV_LIST_CALL_LIST:
-               DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
+               DLIST_ADD_END(call->conn->call_list, call);
                break;
        case DCESRV_LIST_FRAGMENTED_CALL_LIST:
-               DLIST_ADD_END(call->conn->incoming_fragmented_call_list, call, struct dcesrv_call_state *);
+               DLIST_ADD_END(call->conn->incoming_fragmented_call_list, call);
                break;
        case DCESRV_LIST_PENDING_CALL_LIST:
-               DLIST_ADD_END(call->conn->pending_call_list, call, struct dcesrv_call_state *);
+               DLIST_ADD_END(call->conn->pending_call_list, call);
                break;
        }
 }
 
-/*
-  return a dcerpc fault
-*/
-static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t fault_code)
-{
-       struct ncacn_packet pkt;
-       struct data_blob_list_item *rep;
-       uint8_t zeros[4];
-       NTSTATUS status;
-
-       /* setup a bind_ack */
-       dcesrv_init_hdr(&pkt, lp_rpc_big_endian(call->conn->dce_ctx->lp_ctx));
-       pkt.auth_length = 0;
-       pkt.call_id = call->pkt.call_id;
-       pkt.ptype = DCERPC_PKT_FAULT;
-       pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
-       pkt.u.fault.alloc_hint = 0;
-       pkt.u.fault.context_id = 0;
-       pkt.u.fault.cancel_count = 0;
-       pkt.u.fault.status = fault_code;
-
-       ZERO_STRUCT(zeros);
-       pkt.u.fault._pad = data_blob_const(zeros, sizeof(zeros));
-
-       rep = talloc(call, struct data_blob_list_item);
-       if (!rep) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       status = ncacn_push_auth(&rep->blob, call, lp_iconv_convenience(call->conn->dce_ctx->lp_ctx), &pkt, NULL);
-       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 *);
-       dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
-
-       return NT_STATUS_OK;    
-}
-
 
 /*
   return a dcerpc bind_nak
@@ -477,35 +457,44 @@ 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 ncacn_packet pkt;
+       struct dcerpc_bind_nak_version version;
        struct data_blob_list_item *rep;
        NTSTATUS status;
 
        /* setup a bind_nak */
-       dcesrv_init_hdr(&pkt, lp_rpc_big_endian(call->conn->dce_ctx->lp_ctx));
+       dcesrv_init_hdr(&pkt, lpcfg_rpc_big_endian(call->conn->dce_ctx->lp_ctx));
        pkt.auth_length = 0;
        pkt.call_id = call->pkt.call_id;
        pkt.ptype = DCERPC_PKT_BIND_NAK;
        pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
        pkt.u.bind_nak.reject_reason = reason;
-       if (pkt.u.bind_nak.reject_reason == DECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED) {
-               pkt.u.bind_nak.versions.v.num_versions = 0;
-       }
+       version.rpc_vers = 5;
+       version.rpc_vers_minor = 0;
+       pkt.u.bind_nak.num_versions = 1;
+       pkt.u.bind_nak.versions = &version;
+       pkt.u.bind_nak._pad = data_blob_null;
 
        rep = talloc(call, struct data_blob_list_item);
        if (!rep) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = ncacn_push_auth(&rep->blob, call, lp_iconv_convenience(call->conn->dce_ctx->lp_ctx), &pkt, NULL);
+       status = ncacn_push_auth(&rep->blob, call, &pkt, NULL);
        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->replies, rep);
        dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
+       if (call->conn->call_list && call->conn->call_list->replies) {
+               if (call->conn->transport.report_output_data) {
+                       call->conn->transport.report_output_data(call->conn);
+               }
+       }
+
        return NT_STATUS_OK;    
 }
 
@@ -513,13 +502,43 @@ static int dcesrv_connection_context_destructor(struct dcesrv_connection_context
 {
        DLIST_REMOVE(c->conn->contexts, c);
 
-       if (c->iface) {
+       if (c->iface && c->iface->unbind) {
                c->iface->unbind(c, c->iface);
+               c->iface = NULL;
        }
 
        return 0;
 }
 
+static void dcesrv_prepare_context_auth(struct dcesrv_call_state *dce_call)
+{
+       struct dcesrv_connection_context *context = dce_call->context;
+
+       context->min_auth_level = DCERPC_AUTH_LEVEL_NONE;
+}
+
+NTSTATUS dcesrv_interface_bind_require_integrity(struct dcesrv_call_state *dce_call,
+                                                const struct dcesrv_interface *iface)
+{
+       if (dce_call->context == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       dce_call->context->min_auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+       return NT_STATUS_OK;
+}
+
+NTSTATUS dcesrv_interface_bind_require_privacy(struct dcesrv_call_state *dce_call,
+                                              const struct dcesrv_interface *iface)
+{
+       if (dce_call->context == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       dce_call->context->min_auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
+       return NT_STATUS_OK;
+}
+
 /*
   handle a bind request
 */
@@ -536,18 +555,11 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        uint32_t extra_flags = 0;
 
        /*
-        * Association groups allow policy handles to be shared across
-        * multiple client connections.  We don't implement this yet.
-        *
-        * So we just allow 0 if the client wants to create a new
-        * association group.
-        *
-        * And we allow the 0x12345678 value, we give away as
-        * assoc_group_id back to the clients
+         if provided, check the assoc_group is valid
         */
        if (call->pkt.u.bind.assoc_group_id != 0 &&
-           lp_parm_bool(call->conn->dce_ctx->lp_ctx, NULL, "dcesrv","assoc group checking", true) &&
-           call->pkt.u.bind.assoc_group_id != SAMBA_ASSOC_GROUP) {
+           lpcfg_parm_bool(call->conn->dce_ctx->lp_ctx, NULL, "dcesrv","assoc group checking", true) &&
+           dcesrv_assoc_group_find(call->conn->dce_ctx, call->pkt.u.bind.assoc_group_id) == NULL) {
                return dcesrv_bind_nak(call, 0);        
        }
 
@@ -568,8 +580,8 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
 
        transfer_syntax_version = call->pkt.u.bind.ctx_list[0].transfer_syntaxes[0].if_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) {
+       if (!GUID_equal(&ndr_transfer_syntax_ndr.uuid, transfer_syntax_uuid) != 0 ||
+           ndr_transfer_syntax_ndr.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));
@@ -598,18 +610,25 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
                context->conn = call->conn;
                context->iface = iface;
                context->context_id = context_id;
-               /*
-                * we need to send a non zero assoc_group_id here to make longhorn happy,
-                * it also matches samba3
-                */
-               context->assoc_group_id = SAMBA_ASSOC_GROUP;
-               context->private = NULL;
-               context->handles = NULL;
+               if (call->pkt.u.bind.assoc_group_id != 0) {
+                       context->assoc_group = dcesrv_assoc_group_reference(context,
+                                                                           call->conn->dce_ctx, 
+                                                                           call->pkt.u.bind.assoc_group_id);
+               } else {
+                       context->assoc_group = dcesrv_assoc_group_new(context, call->conn->dce_ctx);
+               }
+               if (context->assoc_group == NULL) {
+                       talloc_free(context);
+                       return dcesrv_bind_nak(call, 0);
+               }
+               context->private_data = NULL;
                DLIST_ADD(call->conn->contexts, context);
                call->context = context;
                talloc_set_destructor(context, dcesrv_connection_context_destructor);
 
-               status = iface->bind(call, iface);
+               dcesrv_prepare_context_auth(call);
+
+               status = iface->bind(call, iface, if_version);
                if (!NT_STATUS_IS_OK(status)) {
                        char *uuid_str = GUID_string(call, &uuid);
                        DEBUG(2,("Request for dcerpc interface %s/%d rejected: %s\n",
@@ -624,13 +643,17 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        }
 
        if (call->conn->cli_max_recv_frag == 0) {
-               call->conn->cli_max_recv_frag = call->pkt.u.bind.max_recv_frag;
+               call->conn->cli_max_recv_frag = MIN(0x2000, call->pkt.u.bind.max_recv_frag);
+       }
+
+       if ((call->pkt.pfc_flags & DCERPC_PFC_FLAG_CONC_MPX) &&
+           (call->state_flags & DCESRV_CALL_STATE_FLAG_MULTIPLEXED)) {
+               call->context->conn->state_flags |= DCESRV_CALL_STATE_FLAG_MULTIPLEXED;
+               extra_flags |= DCERPC_PFC_FLAG_CONC_MPX;
        }
 
-       if ((call->pkt.pfc_flags & DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN) &&
-           lp_parm_bool(call->conn->dce_ctx->lp_ctx, NULL, "dcesrv","header signing", false)) {
-               call->conn->state_flags |= DCESRV_CALL_STATE_FLAG_HEADER_SIGNING;
-               extra_flags |= DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN;
+       if (call->state_flags & DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL) {
+               call->context->conn->state_flags |= DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL;
        }
 
        /* handle any authentication that is being requested */
@@ -641,12 +664,12 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
        }
 
        /* setup a bind_ack */
-       dcesrv_init_hdr(&pkt, lp_rpc_big_endian(call->conn->dce_ctx->lp_ctx));
+       dcesrv_init_hdr(&pkt, lpcfg_rpc_big_endian(call->conn->dce_ctx->lp_ctx));
        pkt.auth_length = 0;
        pkt.call_id = call->pkt.call_id;
        pkt.ptype = DCERPC_PKT_BIND_ACK;
        pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST | extra_flags;
-       pkt.u.bind_ack.max_xmit_frag = 0x2000;
+       pkt.u.bind_ack.max_xmit_frag = call->conn->cli_max_recv_frag;
        pkt.u.bind_ack.max_recv_frag = 0x2000;
 
        /*
@@ -656,10 +679,9 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
          metze
        */
        if (call->context) {
-               pkt.u.bind_ack.assoc_group_id = call->context->assoc_group_id;
+               pkt.u.bind_ack.assoc_group_id = call->context->assoc_group->id;
        } else {
-               /* we better pick something - this chosen so as to send a non zero assoc_group_id (matching windows), it also matches samba3 */
-               pkt.u.bind_ack.assoc_group_id = SAMBA_ASSOC_GROUP;
+               pkt.u.bind_ack.assoc_group_id = DUMMY_ASSOC_GROUP;
        }
 
        if (iface) {
@@ -676,8 +698,8 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
                return NT_STATUS_NO_MEMORY;
        }
        pkt.u.bind_ack.ctx_list[0].result = result;
-       pkt.u.bind_ack.ctx_list[0].reason = reason;
-       pkt.u.bind_ack.ctx_list[0].syntax = ndr_transfer_syntax;
+       pkt.u.bind_ack.ctx_list[0].reason.value = reason;
+       pkt.u.bind_ack.ctx_list[0].syntax = ndr_transfer_syntax_ndr;
        pkt.u.bind_ack.auth_info = data_blob(NULL, 0);
 
        status = dcesrv_auth_bind_ack(call, &pkt);
@@ -694,7 +716,8 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = ncacn_push_auth(&rep->blob, call, lp_iconv_convenience(call->conn->dce_ctx->lp_ctx), &pkt, call->conn->auth_state.auth_info);
+       status = ncacn_push_auth(&rep->blob, call, &pkt,
+                                                        call->conn->auth_state.auth_info);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(call->context);
                call->context = NULL;
@@ -703,9 +726,15 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
 
        dcerpc_set_frag_length(&rep->blob, rep->blob.length);
 
-       DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
+       DLIST_ADD_END(call->replies, rep);
        dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
+       if (call->conn->call_list && call->conn->call_list->replies) {
+               if (call->conn->transport.report_output_data) {
+                       call->conn->transport.report_output_data(call->conn);
+               }
+       }
+
        return NT_STATUS_OK;
 }
 
@@ -744,8 +773,8 @@ static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_
 
        transfer_syntax_version = call->pkt.u.alter.ctx_list[0].transfer_syntaxes[0].if_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) {
+       if (!GUID_equal(transfer_syntax_uuid, &ndr_transfer_syntax_ndr.uuid) ||
+           ndr_transfer_syntax_ndr.if_version != transfer_syntax_version) {
                /* we only do NDR encoded dcerpc */
                return NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED;
        }
@@ -766,14 +795,26 @@ static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_
        context->conn = call->conn;
        context->iface = iface;
        context->context_id = context_id;
-       context->assoc_group_id = SAMBA_ASSOC_GROUP;
-       context->private = NULL;
-       context->handles = NULL;
+       if (call->pkt.u.alter.assoc_group_id != 0) {
+               context->assoc_group = dcesrv_assoc_group_reference(context,
+                                                                   call->conn->dce_ctx, 
+                                                                   call->pkt.u.alter.assoc_group_id);
+       } else {
+               context->assoc_group = dcesrv_assoc_group_new(context, call->conn->dce_ctx);
+       }
+       if (context->assoc_group == NULL) {
+               talloc_free(context);
+               call->context = NULL;
+               return NT_STATUS_NO_MEMORY;
+       }
+       context->private_data = NULL;
        DLIST_ADD(call->conn->contexts, context);
        call->context = context;
        talloc_set_destructor(context, dcesrv_connection_context_destructor);
 
-       status = iface->bind(call, iface);
+       dcesrv_prepare_context_auth(call);
+
+       status = iface->bind(call, iface, if_version);
        if (!NT_STATUS_IS_OK(status)) {
                /* we don't want to trigger the iface->unbind() hook */
                context->iface = NULL;
@@ -785,58 +826,36 @@ static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_
        return NT_STATUS_OK;
 }
 
-
-/*
-  handle a alter context request
-*/
-static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
+/* setup and send an alter_resp */
+static NTSTATUS dcesrv_alter_resp(struct dcesrv_call_state *call,
+                               uint32_t result,
+                               uint32_t reason)
 {
        struct ncacn_packet pkt;
-       struct data_blob_list_item *rep;
+       uint32_t extra_flags = 0;
+       struct data_blob_list_item *rep = NULL;
        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) {
-               call->context = dcesrv_find_context(call->conn, context_id);
-               if (!call->context) {
-                       status = dcesrv_alter_new_context(call, context_id);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               result = DCERPC_BIND_PROVIDER_REJECT;
-                               reason = DCERPC_BIND_REASON_ASYNTAX;
-                       }
-               }
-       }
-
-       if (result == 0 &&
-           call->pkt.u.alter.assoc_group_id != 0 &&
-           lp_parm_bool(call->conn->dce_ctx->lp_ctx, NULL, "dcesrv","assoc group checking", true) &&
-           call->pkt.u.alter.assoc_group_id != call->context->assoc_group_id) {
-               /* TODO: work out what to return here */
-               result = DCERPC_BIND_PROVIDER_REJECT;
-               reason = DCERPC_BIND_REASON_ASYNTAX;
-       }
-
-       /* setup a alter_resp */
-       dcesrv_init_hdr(&pkt, lp_rpc_big_endian(call->conn->dce_ctx->lp_ctx));
+       dcesrv_init_hdr(&pkt, lpcfg_rpc_big_endian(call->conn->dce_ctx->lp_ctx));
        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;
+       if (result == 0) {
+               if ((call->pkt.pfc_flags & DCERPC_PFC_FLAG_CONC_MPX) &&
+                               call->context->conn->state_flags &
+                                       DCESRV_CALL_STATE_FLAG_MULTIPLEXED) {
+                       extra_flags |= DCERPC_PFC_FLAG_CONC_MPX;
+               }
+               if (call->state_flags & DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL) {
+                       call->context->conn->state_flags |=
+                               DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL;
+               }
+       }
+       pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST | extra_flags;
        pkt.u.alter_resp.max_xmit_frag = 0x2000;
        pkt.u.alter_resp.max_recv_frag = 0x2000;
        if (result == 0) {
-               pkt.u.alter_resp.assoc_group_id = call->context->assoc_group_id;
+               pkt.u.alter_resp.assoc_group_id = call->context->assoc_group->id;
        } else {
                pkt.u.alter_resp.assoc_group_id = 0;
        }
@@ -846,8 +865,8 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
                return NT_STATUS_NO_MEMORY;
        }
        pkt.u.alter_resp.ctx_list[0].result = result;
-       pkt.u.alter_resp.ctx_list[0].reason = reason;
-       pkt.u.alter_resp.ctx_list[0].syntax = ndr_transfer_syntax;
+       pkt.u.alter_resp.ctx_list[0].reason.value = reason;
+       pkt.u.alter_resp.ctx_list[0].syntax = ndr_transfer_syntax_ndr;
        pkt.u.alter_resp.auth_info = data_blob(NULL, 0);
        pkt.u.alter_resp.secondary_address = "";
 
@@ -867,27 +886,143 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = ncacn_push_auth(&rep->blob, call, lp_iconv_convenience(call->conn->dce_ctx->lp_ctx), &pkt, call->conn->auth_state.auth_info);
+       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->replies, rep);
        dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
+       if (call->conn->call_list && call->conn->call_list->replies) {
+               if (call->conn->transport.report_output_data) {
+                       call->conn->transport.report_output_data(call->conn);
+               }
+       }
+
        return NT_STATUS_OK;
 }
 
+/*
+  handle a alter context request
+*/
+static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
+{
+       NTSTATUS status;
+       uint32_t context_id;
+
+       /* handle any authentication that is being requested */
+       if (!dcesrv_auth_alter(call)) {
+               /* TODO: work out the right reject code */
+               return dcesrv_alter_resp(call,
+                               DCERPC_BIND_PROVIDER_REJECT,
+                               DCERPC_BIND_REASON_ASYNTAX);
+       }
+
+       context_id = call->pkt.u.alter.ctx_list[0].context_id;
+
+       /* see if they are asking for a new interface */
+       call->context = dcesrv_find_context(call->conn, context_id);
+       if (!call->context) {
+               status = dcesrv_alter_new_context(call, context_id);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return dcesrv_alter_resp(call,
+                               DCERPC_BIND_PROVIDER_REJECT,
+                               DCERPC_BIND_REASON_ASYNTAX);
+               }
+       }
+
+       if (call->pkt.u.alter.assoc_group_id != 0 &&
+           lpcfg_parm_bool(call->conn->dce_ctx->lp_ctx, NULL, "dcesrv","assoc group checking", true) &&
+           call->pkt.u.alter.assoc_group_id != call->context->assoc_group->id) {
+               DEBUG(0,(__location__ ": Failed attempt to use new assoc_group in alter context (0x%08x 0x%08x)\n",
+                        call->context->assoc_group->id, call->pkt.u.alter.assoc_group_id));
+               /* TODO: can they ask for a new association group? */
+               return dcesrv_alter_resp(call,
+                               DCERPC_BIND_PROVIDER_REJECT,
+                               DCERPC_BIND_REASON_ASYNTAX);
+       }
+
+       return dcesrv_alter_resp(call,
+                               DCERPC_BIND_ACK_RESULT_ACCEPTANCE,
+                               DCERPC_BIND_ACK_REASON_NOT_SPECIFIED);
+}
+
+/*
+  possibly save the call for inspection with ndrdump
+ */
+static void dcesrv_save_call(struct dcesrv_call_state *call, const char *why)
+{
+#ifdef DEVELOPER
+       char *fname;
+       const char *dump_dir;
+       dump_dir = lpcfg_parm_string(call->conn->dce_ctx->lp_ctx, NULL, "dcesrv", "stubs directory");
+       if (!dump_dir) {
+               return;
+       }
+       fname = talloc_asprintf(call, "%s/RPC-%s-%u-%s.dat",
+                               dump_dir,
+                               call->context->iface->name,
+                               call->pkt.u.request.opnum,
+                               why);
+       if (file_save(fname, call->pkt.u.request.stub_and_verifier.data, call->pkt.u.request.stub_and_verifier.length)) {
+               DEBUG(0,("RPC SAVED %s\n", fname));
+       }
+       talloc_free(fname);
+#endif
+}
+
+static NTSTATUS dcesrv_check_verification_trailer(struct dcesrv_call_state *call)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       const uint32_t bitmask1 = call->conn->auth_state.client_hdr_signing ?
+               DCERPC_SEC_VT_CLIENT_SUPPORTS_HEADER_SIGNING : 0;
+       const struct dcerpc_sec_vt_pcontext pcontext = {
+               .abstract_syntax = call->context->iface->syntax_id,
+               .transfer_syntax = ndr_transfer_syntax_ndr,
+       };
+       const struct dcerpc_sec_vt_header2 header2 =
+               dcerpc_sec_vt_header2_from_ncacn_packet(&call->pkt);
+       enum ndr_err_code ndr_err;
+       struct dcerpc_sec_verification_trailer *vt = NULL;
+       NTSTATUS status = NT_STATUS_OK;
+       bool ok;
+
+       SMB_ASSERT(call->pkt.ptype == DCERPC_PKT_REQUEST);
+
+       ndr_err = ndr_pop_dcerpc_sec_verification_trailer(call->ndr_pull,
+                                                         frame, &vt);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               status = ndr_map_error2ntstatus(ndr_err);
+               goto done;
+       }
+
+       ok = dcerpc_sec_verification_trailer_check(vt, &bitmask1,
+                                                  &pcontext, &header2);
+       if (!ok) {
+               status = NT_STATUS_ACCESS_DENIED;
+               goto done;
+       }
+done:
+       TALLOC_FREE(frame);
+       return status;
+}
+
 /*
   handle a dcerpc request packet
 */
 static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
 {
+       const struct dcesrv_endpoint *endpoint = call->conn->endpoint;
+       enum dcerpc_transport_t transport =
+               dcerpc_binding_get_transport(endpoint->ep_description);
        struct ndr_pull *pull;
        NTSTATUS status;
        struct dcesrv_connection_context *context;
+       uint32_t auth_type = DCERPC_AUTH_TYPE_NONE;
+       uint32_t auth_level = DCERPC_AUTH_LEVEL_NONE;
 
        /* if authenticated, and the mech we use can't do async replies, don't use them... */
        if (call->conn->auth_state.gensec_security && 
@@ -900,8 +1035,29 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
                return dcesrv_fault(call, DCERPC_FAULT_UNK_IF);
        }
 
-       pull = ndr_pull_init_blob(&call->pkt.u.request.stub_and_verifier, call,
-                                 lp_iconv_convenience(call->conn->dce_ctx->lp_ctx));
+       if (call->conn->auth_state.auth_info != NULL) {
+               auth_type = call->conn->auth_state.auth_info->auth_type;
+               auth_level = call->conn->auth_state.auth_info->auth_level;
+       }
+
+       if (auth_level < context->min_auth_level) {
+               char *addr;
+
+               addr = tsocket_address_string(call->conn->remote_address, call);
+
+               DEBUG(2, ("%s: restrict access by min_auth_level[0x%x] "
+                         "to [%s] with auth[type=0x%x,level=0x%x] "
+                         "on [%s] from [%s]\n",
+                         __func__,
+                         context->min_auth_level,
+                         context->iface->name,
+                         auth_type, auth_level,
+                         derpc_transport_string_by_transport(transport),
+                         addr));
+               return dcesrv_fault(call, DCERPC_FAULT_ACCESS_DENIED);
+       }
+
+       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;
@@ -913,16 +1069,35 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
                pull->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
 
+       status = dcesrv_check_verification_trailer(call);
+       if (!NT_STATUS_IS_OK(status)) {
+               uint32_t faultcode = DCERPC_FAULT_OTHER;
+               if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+                       faultcode = DCERPC_FAULT_ACCESS_DENIED;
+               }
+               DEBUG(10, ("dcesrv_check_verification_trailer failed: %s\n",
+                          nt_errstr(status)));
+               return dcesrv_fault(call, faultcode);
+       }
+
        /* unravel the NDR for the packet */
        status = context->iface->ndr_pull(call, call, pull, &call->r);
        if (!NT_STATUS_IS_OK(status)) {
+               if (call->fault_code == DCERPC_FAULT_OP_RNG_ERROR) {
+                       /* we got an unknown call */
+                       DEBUG(3,(__location__ ": Unknown RPC call %u on %s\n",
+                                call->pkt.u.request.opnum, context->iface->name));
+                       dcesrv_save_call(call, "unknown");
+               } else {
+                       dcesrv_save_call(call, "pullfail");
+               }
                return dcesrv_fault(call, call->fault_code);
        }
 
        if (pull->offset != pull->data_size) {
+               dcesrv_save_call(call, "extrabytes");
                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 */
@@ -945,183 +1120,40 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
        return dcesrv_reply(call);
 }
 
-_PUBLIC_ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call)
-{
-       struct ndr_push *push;
-       NTSTATUS status;
-       DATA_BLOB stub;
-       uint32_t total_length, chunk_size;
-       struct dcesrv_connection_context *context = call->context;
-       size_t sig_size = 0;
 
-       /* 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);
-       }
+/*
+  remove the call from the right list when freed
+ */
+static int dcesrv_call_dequeue(struct dcesrv_call_state *call)
+{
+       dcesrv_call_set_list(call, DCESRV_LIST_NONE);
+       return 0;
+}
 
-       /* form the reply NDR */
-       push = ndr_push_init_ctx(call, lp_iconv_convenience(call->conn->dce_ctx->lp_ctx));
-       NT_STATUS_HAVE_NO_MEMORY(push);
+_PUBLIC_ const struct tsocket_address *dcesrv_connection_get_local_address(struct dcesrv_connection *conn)
+{
+       return conn->local_address;
+}
 
-       /* 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(call->conn->dce_ctx->lp_ctx)) {
-               push->flags |= LIBNDR_FLAG_BIGENDIAN;
-       }
-
-       status = context->iface->ndr_push(call, call, push, call->r);
-       if (!NT_STATUS_IS_OK(status)) {
-               return dcesrv_fault(call, call->fault_code);
-       }
-
-       stub = ndr_push_blob(push);
-
-       total_length = stub.length;
-
-       /* we can write a full max_recv_frag size, minus the dcerpc
-          request header size */
-       chunk_size = call->conn->cli_max_recv_frag;
-       chunk_size -= DCERPC_REQUEST_LENGTH;
-       if (call->conn->auth_state.auth_info &&
-           call->conn->auth_state.gensec_security) {
-               sig_size = gensec_sig_size(call->conn->auth_state.gensec_security,
-                                          call->conn->cli_max_recv_frag);
-               if (sig_size) {
-                       chunk_size -= DCERPC_AUTH_TRAILER_LENGTH;
-                       chunk_size -= sig_size;
-               }
-       }
-       chunk_size -= (chunk_size % 16);
-
-       do {
-               uint32_t length;
-               struct data_blob_list_item *rep;
-               struct ncacn_packet pkt;
-
-               rep = talloc(call, struct data_blob_list_item);
-               NT_STATUS_HAVE_NO_MEMORY(rep);
-
-               length = MIN(chunk_size, stub.length);
-
-               /* form the dcerpc response packet */
-               dcesrv_init_hdr(&pkt, lp_rpc_big_endian(call->conn->dce_ctx->lp_ctx));
-               pkt.auth_length = 0;
-               pkt.call_id = call->pkt.call_id;
-               pkt.ptype = DCERPC_PKT_RESPONSE;
-               pkt.pfc_flags = 0;
-               if (stub.length == total_length) {
-                       pkt.pfc_flags |= DCERPC_PFC_FLAG_FIRST;
-               }
-               if (length == stub.length) {
-                       pkt.pfc_flags |= DCERPC_PFC_FLAG_LAST;
-               }
-               pkt.u.response.alloc_hint = stub.length;
-               pkt.u.response.context_id = call->pkt.u.request.context_id;
-               pkt.u.response.cancel_count = 0;
-               pkt.u.response.stub_and_verifier.data = stub.data;
-               pkt.u.response.stub_and_verifier.length = length;
-
-               if (!dcesrv_auth_response(call, &rep->blob, sig_size, &pkt)) {
-                       return dcesrv_fault(call, DCERPC_FAULT_OTHER);          
-               }
-
-               dcerpc_set_frag_length(&rep->blob, rep->blob.length);
-
-               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 */
-       dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
-
-       if (call->conn->call_list && call->conn->call_list->replies) {
-               if (call->conn->transport.report_output_data) {
-                       call->conn->transport.report_output_data(call->conn);
-               }
-       }
-
-       return NT_STATUS_OK;
-}
-
-_PUBLIC_ struct socket_address *dcesrv_connection_get_my_addr(struct dcesrv_connection *conn, TALLOC_CTX *mem_ctx)
-{
-       if (!conn->transport.get_my_addr) {
-               return NULL;
-       }
-
-       return conn->transport.get_my_addr(conn, mem_ctx);
-}
-
-_PUBLIC_ struct socket_address *dcesrv_connection_get_peer_addr(struct dcesrv_connection *conn, TALLOC_CTX *mem_ctx)
-{
-       if (!conn->transport.get_peer_addr) {
-               return NULL;
-       }
-
-       return conn->transport.get_peer_addr(conn, mem_ctx);
-}
-
-/*
-  work out if we have a full packet yet
-*/
-static bool dce_full_packet(const DATA_BLOB *data)
-{
-       if (data->length < DCERPC_FRAG_LEN_OFFSET+2) {
-               return false;
-       }
-       if (dcerpc_get_frag_length(data) > data->length) {
-               return false;
-       }
-       return true;
-}
-
-/*
-  we might have consumed only part of our input - advance past that part
-*/
-static void dce_partial_advance(struct dcesrv_connection *dce_conn, uint32_t offset)
-{
-       DATA_BLOB blob;
-
-       if (dce_conn->partial_input.length == offset) {
-               data_blob_free(&dce_conn->partial_input);
-               return;
-       }
-
-       blob = dce_conn->partial_input;
-       dce_conn->partial_input = data_blob(blob.data + offset,
-                                           blob.length - offset);
-       data_blob_free(&blob);
-}
-
-/*
-  remove the call from the right list when freed
- */
-static int dcesrv_call_dequeue(struct dcesrv_call_state *call)
-{
-       dcesrv_call_set_list(call, DCESRV_LIST_NONE);
-       return 0;
-}
+_PUBLIC_ const struct tsocket_address *dcesrv_connection_get_remote_address(struct dcesrv_connection *conn)
+{
+       return conn->remote_address;
+}
 
 /*
   process some input to a dcerpc endpoint server.
 */
-NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
+NTSTATUS dcesrv_process_ncacn_packet(struct dcesrv_connection *dce_conn,
+                                    struct ncacn_packet *pkt,
+                                    DATA_BLOB blob)
 {
-       struct ndr_pull *ndr;
-       enum ndr_err_code ndr_err;
        NTSTATUS status;
        struct dcesrv_call_state *call;
-       DATA_BLOB blob;
 
        call = talloc_zero(dce_conn, struct dcesrv_call_state);
        if (!call) {
-               talloc_free(dce_conn->partial_input.data);
+               data_blob_free(&blob);
+               talloc_free(pkt);
                return NT_STATUS_NO_MEMORY;
        }
        call->conn              = dce_conn;
@@ -1131,43 +1163,19 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
        call->time              = timeval_current();
        call->list              = DCESRV_LIST_NONE;
 
-       talloc_set_destructor(call, dcesrv_call_dequeue);
-
-       blob = dce_conn->partial_input;
-       blob.length = dcerpc_get_frag_length(&blob);
-
-       ndr = ndr_pull_init_blob(&blob, call, lp_iconv_convenience(call->conn->dce_ctx->lp_ctx));
-       if (!ndr) {
-               talloc_free(dce_conn->partial_input.data);
-               talloc_free(call);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!(CVAL(blob.data, DCERPC_DREP_OFFSET) & DCERPC_DREP_LE)) {
-               ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
-       }
-
-       if (CVAL(blob.data, DCERPC_PFC_OFFSET) & DCERPC_PFC_FLAG_OBJECT_UUID) {
-               ndr->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
-       }
+       talloc_steal(call, pkt);
+       talloc_steal(call, blob.data);
+       call->pkt = *pkt;
 
-       ndr_err = ndr_pull_ncacn_packet(ndr, NDR_SCALARS|NDR_BUFFERS, &call->pkt);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               talloc_free(dce_conn->partial_input.data);
-               talloc_free(call);
-               return ndr_map_error2ntstatus(ndr_err);
-       }
+       talloc_set_destructor(call, dcesrv_call_dequeue);
 
        /* we have to check the signing here, before combining the
           pdus */
        if (call->pkt.ptype == DCERPC_PKT_REQUEST &&
            !dcesrv_auth_request(call, &blob)) {
-               dce_partial_advance(dce_conn, blob.length);
                return dcesrv_fault(call, DCERPC_FAULT_ACCESS_DENIED);          
        }
 
-       dce_partial_advance(dce_conn, blob.length);
-
        /* see if this is a continued packet */
        if (call->pkt.ptype == DCERPC_PKT_REQUEST &&
            !(call->pkt.pfc_flags & DCERPC_PFC_FLAG_FIRST)) {
@@ -1179,8 +1187,8 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
                        return dcesrv_fault(call2, DCERPC_FAULT_OTHER);
                }
 
-               /* this is a continuation of an existing call - find the call then
-                  tack it on the end */
+               /* this is a continuation of an existing call - find the call
+                  then tack it on the end */
                call = dcesrv_find_fragmented_call(dce_conn, call2->pkt.call_id);
                if (!call) {
                        return dcesrv_fault(call2, DCERPC_FAULT_OTHER);
@@ -1188,7 +1196,19 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
 
                if (call->pkt.ptype != call2->pkt.ptype) {
                        /* trying to play silly buggers are we? */
-                       return dcesrv_fault(call2, DCERPC_FAULT_OTHER);
+                       return dcesrv_fault(call2, DCERPC_NCA_S_PROTO_ERROR);
+               }
+               if (memcmp(call->pkt.drep, call2->pkt.drep, sizeof(pkt->drep)) != 0) {
+                       return dcesrv_fault(call2, DCERPC_NCA_S_PROTO_ERROR);
+               }
+               if (call->pkt.call_id != call2->pkt.call_id) {
+                       return dcesrv_fault(call2, DCERPC_NCA_S_PROTO_ERROR);
+               }
+               if (call->pkt.u.request.context_id != call2->pkt.u.request.context_id)  {
+                       return dcesrv_fault(call2, DCERPC_NCA_S_PROTO_ERROR);
+               }
+               if (call->pkt.u.request.opnum != call2->pkt.u.request.opnum)  {
+                       return dcesrv_fault(call2, DCERPC_NCA_S_PROTO_ERROR);
                }
 
                alloc_size = call->pkt.u.request.stub_and_verifier.length +
@@ -1255,90 +1275,6 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
        return status;
 }
 
-
-/*
-  provide some input to a dcerpc endpoint server. This passes data
-  from a dcerpc client into the server
-*/
-_PUBLIC_ NTSTATUS dcesrv_input(struct dcesrv_connection *dce_conn, const DATA_BLOB *data)
-{
-       NTSTATUS status;
-
-       dce_conn->partial_input.data = talloc_realloc(dce_conn,
-                                                     dce_conn->partial_input.data,
-                                                     uint8_t,
-                                                     dce_conn->partial_input.length + data->length);
-       if (!dce_conn->partial_input.data) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       memcpy(dce_conn->partial_input.data + dce_conn->partial_input.length,
-              data->data, data->length);
-       dce_conn->partial_input.length += data->length;
-
-       while (dce_full_packet(&dce_conn->partial_input)) {
-               status = dcesrv_input_process(dce_conn);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
-       }
-
-       return NT_STATUS_OK;
-}
-
-/*
-  retrieve some output from a dcerpc server
-  The caller supplies a function that will be called to do the
-  actual output. 
-
-  The first argument to write_fn() will be 'private', the second will
-  be a pointer to a buffer containing the data to be sent and the 3rd
-  will be a pointer to a size_t variable that will be set to the
-  number of bytes that are consumed from the output.
-
-  from the current fragment
-*/
-_PUBLIC_ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn, 
-                      void *private_data,
-                      NTSTATUS (*write_fn)(void *private_data, DATA_BLOB *output, size_t *nwritten))
-{
-       NTSTATUS status;
-       struct dcesrv_call_state *call;
-       struct data_blob_list_item *rep;
-       size_t nwritten;
-
-       call = dce_conn->call_list;
-       if (!call || !call->replies) {
-               if (dce_conn->pending_call_list) {
-                       /* TODO: we need to say act async here
-                        *       as we know we have pending requests
-                        *       which will be finished at a time
-                        */
-                       return NT_STATUS_FOOBAR;
-               }
-               return NT_STATUS_FOOBAR;
-       }
-       rep = call->replies;
-
-       status = write_fn(private_data, &rep->blob, &nwritten);
-       NT_STATUS_IS_ERR_RETURN(status);
-
-       rep->blob.length -= nwritten;
-       rep->blob.data += nwritten;
-
-       if (rep->blob.length == 0) {
-               /* we're done with this section of the call */
-               DLIST_REMOVE(call->replies, rep);
-       }
-
-       if (call->replies == NULL) {
-               /* we're done with the whole call */
-               dcesrv_call_set_list(call, DCESRV_LIST_NONE);
-               talloc_free(call);
-       }
-
-       return status;
-}
-
 _PUBLIC_ NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx, 
                                      struct loadparm_context *lp_ctx,
                                      const char **endpoint_servers, struct dcesrv_context **_dce_ctx)
@@ -1354,8 +1290,20 @@ _PUBLIC_ NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx,
 
        dce_ctx = talloc(mem_ctx, struct dcesrv_context);
        NT_STATUS_HAVE_NO_MEMORY(dce_ctx);
+
+       if (uid_wrapper_enabled()) {
+               setenv("UID_WRAPPER_MYUID", "1", 1);
+       }
+       dce_ctx->initial_euid = geteuid();
+       if (uid_wrapper_enabled()) {
+               unsetenv("UID_WRAPPER_MYUID");
+       }
+
        dce_ctx->endpoint_list  = NULL;
        dce_ctx->lp_ctx = lp_ctx;
+       dce_ctx->assoc_groups_idr = idr_init(dce_ctx);
+       NT_STATUS_HAVE_NO_MEMORY(dce_ctx->assoc_groups_idr);
+       dce_ctx->broken_connections = NULL;
 
        for (i=0;endpoint_servers[i];i++) {
                const struct dcesrv_endpoint_server *ep_server;
@@ -1439,19 +1387,8 @@ const struct dcesrv_endpoint_server *dcesrv_ep_server_byname(const char *name)
 void dcerpc_server_init(struct loadparm_context *lp_ctx)
 {
        static bool initialized;
-       extern NTSTATUS dcerpc_server_wkssvc_init(void);
-       extern NTSTATUS dcerpc_server_drsuapi_init(void);
-       extern NTSTATUS dcerpc_server_winreg_init(void);
-       extern NTSTATUS dcerpc_server_spoolss_init(void);
-       extern NTSTATUS dcerpc_server_epmapper_init(void);
-       extern NTSTATUS dcerpc_server_srvsvc_init(void);
-       extern NTSTATUS dcerpc_server_netlogon_init(void);
-       extern NTSTATUS dcerpc_server_rpcecho_init(void);
-       extern NTSTATUS dcerpc_server_unixinfo_init(void);
-       extern NTSTATUS dcerpc_server_samr_init(void);
-       extern NTSTATUS dcerpc_server_remote_init(void);
-       extern NTSTATUS dcerpc_server_lsa_init(void);
-       extern NTSTATUS dcerpc_server_browser_init(void);
+#define _MODULE_PROTO(init) extern NTSTATUS init(void);
+       STATIC_dcerpc_server_MODULES_PROTO;
        init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES };
        init_module_fn *shared_init;
 
@@ -1460,7 +1397,7 @@ void dcerpc_server_init(struct loadparm_context *lp_ctx)
        }
        initialized = true;
 
-       shared_init = load_samba_modules(NULL, lp_ctx, "dcerpc_server");
+       shared_init = load_samba_modules(NULL, "dcerpc_server");
 
        run_init_functions(static_init);
        run_init_functions(shared_init);
@@ -1491,22 +1428,619 @@ const struct dcesrv_critical_sizes *dcerpc_module_version(void)
        return &critical_sizes;
 }
 
+static void dcesrv_terminate_connection(struct dcesrv_connection *dce_conn, const char *reason)
+{
+       struct dcesrv_context *dce_ctx = dce_conn->dce_ctx;
+       struct stream_connection *srv_conn;
+       srv_conn = talloc_get_type(dce_conn->transport.private_data,
+                                  struct stream_connection);
+
+       if (dce_conn->pending_call_list == NULL) {
+               char *full_reason = talloc_asprintf(dce_conn, "dcesrv: %s", reason);
+
+               DLIST_REMOVE(dce_ctx->broken_connections, dce_conn);
+               stream_terminate_connection(srv_conn, full_reason ? full_reason : reason);
+               return;
+       }
+
+       if (dce_conn->terminate != NULL) {
+               return;
+       }
+
+       DEBUG(3,("dcesrv: terminating connection due to '%s' defered due to pending calls\n",
+                reason));
+       dce_conn->terminate = talloc_strdup(dce_conn, reason);
+       if (dce_conn->terminate == NULL) {
+               dce_conn->terminate = "dcesrv: defered terminating connection - no memory";
+       }
+       DLIST_ADD_END(dce_ctx->broken_connections, dce_conn);
+}
+
+static void dcesrv_cleanup_broken_connections(struct dcesrv_context *dce_ctx)
+{
+       struct dcesrv_connection *cur, *next;
+
+       next = dce_ctx->broken_connections;
+       while (next != NULL) {
+               cur = next;
+               next = cur->next;
+
+               if (cur->state_flags & DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL) {
+                       struct dcesrv_connection_context *context_cur, *context_next;
+
+                       context_next = cur->contexts;
+                       while (context_next != NULL) {
+                               context_cur = context_next;
+                               context_next = context_cur->next;
+
+                               dcesrv_connection_context_destructor(context_cur);
+                       }
+               }
+
+               dcesrv_terminate_connection(cur, cur->terminate);
+       }
+}
+
+/* We need this include to be able to compile on some plateforms
+ * (ie. freebsd 7.2) as it seems that <sys/uio.h> is not included
+ * correctly.
+ * It has to be that deep because otherwise we have a conflict on
+ * const struct dcesrv_interface declaration.
+ * This is mostly due to socket_wrapper defining #define bind swrap_bind
+ * which conflict with the bind used before.
+ */
+#include "system/network.h"
+
+struct dcesrv_sock_reply_state {
+       struct dcesrv_connection *dce_conn;
+       struct dcesrv_call_state *call;
+       struct iovec iov;
+};
+
+static void dcesrv_sock_reply_done(struct tevent_req *subreq);
+
+static void dcesrv_sock_report_output_data(struct dcesrv_connection *dce_conn)
+{
+       struct dcesrv_call_state *call;
+
+       call = dce_conn->call_list;
+       if (!call || !call->replies) {
+               return;
+       }
+
+       while (call->replies) {
+               struct data_blob_list_item *rep = call->replies;
+               struct dcesrv_sock_reply_state *substate;
+               struct tevent_req *subreq;
+
+               substate = talloc(call, struct dcesrv_sock_reply_state);
+               if (!substate) {
+                       dcesrv_terminate_connection(dce_conn, "no memory");
+                       return;
+               }
+
+               substate->dce_conn = dce_conn;
+               substate->call = NULL;
+
+               DLIST_REMOVE(call->replies, rep);
+
+               if (call->replies == NULL) {
+                       substate->call = call;
+               }
+
+               substate->iov.iov_base = (void *) rep->blob.data;
+               substate->iov.iov_len = rep->blob.length;
+
+               subreq = tstream_writev_queue_send(substate,
+                                                  dce_conn->event_ctx,
+                                                  dce_conn->stream,
+                                                  dce_conn->send_queue,
+                                                  &substate->iov, 1);
+               if (!subreq) {
+                       dcesrv_terminate_connection(dce_conn, "no memory");
+                       return;
+               }
+               tevent_req_set_callback(subreq, dcesrv_sock_reply_done,
+                                       substate);
+       }
+
+       DLIST_REMOVE(call->conn->call_list, call);
+       call->list = DCESRV_LIST_NONE;
+}
+
+static void dcesrv_sock_reply_done(struct tevent_req *subreq)
+{
+       struct dcesrv_sock_reply_state *substate = tevent_req_callback_data(subreq,
+                                               struct dcesrv_sock_reply_state);
+       int ret;
+       int sys_errno;
+       NTSTATUS status;
+       struct dcesrv_call_state *call = substate->call;
+
+       ret = tstream_writev_queue_recv(subreq, &sys_errno);
+       TALLOC_FREE(subreq);
+       if (ret == -1) {
+               status = map_nt_error_from_unix_common(sys_errno);
+               dcesrv_terminate_connection(substate->dce_conn, nt_errstr(status));
+               return;
+       }
+
+       talloc_free(substate);
+       if (call) {
+               talloc_free(call);
+       }
+}
+
+
+
+
+struct dcesrv_socket_context {
+       const struct dcesrv_endpoint *endpoint;
+       struct dcesrv_context *dcesrv_ctx;
+};
+
+
+static void dcesrv_read_fragment_done(struct tevent_req *subreq);
+
+static void dcesrv_sock_accept(struct stream_connection *srv_conn)
+{
+       NTSTATUS status;
+       struct dcesrv_socket_context *dcesrv_sock = 
+               talloc_get_type(srv_conn->private_data, struct dcesrv_socket_context);
+       enum dcerpc_transport_t transport =
+               dcerpc_binding_get_transport(dcesrv_sock->endpoint->ep_description);
+       struct dcesrv_connection *dcesrv_conn = NULL;
+       int ret;
+       struct tevent_req *subreq;
+       struct loadparm_context *lp_ctx = dcesrv_sock->dcesrv_ctx->lp_ctx;
+
+       dcesrv_cleanup_broken_connections(dcesrv_sock->dcesrv_ctx);
+
+       if (!srv_conn->session_info) {
+               status = auth_anonymous_session_info(srv_conn,
+                                                    lp_ctx,
+                                                    &srv_conn->session_info);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("dcesrv_sock_accept: auth_anonymous_session_info failed: %s\n",
+                               nt_errstr(status)));
+                       stream_terminate_connection(srv_conn, nt_errstr(status));
+                       return;
+               }
+       }
+
+       status = dcesrv_endpoint_connect(dcesrv_sock->dcesrv_ctx,
+                                        srv_conn,
+                                        dcesrv_sock->endpoint,
+                                        srv_conn->session_info,
+                                        srv_conn->event.ctx,
+                                        srv_conn->msg_ctx,
+                                        srv_conn->server_id,
+                                        DCESRV_CALL_STATE_FLAG_MAY_ASYNC,
+                                        &dcesrv_conn);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("dcesrv_sock_accept: dcesrv_endpoint_connect failed: %s\n", 
+                       nt_errstr(status)));
+               stream_terminate_connection(srv_conn, nt_errstr(status));
+               return;
+       }
+
+       dcesrv_conn->transport.private_data             = srv_conn;
+       dcesrv_conn->transport.report_output_data       = dcesrv_sock_report_output_data;
+
+       TALLOC_FREE(srv_conn->event.fde);
+
+       dcesrv_conn->send_queue = tevent_queue_create(dcesrv_conn, "dcesrv send queue");
+       if (!dcesrv_conn->send_queue) {
+               status = NT_STATUS_NO_MEMORY;
+               DEBUG(0,("dcesrv_sock_accept: tevent_queue_create(%s)\n",
+                       nt_errstr(status)));
+               stream_terminate_connection(srv_conn, nt_errstr(status));
+               return;
+       }
+
+       if (transport == NCACN_NP) {
+               dcesrv_conn->auth_state.session_key = dcesrv_inherited_session_key;
+               dcesrv_conn->stream = talloc_move(dcesrv_conn,
+                                                 &srv_conn->tstream);
+       } else {
+               ret = tstream_bsd_existing_socket(dcesrv_conn,
+                                                 socket_get_fd(srv_conn->socket),
+                                                 &dcesrv_conn->stream);
+               if (ret == -1) {
+                       status = map_nt_error_from_unix_common(errno);
+                       DEBUG(0, ("dcesrv_sock_accept: "
+                                 "failed to setup tstream: %s\n",
+                                 nt_errstr(status)));
+                       stream_terminate_connection(srv_conn, nt_errstr(status));
+                       return;
+               }
+               socket_set_flags(srv_conn->socket, SOCKET_FLAG_NOCLOSE);
+       }
+
+       dcesrv_conn->local_address = srv_conn->local_address;
+       dcesrv_conn->remote_address = srv_conn->remote_address;
+
+       if (transport == NCALRPC) {
+               uid_t uid;
+               gid_t gid;
+
+               ret = getpeereid(socket_get_fd(srv_conn->socket), &uid, &gid);
+               if (ret == -1) {
+                       status = map_nt_error_from_unix_common(errno);
+                       DEBUG(0, ("dcesrv_sock_accept: "
+                                 "getpeereid() failed for NCALRPC: %s\n",
+                                 nt_errstr(status)));
+                       stream_terminate_connection(srv_conn, nt_errstr(status));
+                       return;
+               }
+               if (uid == dcesrv_conn->dce_ctx->initial_euid) {
+                       struct tsocket_address *r = NULL;
+
+                       ret = tsocket_address_unix_from_path(dcesrv_conn,
+                                                            "/root/ncalrpc_as_system",
+                                                            &r);
+                       if (ret == -1) {
+                               status = map_nt_error_from_unix_common(errno);
+                               DEBUG(0, ("dcesrv_sock_accept: "
+                                         "tsocket_address_unix_from_path() failed for NCALRPC: %s\n",
+                                         nt_errstr(status)));
+                               stream_terminate_connection(srv_conn, nt_errstr(status));
+                               return;
+                       }
+                       dcesrv_conn->remote_address = r;
+               }
+       }
+
+       srv_conn->private_data = dcesrv_conn;
+
+       irpc_add_name(srv_conn->msg_ctx, "rpc_server");
+
+       subreq = dcerpc_read_ncacn_packet_send(dcesrv_conn,
+                                              dcesrv_conn->event_ctx,
+                                              dcesrv_conn->stream);
+       if (!subreq) {
+               status = NT_STATUS_NO_MEMORY;
+               DEBUG(0,("dcesrv_sock_accept: dcerpc_read_fragment_buffer_send(%s)\n",
+                       nt_errstr(status)));
+               stream_terminate_connection(srv_conn, nt_errstr(status));
+               return;
+       }
+       tevent_req_set_callback(subreq, dcesrv_read_fragment_done, dcesrv_conn);
+
+       return;
+}
+
+static void dcesrv_read_fragment_done(struct tevent_req *subreq)
+{
+       struct dcesrv_connection *dce_conn = tevent_req_callback_data(subreq,
+                                            struct dcesrv_connection);
+       struct dcesrv_context *dce_ctx = dce_conn->dce_ctx;
+       struct ncacn_packet *pkt;
+       DATA_BLOB buffer;
+       NTSTATUS status;
+
+       if (dce_conn->terminate) {
+               /*
+                * if the current connection is broken
+                * we need to clean it up before any other connection
+                */
+               dcesrv_terminate_connection(dce_conn, dce_conn->terminate);
+               dcesrv_cleanup_broken_connections(dce_ctx);
+               return;
+       }
+
+       dcesrv_cleanup_broken_connections(dce_ctx);
+
+       status = dcerpc_read_ncacn_packet_recv(subreq, dce_conn,
+                                              &pkt, &buffer);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               dcesrv_terminate_connection(dce_conn, nt_errstr(status));
+               return;
+       }
+
+       status = dcesrv_process_ncacn_packet(dce_conn, pkt, buffer);
+       if (!NT_STATUS_IS_OK(status)) {
+               dcesrv_terminate_connection(dce_conn, nt_errstr(status));
+               return;
+       }
+
+       subreq = dcerpc_read_ncacn_packet_send(dce_conn,
+                                              dce_conn->event_ctx,
+                                              dce_conn->stream);
+       if (!subreq) {
+               status = NT_STATUS_NO_MEMORY;
+               dcesrv_terminate_connection(dce_conn, nt_errstr(status));
+               return;
+       }
+       tevent_req_set_callback(subreq, dcesrv_read_fragment_done, dce_conn);
+}
+
+static void dcesrv_sock_recv(struct stream_connection *conn, uint16_t flags)
+{
+       struct dcesrv_connection *dce_conn = talloc_get_type(conn->private_data,
+                                            struct dcesrv_connection);
+       dcesrv_terminate_connection(dce_conn, "dcesrv_sock_recv triggered");
+}
+
+static void dcesrv_sock_send(struct stream_connection *conn, uint16_t flags)
+{
+       struct dcesrv_connection *dce_conn = talloc_get_type(conn->private_data,
+                                            struct dcesrv_connection);
+       dcesrv_terminate_connection(dce_conn, "dcesrv_sock_send triggered");
+}
+
+
+static const struct stream_server_ops dcesrv_stream_ops = {
+       .name                   = "rpc",
+       .accept_connection      = dcesrv_sock_accept,
+       .recv_handler           = dcesrv_sock_recv,
+       .send_handler           = dcesrv_sock_send,
+};
+
+static NTSTATUS dcesrv_add_ep_unix(struct dcesrv_context *dce_ctx, 
+                                  struct loadparm_context *lp_ctx,
+                                  struct dcesrv_endpoint *e,
+                           struct tevent_context *event_ctx, const struct model_ops *model_ops)
+{
+       struct dcesrv_socket_context *dcesrv_sock;
+       uint16_t port = 1;
+       NTSTATUS status;
+       const char *endpoint;
+
+       dcesrv_sock = talloc(event_ctx, struct dcesrv_socket_context);
+       NT_STATUS_HAVE_NO_MEMORY(dcesrv_sock);
+
+       /* remember the endpoint of this socket */
+       dcesrv_sock->endpoint           = e;
+       dcesrv_sock->dcesrv_ctx         = talloc_reference(dcesrv_sock, dce_ctx);
+
+       endpoint = dcerpc_binding_get_string_option(e->ep_description, "endpoint");
+
+       status = stream_setup_socket(dcesrv_sock, event_ctx, lp_ctx,
+                                    model_ops, &dcesrv_stream_ops, 
+                                    "unix", endpoint, &port,
+                                    lpcfg_socket_options(lp_ctx),
+                                    dcesrv_sock);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("service_setup_stream_socket(path=%s) failed - %s\n",
+                        endpoint, nt_errstr(status)));
+       }
+
+       return status;
+}
+
+static NTSTATUS dcesrv_add_ep_ncalrpc(struct dcesrv_context *dce_ctx, 
+                                     struct loadparm_context *lp_ctx,
+                                     struct dcesrv_endpoint *e,
+                                     struct tevent_context *event_ctx, const struct model_ops *model_ops)
+{
+       struct dcesrv_socket_context *dcesrv_sock;
+       uint16_t port = 1;
+       char *full_path;
+       NTSTATUS status;
+       const char *endpoint;
+
+       endpoint = dcerpc_binding_get_string_option(e->ep_description, "endpoint");
+
+       if (endpoint == NULL) {
+               /*
+                * No identifier specified: use DEFAULT.
+                *
+                * TODO: DO NOT hardcode this value anywhere else. Rather, specify
+                * no endpoint and let the epmapper worry about it.
+                */
+               endpoint = "DEFAULT";
+               status = dcerpc_binding_set_string_option(e->ep_description,
+                                                         "endpoint",
+                                                         endpoint);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("dcerpc_binding_set_string_option() failed - %s\n",
+                                 nt_errstr(status)));
+                       return status;
+               }
+       }
+
+       full_path = talloc_asprintf(dce_ctx, "%s/%s", lpcfg_ncalrpc_dir(lp_ctx),
+                                   endpoint);
+
+       dcesrv_sock = talloc(event_ctx, struct dcesrv_socket_context);
+       NT_STATUS_HAVE_NO_MEMORY(dcesrv_sock);
+
+       /* remember the endpoint of this socket */
+       dcesrv_sock->endpoint           = e;
+       dcesrv_sock->dcesrv_ctx         = talloc_reference(dcesrv_sock, dce_ctx);
+
+       status = stream_setup_socket(dcesrv_sock, event_ctx, lp_ctx,
+                                    model_ops, &dcesrv_stream_ops, 
+                                    "unix", full_path, &port, 
+                                    lpcfg_socket_options(lp_ctx),
+                                    dcesrv_sock);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("service_setup_stream_socket(identifier=%s,path=%s) failed - %s\n",
+                        endpoint, full_path, nt_errstr(status)));
+       }
+       return status;
+}
+
+static NTSTATUS dcesrv_add_ep_np(struct dcesrv_context *dce_ctx,
+                                struct loadparm_context *lp_ctx,
+                                struct dcesrv_endpoint *e,
+                                struct tevent_context *event_ctx, const struct model_ops *model_ops)
+{
+       struct dcesrv_socket_context *dcesrv_sock;
+       NTSTATUS status;
+       const char *endpoint;
+
+       endpoint = dcerpc_binding_get_string_option(e->ep_description, "endpoint");
+       if (endpoint == NULL) {
+               DEBUG(0, ("Endpoint mandatory for named pipes\n"));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       dcesrv_sock = talloc(event_ctx, struct dcesrv_socket_context);
+       NT_STATUS_HAVE_NO_MEMORY(dcesrv_sock);
+
+       /* remember the endpoint of this socket */
+       dcesrv_sock->endpoint           = e;
+       dcesrv_sock->dcesrv_ctx         = talloc_reference(dcesrv_sock, dce_ctx);
+
+       status = tstream_setup_named_pipe(dce_ctx, event_ctx, lp_ctx,
+                                         model_ops, &dcesrv_stream_ops,
+                                         endpoint,
+                                         dcesrv_sock);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("stream_setup_named_pipe(pipe=%s) failed - %s\n",
+                        endpoint, nt_errstr(status)));
+               return status;
+       }
+
+       return NT_STATUS_OK;
+}
+
 /*
-  initialise the dcerpc server context for ncacn_np based services
+  add a socket address to the list of events, one event per dcerpc endpoint
 */
-_PUBLIC_ NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
-                                         struct dcesrv_context **_dce_ctx)
+static NTSTATUS add_socket_rpc_tcp_iface(struct dcesrv_context *dce_ctx, struct dcesrv_endpoint *e,
+                                        struct tevent_context *event_ctx, const struct model_ops *model_ops,
+                                        const char *address)
 {
+       struct dcesrv_socket_context *dcesrv_sock;
+       uint16_t port = 0;
        NTSTATUS status;
-       struct dcesrv_context *dce_ctx;
+       const char *endpoint;
+       char port_str[6];
 
-       dcerpc_server_init(lp_ctx);
+       endpoint = dcerpc_binding_get_string_option(e->ep_description, "endpoint");
+       if (endpoint != NULL) {
+               port = atoi(endpoint);
+       }
 
-       status = dcesrv_init_context(mem_ctx, lp_ctx, lp_dcerpc_endpoint_servers(lp_ctx), &dce_ctx);
-       NT_STATUS_NOT_OK_RETURN(status);
+       dcesrv_sock = talloc(event_ctx, struct dcesrv_socket_context);
+       NT_STATUS_HAVE_NO_MEMORY(dcesrv_sock);
+
+       /* remember the endpoint of this socket */
+       dcesrv_sock->endpoint           = e;
+       dcesrv_sock->dcesrv_ctx         = talloc_reference(dcesrv_sock, dce_ctx);
+
+       status = stream_setup_socket(dcesrv_sock, event_ctx, dce_ctx->lp_ctx,
+                                    model_ops, &dcesrv_stream_ops, 
+                                    "ip", address, &port,
+                                    lpcfg_socket_options(dce_ctx->lp_ctx),
+                                    dcesrv_sock);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("service_setup_stream_socket(address=%s,port=%u) failed - %s\n", 
+                        address, port, nt_errstr(status)));
+               return status;
+       }
+
+       snprintf(port_str, sizeof(port_str), "%u", port);
+
+       status = dcerpc_binding_set_string_option(e->ep_description,
+                                                 "endpoint", port_str);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("dcerpc_binding_set_string_option(endpoint, %s) failed - %s\n",
+                        port_str, nt_errstr(status)));
+               return status;
+       }
 
-       *_dce_ctx = dce_ctx;
        return NT_STATUS_OK;
 }
 
+#include "lib/socket/netif.h" /* Included here to work around the fact that socket_wrapper redefines bind() */
+
+static NTSTATUS dcesrv_add_ep_tcp(struct dcesrv_context *dce_ctx, 
+                                 struct loadparm_context *lp_ctx,
+                                 struct dcesrv_endpoint *e,
+                                 struct tevent_context *event_ctx, const struct model_ops *model_ops)
+{
+       NTSTATUS status;
+
+       /* Add TCP/IP sockets */
+       if (lpcfg_interfaces(lp_ctx) && lpcfg_bind_interfaces_only(lp_ctx)) {
+               int num_interfaces;
+               int i;
+               struct interface *ifaces;
+
+               load_interface_list(dce_ctx, lp_ctx, &ifaces);
+
+               num_interfaces = iface_list_count(ifaces);
+               for(i = 0; i < num_interfaces; i++) {
+                       const char *address = iface_list_n_ip(ifaces, i);
+                       status = add_socket_rpc_tcp_iface(dce_ctx, e, event_ctx, model_ops, address);
+                       NT_STATUS_NOT_OK_RETURN(status);
+               }
+       } else {
+               char **wcard;
+               int i;
+               int num_binds = 0;
+               wcard = iface_list_wildcard(dce_ctx);
+               NT_STATUS_HAVE_NO_MEMORY(wcard);
+               for (i=0; wcard[i]; i++) {
+                       status = add_socket_rpc_tcp_iface(dce_ctx, e, event_ctx, model_ops, wcard[i]);
+                       if (NT_STATUS_IS_OK(status)) {
+                               num_binds++;
+                       }
+               }
+               talloc_free(wcard);
+               if (num_binds == 0) {
+                       return NT_STATUS_INVALID_PARAMETER_MIX;
+               }
+       }
+
+       return NT_STATUS_OK;
+}
 
+NTSTATUS dcesrv_add_ep(struct dcesrv_context *dce_ctx,
+                      struct loadparm_context *lp_ctx,
+                      struct dcesrv_endpoint *e,
+                      struct tevent_context *event_ctx,
+                      const struct model_ops *model_ops)
+{
+       enum dcerpc_transport_t transport =
+               dcerpc_binding_get_transport(e->ep_description);
+
+       switch (transport) {
+       case NCACN_UNIX_STREAM:
+               return dcesrv_add_ep_unix(dce_ctx, lp_ctx, e, event_ctx, model_ops);
+
+       case NCALRPC:
+               return dcesrv_add_ep_ncalrpc(dce_ctx, lp_ctx, e, event_ctx, model_ops);
+
+       case NCACN_IP_TCP:
+               return dcesrv_add_ep_tcp(dce_ctx, lp_ctx, e, event_ctx, model_ops);
+
+       case NCACN_NP:
+               return dcesrv_add_ep_np(dce_ctx, lp_ctx, e, event_ctx, model_ops);
+
+       default:
+               return NT_STATUS_NOT_SUPPORTED;
+       }
+}
+
+
+/**
+ * retrieve credentials from a dce_call
+ */
+_PUBLIC_ struct cli_credentials *dcesrv_call_credentials(struct dcesrv_call_state *dce_call)
+{
+       return dce_call->conn->auth_state.session_info->credentials;
+}
+
+/**
+ * returns true if this is an authenticated call
+ */
+_PUBLIC_ bool dcesrv_call_authenticated(struct dcesrv_call_state *dce_call)
+{
+       enum security_user_level level;
+       level = security_session_user_level(dce_call->conn->auth_state.session_info, NULL);
+       return level >= SECURITY_USER;
+}
+
+/**
+ * retrieve account_name for a dce_call
+ */
+_PUBLIC_ const char *dcesrv_call_account_name(struct dcesrv_call_state *dce_call)
+{
+       return dce_call->context->conn->auth_state.session_info->info->account_name;
+}