s4:rpc_server: only pass dcesrv_auth to auth_state.session_key_fn()
[samba.git] / source4 / rpc_server / dcerpc_server.c
index 063e3ff3bdbbe53e0709b31cd072bb797c5a09a2..7ceaf03c673eaa3ad1e3c14e9eba1f771afa4f20 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"
+#include "../lib/util/tevent_ntstatus.h"
+
+static NTSTATUS dcesrv_negotiate_contexts(struct dcesrv_call_state *call,
+                               const struct dcerpc_bind *b,
+                               struct dcerpc_ack_ctx *ack_ctx_list);
+
+/*
+  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(2,(__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;
+       }
 
-#define SAMBA_ASSOC_GROUP 0x12345678
+       assoc_group->id = id;
+       assoc_group->dce_ctx = dce_ctx;
+
+       talloc_set_destructor(assoc_group, dcesrv_assoc_group_destructor);
+
+       return assoc_group;
+}
 
-extern const struct dcesrv_interface dcesrv_mgmt_interface;
 
 /*
   see if two endpoints match
@@ -46,16 +126,28 @@ extern const struct dcesrv_interface dcesrv_mgmt_interface;
 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;
 }
@@ -79,7 +171,7 @@ static struct dcesrv_endpoint *find_endpoint(struct dcesrv_context *dce_ctx,
   find a registered context_id from a bind or alter_context
 */
 static struct dcesrv_connection_context *dcesrv_find_context(struct dcesrv_connection *conn, 
-                                                                  uint32_t context_id)
+                                                            uint16_t context_id)
 {
        struct dcesrv_connection_context *c;
        for (c=conn->contexts;c;c=c->next) {
@@ -99,15 +191,21 @@ static bool interface_match(const struct dcesrv_interface *if1,
 }
 
 /*
-  find the interface operations on an endpoint
+  find the interface operations on any endpoint with this binding
 */
-static const struct dcesrv_interface *find_interface(const struct dcesrv_endpoint *endpoint,
-                                                    const struct dcesrv_interface *iface)
+static const struct dcesrv_interface *find_interface_by_binding(struct dcesrv_context *dce_ctx,
+                                                               struct dcerpc_binding *binding,
+                                                               const struct dcesrv_interface *iface)
 {
-       struct dcesrv_if_list *ifl;
-       for (ifl=endpoint->interface_list; ifl; ifl=ifl->next) {
-               if (interface_match(&(ifl->iface), iface)) {
-                       return &(ifl->iface);
+       struct dcesrv_endpoint *ep;
+       for (ep=dce_ctx->endpoint_list; ep; ep=ep->next) {
+               if (endpoints_match(ep->ep_description, binding)) {
+                       struct dcesrv_if_list *ifl;
+                       for (ifl=ep->interface_list; ifl; ifl=ifl->next) {
+                               if (interface_match(&(ifl->iface), iface)) {
+                                       return &(ifl->iface);
+                               }
+                       }
                }
        }
        return NULL;
@@ -126,8 +224,8 @@ static bool interface_match_by_uuid(const struct dcesrv_interface *iface,
 /*
   find the interface operations on an endpoint by uuid
 */
-static const struct dcesrv_interface *find_interface_by_uuid(const struct dcesrv_endpoint *endpoint,
-                                                            const struct GUID *uuid, uint32_t if_version)
+const struct dcesrv_interface *find_interface_by_uuid(const struct dcesrv_endpoint *endpoint,
+                                                     const struct GUID *uuid, uint32_t if_version)
 {
        struct dcesrv_if_list *ifl;
        for (ifl=endpoint->interface_list; ifl; ifl=ifl->next) {
@@ -141,7 +239,7 @@ static const struct dcesrv_interface *find_interface_by_uuid(const struct dcesrv
 /*
   find the earlier parts of a fragmented call awaiting reassembily
 */
-static struct dcesrv_call_state *dcesrv_find_fragmented_call(struct dcesrv_connection *dce_conn, uint16_t call_id)
+static struct dcesrv_call_state *dcesrv_find_fragmented_call(struct dcesrv_connection *dce_conn, uint32_t call_id)
 {
        struct dcesrv_call_state *c;
        for (c=dce_conn->incoming_fragmented_call_list;c;c=c->next) {
@@ -154,6 +252,15 @@ static struct dcesrv_call_state *dcesrv_find_fragmented_call(struct dcesrv_conne
 
 /*
   register an interface on an endpoint
+
+  An endpoint is one unix domain socket (for ncalrpc), one TCP port
+  (for ncacn_ip_tcp) or one (forwarded) named pipe (for ncacn_np).
+
+  Each endpoint can have many interfaces such as netlogon, lsa or
+  samr.  Some have essentially the full set.
+
+  This is driven from the set of interfaces listed in each IDL file
+  via the PIDL generated *__op_init_server() functions.
 */
 _PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
                                   const char *ep_name,
@@ -165,7 +272,24 @@ _PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
        struct dcerpc_binding *binding;
        bool add_ep = false;
        NTSTATUS status;
-       
+       enum dcerpc_transport_t transport;
+       char *ep_string = NULL;
+       bool use_single_process = true;
+       const char *ep_process_string;
+
+       /*
+        * If we are not using handles, there is no need for force
+        * this service into using a single process.
+        *
+        * However, due to the way we listen for RPC packets, we can
+        * only do this if we have a single service per pipe or TCP
+        * port, so we still force a single combined process for
+        * ncalrpc.
+        */
+       if (iface->flags & DCESRV_INTERFACE_FLAGS_HANDLES_NOT_USED) {
+               use_single_process = false;
+       }
+
        status = dcerpc_parse_binding(dce_ctx, ep_name, &binding);
 
        if (NT_STATUS_IS_ERR(status)) {
@@ -173,38 +297,111 @@ _PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
                return status;
        }
 
+       transport = dcerpc_binding_get_transport(binding);
+       if (transport == NCACN_IP_TCP) {
+               int port;
+               char port_str[6];
+
+               /* 
+                * First check if there is already a port specified, eg
+                * for epmapper on ncacn_ip_tcp:[135]
+                */
+               const char *endpoint
+                       = dcerpc_binding_get_string_option(binding,
+                                                          "endpoint");
+               if (endpoint == NULL) {
+                       port = lpcfg_parm_int(dce_ctx->lp_ctx, NULL,
+                                             "rpc server port", iface->name, 0);
+                       
+                       /*
+                        * For RPC services that are not set to use a single
+                        * process, we do not default to using the 'rpc server
+                        * port' because that would cause a double-bind on
+                        * that port.
+                        */
+                       if (port == 0 && !use_single_process) {
+                               port = lpcfg_rpc_server_port(dce_ctx->lp_ctx);
+                       }
+                       if (port != 0) {
+                               snprintf(port_str, sizeof(port_str), "%u", port);
+                               status = dcerpc_binding_set_string_option(binding,
+                                                                         "endpoint",
+                                                                         port_str);
+                               if (!NT_STATUS_IS_OK(status)) {
+                                       return status;
+                               }
+                       }
+               }
+       }
+
+       /* see if the interface is already registered on the endpoint */
+       if (find_interface_by_binding(dce_ctx, binding, iface)!=NULL) {
+               DEBUG(0,("dcesrv_interface_register: interface '%s' already registered on endpoint '%s'\n",
+                        iface->name, ep_name));
+               return NT_STATUS_OBJECT_NAME_COLLISION;
+       }
+
        /* check if this endpoint exists
         */
-       if ((ep=find_endpoint(dce_ctx, binding))==NULL) {
-               ep = talloc(dce_ctx, struct dcesrv_endpoint);
+       ep = find_endpoint(dce_ctx, binding);
+
+       if (ep != NULL) {
+               /*
+                * We want a new port on ncacn_ip_tcp for NETLOGON, so
+                * it can be multi-process.  Other processes can also
+                * listen on distinct ports, if they have one forced
+                * in the code above with eg 'rpc server port:drsuapi = 1027'
+                *
+                * If we have mulitiple endpoints on port 0, they each
+                * get an epemeral port (currently by walking up from
+                * 1024).
+                *
+                * Because one endpoint can only have one process
+                * model, we add a new IP_TCP endpoint for each model.
+                *
+                * This works in conjunction with the forced overwrite
+                * of ep->use_single_process below.
+                */
+               if (ep->use_single_process != use_single_process
+                   && transport == NCACN_IP_TCP) {
+                       add_ep = true;
+               }
+       }
+
+       if (ep == NULL || add_ep) {
+               ep = talloc_zero(dce_ctx, struct dcesrv_endpoint);
                if (!ep) {
                        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_zero(ep, struct dcesrv_if_list);
                if (!ifl) {
                        return NT_STATUS_NO_MEMORY;
                }
 
-               memcpy(&(ifl->iface), &dcesrv_mgmt_interface, 
-                          sizeof(struct dcesrv_interface));
+               ifl->iface = dcesrv_get_mgmt_interface();
 
                DLIST_ADD(ep->interface_list, ifl);
        }
 
-       /* see if the interface is already registered on te endpoint */
-       if (find_interface(ep, iface)!=NULL) {
-               DEBUG(0,("dcesrv_interface_register: interface '%s' already registered on endpoint '%s'\n",
-                       iface->name, ep_name));
-               return NT_STATUS_OBJECT_NAME_COLLISION;
+       /*
+        * By default don't force into a single process, but if any
+        * interface on this endpoint on this service uses handles
+        * (most do), then we must force into single process mode
+        *
+        * By overwriting this each time a new interface is added to
+        * this endpoint, we end up with the most restrictive setting.
+        */
+       if (use_single_process) {
+               ep->use_single_process = true;
        }
 
        /* talloc a new interface list element */
-       ifl = talloc(dce_ctx, struct dcesrv_if_list);
+       ifl = talloc_zero(ep, struct dcesrv_if_list);
        if (!ifl) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -220,7 +417,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
@@ -245,29 +442,74 @@ _PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
                DLIST_ADD(dce_ctx->endpoint_list, ep);
        }
 
-       DEBUG(4,("dcesrv_interface_register: interface '%s' registered on endpoint '%s'\n",
-               iface->name, ep_name));
+       /* Re-get the string as we may have set a port */
+       ep_string = dcerpc_binding_string(dce_ctx, ep->ep_description);
+
+       if (use_single_process) {
+               ep_process_string = "single process required";
+       } else {
+               ep_process_string = "multi process compatible";
+       }
+
+       DBG_INFO("dcesrv_interface_register: interface '%s' "
+                "registered on endpoint '%s' (%s)\n",
+                iface->name, ep_string, ep_process_string);
+       TALLOC_FREE(ep_string);
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS dcesrv_session_info_session_key(struct dcesrv_auth *auth,
+                                               DATA_BLOB *session_key)
+{
+       if (auth->session_info == NULL) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
+
+       if (auth->session_info->session_key.length == 0) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
 
+       *session_key = auth->session_info->session_key;
        return NT_STATUS_OK;
 }
 
+static NTSTATUS dcesrv_remote_session_key(struct dcesrv_auth *auth,
+                                         DATA_BLOB *session_key)
+{
+       if (auth->auth_type != DCERPC_AUTH_TYPE_NONE) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
+
+       return dcesrv_session_info_session_key(auth, session_key);
+}
+
+static NTSTATUS dcesrv_local_fixed_session_key(struct dcesrv_auth *auth,
+                                              DATA_BLOB *session_key)
+{
+       return dcerpc_generic_session_key(NULL, session_key);
+}
+
 NTSTATUS dcesrv_inherited_session_key(struct dcesrv_connection *p,
                                      DATA_BLOB *session_key)
 {
-       if (p->auth_state.session_info->session_key.length) {
-               *session_key = p->auth_state.session_info->session_key;
-               return NT_STATUS_OK;
-       }
-       return NT_STATUS_NO_USER_SESSION_KEY;
+       struct dcesrv_auth *auth = &p->auth_state;
+
+       return dcesrv_remote_session_key(auth, session_key);
 }
 
-NTSTATUS dcesrv_generic_session_key(struct dcesrv_connection *p,
-                                   DATA_BLOB *session_key)
+/*
+ * Fetch the authentication session key if available.
+ *
+ * This is the key generated by a gensec authentication.
+ *
+ */
+_PUBLIC_ NTSTATUS dcesrv_auth_session_key(struct dcesrv_call_state *call,
+                                         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;
+       struct dcesrv_auth *auth = &call->conn->auth_state;
+
+       return dcesrv_session_info_session_key(auth, session_key);
 }
 
 /*
@@ -278,7 +520,14 @@ NTSTATUS dcesrv_generic_session_key(struct dcesrv_connection *p,
 _PUBLIC_ NTSTATUS dcesrv_fetch_session_key(struct dcesrv_connection *p,
                                  DATA_BLOB *session_key)
 {
-       NTSTATUS status = p->auth_state.session_key(p, session_key);
+       struct dcesrv_auth *auth = &p->auth_state;
+       NTSTATUS status;
+
+       if (auth->session_key_fn == NULL) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
+
+       status = auth->session_key_fn(auth, session_key);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -288,46 +537,41 @@ _PUBLIC_ NTSTATUS dcesrv_fetch_session_key(struct dcesrv_connection *p,
        return NT_STATUS_OK;
 }
 
-
 /*
-  destroy a link to an endpoint
+ * Fetch the transport session key if available.
+ * Typically this is the SMB session key
+ * or a fixed key for local transports.
+ *
+ * The key is always truncated to 16 bytes.
 */
-static int dcesrv_endpoint_destructor(struct dcesrv_connection *p)
+_PUBLIC_ NTSTATUS dcesrv_transport_session_key(struct dcesrv_call_state *call,
+                                              DATA_BLOB *session_key)
 {
-       while (p->contexts) {
-               struct dcesrv_connection_context *c = p->contexts;
-
-               DLIST_REMOVE(p->contexts, c);
-
-               if (c->iface) {
-                       c->iface->unbind(c, c->iface);
-               }
-       }
-
-       return 0;
+       return dcesrv_fetch_session_key(call->conn, session_key);
 }
 
-
 /*
   connect to a dcerpc endpoint
 */
-_PUBLIC_ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
+static 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)
 {
+       enum dcerpc_transport_t transport =
+               dcerpc_binding_get_transport(ep->ep_description);
        struct dcesrv_connection *p;
 
        if (!session_info) {
                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)) {
@@ -337,82 +581,42 @@ _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->auth_state.session_info = session_info;
-       p->auth_state.session_key = dcesrv_generic_session_key;
+       p->packet_log_dir = lpcfg_lock_directory(dce_ctx->lp_ctx);
        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);
-
-       talloc_set_destructor(p, dcesrv_endpoint_destructor);
-
-       *_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;
+       p->allow_bind = true;
+       p->max_recv_frag = 5840;
+       p->max_xmit_frag = 5840;
+       p->max_total_request_size = DCERPC_NCACN_REQUEST_DEFAULT_MAX_SIZE;
 
-       /* make sure this endpoint exists */
-       ep = find_endpoint(dce_ctx, ep_description);
-       if (!ep) {
-               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       p->auth_state.session_info = session_info;
+       switch (transport) {
+       case NCACN_NP:
+               p->auth_state.session_key_fn = dcesrv_remote_session_key;
+               break;
+       case NCALRPC:
+       case NCACN_UNIX_STREAM:
+               p->auth_state.session_key_fn = dcesrv_local_fixed_session_key;
+               break;
+       default:
+               /*
+                * All other's get a NULL pointer, which
+                * results in NT_STATUS_NO_USER_SESSION_KEY
+                */
+               break;
        }
 
-       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
+       /*
+        * For now we only support NDR32.
         */
+       p->preferred_transfer = &ndr_transfer_syntax_ndr;
 
+       *_p = 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
@@ -439,591 +643,632 @@ 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)
+static void dcesrv_call_disconnect_after(struct dcesrv_call_state *call,
+                                        const char *reason)
 {
-       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;
+       if (call->conn->terminate != NULL) {
+               return;
        }
 
-       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);
+       call->conn->allow_bind = false;
+       call->conn->allow_alter = false;
+       call->conn->allow_auth3 = false;
+       call->conn->allow_request = false;
 
-       return NT_STATUS_OK;    
+       call->terminate_reason = talloc_strdup(call, reason);
+       if (call->terminate_reason == NULL) {
+               call->terminate_reason = __location__;
+       }
 }
 
-
 /*
   return a dcerpc bind_nak
 */
 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;
+       static const uint8_t _pad[3] = { 0, };
+
+       /*
+        * We add the call to the pending_call_list
+        * in order to defer the termination.
+        */
+       dcesrv_call_disconnect_after(call, "dcesrv_bind_nak");
 
        /* 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_const(_pad, sizeof(_pad));
 
-       rep = talloc(call, struct data_blob_list_item);
+       rep = talloc_zero(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;    
 }
 
-
-/*
-  handle a bind request
-*/
-static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
+static NTSTATUS dcesrv_fault_disconnect(struct dcesrv_call_state *call,
+                                uint32_t fault_code)
 {
-       uint32_t if_version, transfer_syntax_version;
-       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;
-       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
+        * We add the call to the pending_call_list
+        * in order to defer the termination.
         */
-       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) {
-               return dcesrv_bind_nak(call, 0);        
-       }
+       dcesrv_call_disconnect_after(call, "dcesrv_fault_disconnect");
 
-       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);
-       }
+       return dcesrv_fault_with_flags(call, fault_code,
+                                      DCERPC_PFC_FLAG_DID_NOT_EXECUTE);
+}
 
-       context_id = call->pkt.u.bind.ctx_list[0].context_id;
+static int dcesrv_connection_context_destructor(struct dcesrv_connection_context *c)
+{
+       DLIST_REMOVE(c->conn->contexts, c);
 
-       /* you can't bind twice on one context */
-       if (dcesrv_find_context(call->conn, context_id) != NULL) {
-               return dcesrv_bind_nak(call, 0);
+       if (c->iface && c->iface->unbind) {
+               c->iface->unbind(c, c->iface);
+               c->iface = NULL;
        }
 
-       if_version = call->pkt.u.bind.ctx_list[0].abstract_syntax.if_version;
-       uuid = call->pkt.u.bind.ctx_list[0].abstract_syntax.uuid;
+       return 0;
+}
 
-       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) {
-               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);
-       }
+static void dcesrv_prepare_context_auth(struct dcesrv_call_state *dce_call)
+{
+       struct loadparm_context *lp_ctx = dce_call->conn->dce_ctx->lp_ctx;
+       const struct dcesrv_endpoint *endpoint = dce_call->conn->endpoint;
+       enum dcerpc_transport_t transport =
+               dcerpc_binding_get_transport(endpoint->ep_description);
+       struct dcesrv_connection_context *context = dce_call->context;
+       const struct dcesrv_interface *iface = context->iface;
 
-       iface = find_interface_by_uuid(call->conn->endpoint, &uuid, if_version);
-       if (iface == NULL) {
-               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);
+       context->min_auth_level = DCERPC_AUTH_LEVEL_NONE;
 
-               /* we don't know about that interface */
-               result = DCERPC_BIND_PROVIDER_REJECT;
-               reason = DCERPC_BIND_REASON_ASYNTAX;            
+       if (transport == NCALRPC) {
+               context->allow_connect = true;
+               return;
        }
 
-       if (iface) {
-               /* add this context to the list of available context_ids */
-               struct dcesrv_connection_context *context = talloc(call->conn, 
-                                                                  struct dcesrv_connection_context);
-               if (context == NULL) {
-                       return dcesrv_bind_nak(call, 0);
-               }
-               context->conn = call->conn;
-               context->iface = iface;
-               context->context_id = context_id;
-               /*
-                * 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;
-               DLIST_ADD(call->conn->contexts, context);
-               call->context = context;
-       }
+       /*
+        * allow overwrite per interface
+        * allow dcerpc auth level connect:<interface>
+        */
+       context->allow_connect = lpcfg_allow_dcerpc_auth_level_connect(lp_ctx);
+       context->allow_connect = lpcfg_parm_bool(lp_ctx, NULL,
+                                       "allow dcerpc auth level connect",
+                                       iface->name,
+                                       context->allow_connect);
+}
 
-       if (call->conn->cli_max_recv_frag == 0) {
-               call->conn->cli_max_recv_frag = call->pkt.u.bind.max_recv_frag;
+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;
        }
 
-       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;
-       }
+       /*
+        * For connection oriented DCERPC DCERPC_AUTH_LEVEL_PACKET (4)
+        * has the same behavior as DCERPC_AUTH_LEVEL_INTEGRITY (5).
+        */
+       dce_call->context->min_auth_level = DCERPC_AUTH_LEVEL_PACKET;
+       return NT_STATUS_OK;
+}
 
-       /* handle any authentication that is being requested */
-       if (!dcesrv_auth_bind(call)) {
-               return dcesrv_bind_nak(call, DCERPC_BIND_REASON_INVALID_AUTH_TYPE);
+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;
        }
 
-       /* 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_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_recv_frag = 0x2000;
-       pkt.u.bind_ack.assoc_group_id = call->context->assoc_group_id;
-       if (iface) {
-               /* FIXME: Use pipe name as specified by endpoint instead of interface name */
-               pkt.u.bind_ack.secondary_address = talloc_asprintf(call, "\\PIPE\\%s", iface->name);
-       } else {
-               pkt.u.bind_ack.secondary_address = "";
-       }
-       pkt.u.bind_ack.num_results = 1;
-       pkt.u.bind_ack.ctx_list = talloc(call, struct dcerpc_ack_ctx);
-       if (!pkt.u.bind_ack.ctx_list) {
-               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.auth_info = data_blob(NULL, 0);
+       dce_call->context->min_auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
+       return NT_STATUS_OK;
+}
 
-       status = dcesrv_auth_bind_ack(call, &pkt);
-       if (!NT_STATUS_IS_OK(status)) {
-               return dcesrv_bind_nak(call, 0);
-       }
+_PUBLIC_ NTSTATUS dcesrv_interface_bind_reject_connect(struct dcesrv_call_state *dce_call,
+                                                      const struct dcesrv_interface *iface)
+{
+       struct loadparm_context *lp_ctx = dce_call->conn->dce_ctx->lp_ctx;
+       const struct dcesrv_endpoint *endpoint = dce_call->conn->endpoint;
+       enum dcerpc_transport_t transport =
+               dcerpc_binding_get_transport(endpoint->ep_description);
+       struct dcesrv_connection_context *context = dce_call->context;
 
-       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_str, if_version, nt_errstr(status)));
-                       talloc_free(uuid_str);
-                       return dcesrv_bind_nak(call, 0);
-               }
+       if (context == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
        }
 
-       /* the iface->bind() might change the assoc_group_id */
-       pkt.u.bind_ack.assoc_group_id = call->context->assoc_group_id;
-
-       rep = talloc(call, struct data_blob_list_item);
-       if (!rep) {
-               return NT_STATUS_NO_MEMORY;
+       if (transport == NCALRPC) {
+               context->allow_connect = true;
+               return NT_STATUS_OK;
        }
 
-       status = ncacn_push_auth(&rep->blob, call, lp_iconv_convenience(call->conn->dce_ctx->lp_ctx), &pkt, call->conn->auth_state.auth_info);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       /*
+        * allow overwrite per interface
+        * allow dcerpc auth level connect:<interface>
+        */
+       context->allow_connect = false;
+       context->allow_connect = lpcfg_parm_bool(lp_ctx, NULL,
+                                       "allow dcerpc auth level connect",
+                                       iface->name,
+                                       context->allow_connect);
+       return NT_STATUS_OK;
+}
 
-       dcerpc_set_frag_length(&rep->blob, rep->blob.length);
+_PUBLIC_ NTSTATUS dcesrv_interface_bind_allow_connect(struct dcesrv_call_state *dce_call,
+                                                     const struct dcesrv_interface *iface)
+{
+       struct loadparm_context *lp_ctx = dce_call->conn->dce_ctx->lp_ctx;
+       const struct dcesrv_endpoint *endpoint = dce_call->conn->endpoint;
+       enum dcerpc_transport_t transport =
+               dcerpc_binding_get_transport(endpoint->ep_description);
+       struct dcesrv_connection_context *context = dce_call->context;
 
-       DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
-       dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
+       if (context == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       if (transport == NCALRPC) {
+               context->allow_connect = true;
+               return NT_STATUS_OK;
+       }
 
+       /*
+        * allow overwrite per interface
+        * allow dcerpc auth level connect:<interface>
+        */
+       context->allow_connect = true;
+       context->allow_connect = lpcfg_parm_bool(lp_ctx, NULL,
+                                       "allow dcerpc auth level connect",
+                                       iface->name,
+                                       context->allow_connect);
        return NT_STATUS_OK;
 }
 
+struct dcesrv_conn_auth_wait_context {
+       struct tevent_req *req;
+       bool done;
+       NTSTATUS status;
+};
 
-/*
-  handle a auth3 request
-*/
-static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
+struct dcesrv_conn_auth_wait_state {
+       uint8_t dummy;
+};
+
+static struct tevent_req *dcesrv_conn_auth_wait_send(TALLOC_CTX *mem_ctx,
+                                                    struct tevent_context *ev,
+                                                    void *private_data)
 {
-       /* handle the auth3 in the auth code */
-       if (!dcesrv_auth_auth3(call)) {
-               return dcesrv_fault(call, DCERPC_FAULT_OTHER);
+       struct dcesrv_conn_auth_wait_context *auth_wait =
+               talloc_get_type_abort(private_data,
+               struct dcesrv_conn_auth_wait_context);
+       struct tevent_req *req = NULL;
+       struct dcesrv_conn_auth_wait_state *state = NULL;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct dcesrv_conn_auth_wait_state);
+       if (req == NULL) {
+               return NULL;
        }
+       auth_wait->req = req;
 
-       talloc_free(call);
+       tevent_req_defer_callback(req, ev);
 
-       /* we don't send a reply to a auth3 request, except by a
-          fault */
-       return NT_STATUS_OK;
-}
+       if (!auth_wait->done) {
+               return req;
+       }
 
+       if (tevent_req_nterror(req, auth_wait->status)) {
+               return tevent_req_post(req, ev);
+       }
 
-/*
-  handle a bind request
-*/
-static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_t context_id)
+       tevent_req_done(req);
+       return tevent_req_post(req, ev);
+}
+
+static NTSTATUS dcesrv_conn_auth_wait_recv(struct tevent_req *req)
 {
-       uint32_t if_version, transfer_syntax_version;
-       struct dcesrv_connection_context *context;
-       const struct dcesrv_interface *iface;
-       struct GUID uuid, *transfer_syntax_uuid;
-       NTSTATUS status;
+       return tevent_req_simple_recv_ntstatus(req);
+}
 
-       if_version = call->pkt.u.alter.ctx_list[0].abstract_syntax.if_version;
-       uuid = call->pkt.u.alter.ctx_list[0].abstract_syntax.uuid;
+static NTSTATUS dcesrv_conn_auth_wait_setup(struct dcesrv_connection *conn)
+{
+       struct dcesrv_conn_auth_wait_context *auth_wait = NULL;
 
-       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) {
-               /* we only do NDR encoded dcerpc */
-               return NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED;
+       if (conn->wait_send != NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
        }
 
-       iface = find_interface_by_uuid(call->conn->endpoint, &uuid, if_version);
-       if (iface == NULL) {
-               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;
+       auth_wait = talloc_zero(conn, struct dcesrv_conn_auth_wait_context);
+       if (auth_wait == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       /* add this context to the list of available context_ids */
-       context = talloc(call->conn, struct dcesrv_connection_context);
-       if (context == NULL) {
-               return NT_STATUS_NO_MEMORY;
+       conn->wait_private = auth_wait;
+       conn->wait_send = dcesrv_conn_auth_wait_send;
+       conn->wait_recv = dcesrv_conn_auth_wait_recv;
+       return NT_STATUS_OK;
+}
+
+static void dcesrv_conn_auth_wait_finished(struct dcesrv_connection *conn,
+                                          NTSTATUS status)
+{
+       struct dcesrv_conn_auth_wait_context *auth_wait =
+               talloc_get_type_abort(conn->wait_private,
+               struct dcesrv_conn_auth_wait_context);
+
+       auth_wait->done = true;
+       auth_wait->status = status;
+
+       if (auth_wait->req == NULL) {
+               return;
        }
-       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;
-       DLIST_ADD(call->conn->contexts, context);
-       call->context = context;
 
-       if (iface) {
-               status = iface->bind(call, iface);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
+       if (tevent_req_nterror(auth_wait->req, status)) {
+               return;
        }
 
-       return NT_STATUS_OK;
+       tevent_req_done(auth_wait->req);
 }
 
+static NTSTATUS dcesrv_auth_reply(struct dcesrv_call_state *call);
+
+static void dcesrv_bind_done(struct tevent_req *subreq);
 
 /*
-  handle a alter context request
+  handle a bind request
 */
-static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
+static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
 {
-       struct ncacn_packet pkt;
-       struct data_blob_list_item *rep;
+       struct dcesrv_connection *conn = call->conn;
+       struct ncacn_packet *pkt = &call->ack_pkt;
        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;
-                       }
-               }
+       uint32_t extra_flags = 0;
+       uint16_t max_req = 0;
+       uint16_t max_rep = 0;
+       const char *ep_prefix = "";
+       const char *endpoint = NULL;
+       struct dcesrv_auth *auth = &call->conn->auth_state;
+       struct dcerpc_ack_ctx *ack_ctx_list = NULL;
+       struct dcerpc_ack_ctx *ack_features = NULL;
+       struct tevent_req *subreq = NULL;
+       size_t i;
+
+       status = dcerpc_verify_ncacn_packet_header(&call->pkt,
+                       DCERPC_PKT_BIND,
+                       call->pkt.u.bind.auth_info.length,
+                       0, /* required flags */
+                       DCERPC_PFC_FLAG_FIRST |
+                       DCERPC_PFC_FLAG_LAST |
+                       DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN |
+                       0x08 | /* this is not defined, but should be ignored */
+                       DCERPC_PFC_FLAG_CONC_MPX |
+                       DCERPC_PFC_FLAG_DID_NOT_EXECUTE |
+                       DCERPC_PFC_FLAG_MAYBE |
+                       DCERPC_PFC_FLAG_OBJECT_UUID);
+       if (!NT_STATUS_IS_OK(status)) {
+               return dcesrv_bind_nak(call,
+                       DCERPC_BIND_NAK_REASON_PROTOCOL_VERSION_NOT_SUPPORTED);
        }
 
-       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;
-       }
+       /* max_recv_frag and max_xmit_frag result always in the same value! */
+       max_req = MIN(call->pkt.u.bind.max_xmit_frag,
+                     call->pkt.u.bind.max_recv_frag);
+       /*
+        * The values are between 2048 and 5840 tested against Windows 2012R2
+        * via ncacn_ip_tcp on port 135.
+        */
+       max_req = MAX(2048, max_req);
+       max_rep = MIN(max_req, call->conn->max_recv_frag);
+       /* They are truncated to an 8 byte boundary. */
+       max_rep &= 0xFFF8;
 
-       /* setup a alter_resp */
-       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_ALTER_RESP;
-       pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
-       pkt.u.alter_resp.max_xmit_frag = 0x2000;
-       pkt.u.alter_resp.max_recv_frag = 0x2000;
-       if (result == 0) {
-               pkt.u.alter_resp.assoc_group_id = call->context->assoc_group_id;
+       /* max_recv_frag and max_xmit_frag result always in the same value! */
+       call->conn->max_recv_frag = max_rep;
+       call->conn->max_xmit_frag = max_rep;
+
+       /*
+         if provided, check the assoc_group is valid
+        */
+       if (call->pkt.u.bind.assoc_group_id != 0) {
+               call->conn->assoc_group = dcesrv_assoc_group_reference(call->conn,
+                                                                      call->conn->dce_ctx,
+                                                                      call->pkt.u.bind.assoc_group_id);
        } else {
-               pkt.u.alter_resp.assoc_group_id = 0;
+               call->conn->assoc_group = dcesrv_assoc_group_new(call->conn,
+                                                                call->conn->dce_ctx);
        }
-       pkt.u.alter_resp.num_results = 1;
-       pkt.u.alter_resp.ctx_list = talloc_array(call, struct dcerpc_ack_ctx, 1);
-       if (!pkt.u.alter_resp.ctx_list) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       pkt.u.alter_resp.ctx_list[0].result = result;
-       pkt.u.alter_resp.ctx_list[0].reason = reason;
-       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 = "";
 
-       status = dcesrv_auth_alter_ack(call, &pkt);
-       if (!NT_STATUS_IS_OK(status)) {
-               if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)
-                   || NT_STATUS_EQUAL(status, NT_STATUS_LOGON_FAILURE)
-                   || NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)
-                   || NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) {
-                       return dcesrv_fault(call, DCERPC_FAULT_ACCESS_DENIED);
-               }
-               return dcesrv_fault(call, 0);
+       /*
+        * The NETLOGON server does not use handles and so
+        * there is no need to support association groups, but
+        * we need to give back a number regardless.
+        *
+        * We have to do this when it is not run as a single process,
+        * because then it can't see the other valid association
+        * groups.  We handle this genericly for all endpoints not
+        * running in single process mode.
+        *
+        * We know which endpoint we are on even before checking the
+        * iface UUID, so for simplicity we enforce the same policy
+        * for all interfaces on the endpoint.
+        *
+        * This means that where NETLOGON
+        * shares an endpoint (such as ncalrpc or of 'lsa over
+        * netlogon' is set) we will still check association groups.
+        *
+        */
+
+       if (call->conn->assoc_group == NULL &&
+           !call->conn->endpoint->use_single_process) {
+               call->conn->assoc_group
+                       = dcesrv_assoc_group_new(call->conn,
+                                                call->conn->dce_ctx);
+       }
+       if (call->conn->assoc_group == NULL) {
+               return dcesrv_bind_nak(call, 0);
        }
 
-       rep = talloc(call, struct data_blob_list_item);
-       if (!rep) {
-               return NT_STATUS_NO_MEMORY;
+       if (call->pkt.u.bind.num_contexts < 1) {
+               return dcesrv_bind_nak(call, 0);
        }
 
-       status = ncacn_push_auth(&rep->blob, call, lp_iconv_convenience(call->conn->dce_ctx->lp_ctx), &pkt, call->conn->auth_state.auth_info);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
+       ack_ctx_list = talloc_zero_array(call, struct dcerpc_ack_ctx,
+                                        call->pkt.u.bind.num_contexts);
+       if (ack_ctx_list == NULL) {
+               return dcesrv_bind_nak(call, 0);
        }
 
-       dcerpc_set_frag_length(&rep->blob, rep->blob.length);
+       /*
+        * Set some sane defaults (required by dcesrv_negotiate_contexts()/
+        * dcesrv_check_or_create_context()) and do some protocol validation
+        * and set sane defaults.
+        */
+       for (i = 0; i < call->pkt.u.bind.num_contexts; i++) {
+               const struct dcerpc_ctx_list *c = &call->pkt.u.bind.ctx_list[i];
+               struct dcerpc_ack_ctx *a = &ack_ctx_list[i];
+               bool is_feature = false;
+               uint64_t features = 0;
 
-       DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
-       dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
+               if (c->num_transfer_syntaxes == 0) {
+                       return dcesrv_bind_nak(call, 0);
+               }
 
-       return NT_STATUS_OK;
-}
+               a->result = DCERPC_BIND_ACK_RESULT_PROVIDER_REJECTION;
+               a->reason.value = DCERPC_BIND_ACK_REASON_ABSTRACT_SYNTAX_NOT_SUPPORTED;
 
-/*
-  handle a dcerpc request packet
-*/
-static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
-{
-       struct ndr_pull *pull;
-       NTSTATUS status;
-       struct dcesrv_connection_context *context;
+               /*
+                * It's only treated as bind time feature request, if the first
+                * transfer_syntax matches, all others are ignored.
+                */
+               is_feature = dcerpc_extract_bind_time_features(c->transfer_syntaxes[0],
+                                                              &features);
+               if (!is_feature) {
+                       continue;
+               }
 
-       /* 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;
+               if (ack_features != NULL) {
+                       /*
+                        * Only one bind time feature context is allowed.
+                        */
+                       return dcesrv_bind_nak(call, 0);
+               }
+               ack_features = a;
+
+               a->result = DCERPC_BIND_ACK_RESULT_NEGOTIATE_ACK;
+               a->reason.negotiate = 0;
+               if (features & DCERPC_BIND_TIME_SECURITY_CONTEXT_MULTIPLEXING) {
+                       /* not supported yet */
+               }
+               if (features & DCERPC_BIND_TIME_KEEP_CONNECTION_ON_ORPHAN) {
+                       a->reason.negotiate |=
+                               DCERPC_BIND_TIME_KEEP_CONNECTION_ON_ORPHAN;
+               }
+
+               call->conn->bind_time_features = a->reason.negotiate;
        }
 
-       context = dcesrv_find_context(call->conn, call->pkt.u.request.context_id);
-       if (context == NULL) {
-               return dcesrv_fault(call, DCERPC_FAULT_UNK_IF);
+       /*
+        * Try to negotiate one new presentation context.
+        *
+        * Deep in here we locate the iface (by uuid) that the client
+        * requested, from the list of interfaces on the
+        * call->conn->endpoint, and call iface->bind() on that iface.
+        *
+        * call->conn was set up at the accept() of the socket, and
+        * call->conn->endpoint has a list of interfaces restricted to
+        * this port or pipe.
+        */
+       status = dcesrv_negotiate_contexts(call, &call->pkt.u.bind, ack_ctx_list);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROTOCOL_ERROR)) {
+               return dcesrv_bind_nak(call, 0);
+       }
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       pull = ndr_pull_init_blob(&call->pkt.u.request.stub_and_verifier, call,
-                                 lp_iconv_convenience(call->conn->dce_ctx->lp_ctx));
-       NT_STATUS_HAVE_NO_MEMORY(pull);
+       /*
+        * At this point we still don't know which interface (eg
+        * netlogon, lsa, drsuapi) the caller requested in this bind!
+        * The most recently added context is available as the first
+        * element in the linked list at call->conn->contexts, that is
+        * call->conn->contexts->iface, but they may not have
+        * requested one at all!
+        */
 
-       pull->flags |= LIBNDR_FLAG_REF_ALLOC;
+       if ((call->pkt.pfc_flags & DCERPC_PFC_FLAG_CONC_MPX) &&
+           (call->state_flags & DCESRV_CALL_STATE_FLAG_MULTIPLEXED)) {
+               call->conn->state_flags |= DCESRV_CALL_STATE_FLAG_MULTIPLEXED;
+               extra_flags |= DCERPC_PFC_FLAG_CONC_MPX;
+       }
 
-       call->context   = context;
-       call->ndr_pull  = pull;
+       if (call->state_flags & DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL) {
+               call->conn->state_flags |= DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL;
+       }
 
-       if (!(call->pkt.drep[0] & DCERPC_DREP_LE)) {
-               pull->flags |= LIBNDR_FLAG_BIGENDIAN;
+       /*
+        * After finding the interface and setting up the NDR
+        * transport negotiation etc, handle any authentication that
+        * is being requested.
+        */
+       if (!dcesrv_auth_bind(call)) {
+
+               if (auth->auth_level == DCERPC_AUTH_LEVEL_NONE) {
+                       /*
+                        * With DCERPC_AUTH_LEVEL_NONE, we get the
+                        * reject_reason in auth->auth_context_id.
+                        */
+                       return dcesrv_bind_nak(call, auth->auth_context_id);
+               }
+
+               /*
+                * This must a be a temporary failure e.g. talloc or invalid
+                * configuration, e.g. no machine account.
+                */
+               return dcesrv_bind_nak(call,
+                               DCERPC_BIND_NAK_REASON_TEMPORARY_CONGESTION);
        }
 
-       /* unravel the NDR for the packet */
-       status = context->iface->ndr_pull(call, call, pull, &call->r);
-       if (!NT_STATUS_IS_OK(status)) {
-               return dcesrv_fault(call, call->fault_code);
+       /* setup a bind_ack */
+       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 = call->conn->max_xmit_frag;
+       pkt->u.bind_ack.max_recv_frag = call->conn->max_recv_frag;
+       pkt->u.bind_ack.assoc_group_id = call->conn->assoc_group->id;
+
+       endpoint = dcerpc_binding_get_string_option(
+                               call->conn->endpoint->ep_description,
+                               "endpoint");
+       if (endpoint == NULL) {
+               endpoint = "";
+       }
+
+       if (strncasecmp(endpoint, "\\pipe\\", 6) == 0) {
+               /*
+                * TODO: check if this is really needed
+                *
+                * Or if we should fix this in our idl files.
+                */
+               ep_prefix = "\\PIPE\\";
+               endpoint += 6;
        }
 
-       if (pull->offset != pull->data_size) {
-               DEBUG(3,("Warning: %d extra bytes in incoming RPC request\n", 
-                        pull->data_size - pull->offset));
-               dump_data(10, pull->data+pull->offset, pull->data_size - pull->offset);
+       pkt->u.bind_ack.secondary_address = talloc_asprintf(call, "%s%s",
+                                                          ep_prefix,
+                                                          endpoint);
+       if (pkt->u.bind_ack.secondary_address == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
+       pkt->u.bind_ack.num_results = call->pkt.u.bind.num_contexts;
+       pkt->u.bind_ack.ctx_list = ack_ctx_list;
+       pkt->u.bind_ack.auth_info = data_blob_null;
 
-       /* call the dispatch function */
-       status = context->iface->dispatch(call, call, call->r);
+       status = dcesrv_auth_prepare_bind_ack(call, pkt);
        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);
+               return dcesrv_bind_nak(call, 0);
        }
 
-       /* add the call to the pending list */
-       dcesrv_call_set_list(call, DCESRV_LIST_PENDING_CALL_LIST);
+       if (auth->auth_finished) {
+               return dcesrv_auth_reply(call);
+       }
 
-       if (call->state_flags & DCESRV_CALL_STATE_FLAG_ASYNC) {
-               return NT_STATUS_OK;
+       subreq = gensec_update_send(call, call->event_ctx,
+                                   auth->gensec_security,
+                                   call->in_auth_info.credentials);
+       if (subreq == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
+       tevent_req_set_callback(subreq, dcesrv_bind_done, call);
 
-       return dcesrv_reply(call);
+       return dcesrv_conn_auth_wait_setup(conn);
 }
 
-_PUBLIC_ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call)
+static void dcesrv_bind_done(struct tevent_req *subreq)
 {
-       struct ndr_push *push;
+       struct dcesrv_call_state *call =
+               tevent_req_callback_data(subreq,
+               struct dcesrv_call_state);
+       struct dcesrv_connection *conn = call->conn;
        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);
+       status = gensec_update_recv(subreq, call,
+                                   &call->out_auth_info->credentials);
+       TALLOC_FREE(subreq);
+
+       status = dcesrv_auth_complete(call, status);
        if (!NT_STATUS_IS_OK(status)) {
-               return dcesrv_fault(call, call->fault_code);
+               status = dcesrv_bind_nak(call, 0);
+               dcesrv_conn_auth_wait_finished(conn, status);
+               return;
        }
 
-       /* 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);
+       status = dcesrv_auth_reply(call);
+       dcesrv_conn_auth_wait_finished(conn, status);
+       return;
+}
 
-       /* 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;
+static NTSTATUS dcesrv_auth_reply(struct dcesrv_call_state *call)
+{
+       struct ncacn_packet *pkt = &call->ack_pkt;
+       struct data_blob_list_item *rep = NULL;
+       NTSTATUS status;
 
-       if (lp_rpc_big_endian(call->conn->dce_ctx->lp_ctx)) {
-               push->flags |= LIBNDR_FLAG_BIGENDIAN;
+       rep = talloc_zero(call, struct data_blob_list_item);
+       if (!rep) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       status = context->iface->ndr_push(call, call, push, call->r);
+       status = ncacn_push_auth(&rep->blob, call, pkt,
+                                call->out_auth_info);
        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;
-               }
+               return status;
        }
-       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);
+       dcerpc_set_frag_length(&rep->blob, rep->blob.length);
 
-       /* move the call from the pending to the finished calls list */
+       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) {
@@ -1035,430 +1280,1975 @@ _PUBLIC_ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call)
        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);
-}
+static void dcesrv_auth3_done(struct tevent_req *subreq);
 
-_PUBLIC_ struct socket_address *dcesrv_connection_get_peer_addr(struct dcesrv_connection *conn, TALLOC_CTX *mem_ctx)
+/*
+  handle a auth3 request
+*/
+static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
 {
-       if (!conn->transport.get_peer_addr) {
-               return NULL;
+       struct dcesrv_connection *conn = call->conn;
+       struct dcesrv_auth *auth = &call->conn->auth_state;
+       struct tevent_req *subreq = NULL;
+       NTSTATUS status;
+
+       if (!call->conn->allow_auth3) {
+               return dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
        }
 
-       return conn->transport.get_peer_addr(conn, mem_ctx);
-}
+       if (call->conn->auth_state.auth_finished) {
+               return dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
+       }
 
-/*
-  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;
+       status = dcerpc_verify_ncacn_packet_header(&call->pkt,
+                       DCERPC_PKT_AUTH3,
+                       call->pkt.u.auth3.auth_info.length,
+                       0, /* required flags */
+                       DCERPC_PFC_FLAG_FIRST |
+                       DCERPC_PFC_FLAG_LAST |
+                       DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN |
+                       0x08 | /* this is not defined, but should be ignored */
+                       DCERPC_PFC_FLAG_CONC_MPX |
+                       DCERPC_PFC_FLAG_DID_NOT_EXECUTE |
+                       DCERPC_PFC_FLAG_MAYBE |
+                       DCERPC_PFC_FLAG_OBJECT_UUID);
+       if (!NT_STATUS_IS_OK(status)) {
+               return dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
        }
-       if (dcerpc_get_frag_length(data) > data->length) {
-               return false;
+
+       /* handle the auth3 in the auth code */
+       if (!dcesrv_auth_prepare_auth3(call)) {
+               /*
+                * we don't send a reply to a auth3 request,
+                * except by a fault.
+                *
+                * In anycase we mark the connection as
+                * invalid.
+                */
+               call->conn->auth_state.auth_invalid = true;
+               if (call->fault_code != 0) {
+                       return dcesrv_fault_disconnect(call, call->fault_code);
+               }
+               TALLOC_FREE(call);
+               return NT_STATUS_OK;
        }
-       return true;
+
+       subreq = gensec_update_send(call, call->event_ctx,
+                                   auth->gensec_security,
+                                   call->in_auth_info.credentials);
+       if (subreq == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       tevent_req_set_callback(subreq, dcesrv_auth3_done, call);
+
+       return dcesrv_conn_auth_wait_setup(conn);
 }
 
-/*
-  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)
+static void dcesrv_auth3_done(struct tevent_req *subreq)
 {
-       DATA_BLOB blob;
+       struct dcesrv_call_state *call =
+               tevent_req_callback_data(subreq,
+               struct dcesrv_call_state);
+       struct dcesrv_connection *conn = call->conn;
+       NTSTATUS status;
 
-       if (dce_conn->partial_input.length == offset) {
-               data_blob_free(&dce_conn->partial_input);
+       status = gensec_update_recv(subreq, call,
+                                   &call->out_auth_info->credentials);
+       TALLOC_FREE(subreq);
+
+       status = dcesrv_auth_complete(call, status);
+       if (!NT_STATUS_IS_OK(status)) {
+               /*
+                * we don't send a reply to a auth3 request,
+                * except by a fault.
+                *
+                * In anycase we mark the connection as
+                * invalid.
+                */
+               call->conn->auth_state.auth_invalid = true;
+               if (call->fault_code != 0) {
+                       status = dcesrv_fault_disconnect(call, call->fault_code);
+                       dcesrv_conn_auth_wait_finished(conn, status);
+                       return;
+               }
+               TALLOC_FREE(call);
+               dcesrv_conn_auth_wait_finished(conn, NT_STATUS_OK);
                return;
        }
 
-       blob = dce_conn->partial_input;
-       dce_conn->partial_input = data_blob(blob.data + offset,
-                                           blob.length - offset);
-       data_blob_free(&blob);
+       /*
+        * we don't send a reply to a auth3 request.
+        */
+       TALLOC_FREE(call);
+       dcesrv_conn_auth_wait_finished(conn, NT_STATUS_OK);
+       return;
 }
 
-/*
-  remove the call from the right list when freed
- */
-static int dcesrv_call_dequeue(struct dcesrv_call_state *call)
+
+static NTSTATUS dcesrv_check_or_create_context(struct dcesrv_call_state *call,
+                               const struct dcerpc_bind *b,
+                               const struct dcerpc_ctx_list *ctx,
+                               struct dcerpc_ack_ctx *ack,
+                               bool validate_only,
+                               const struct ndr_syntax_id *supported_transfer)
 {
-       dcesrv_call_set_list(call, DCESRV_LIST_NONE);
-       return 0;
+       uint32_t if_version;
+       struct dcesrv_connection_context *context;
+       const struct dcesrv_interface *iface;
+       struct GUID uuid;
+       NTSTATUS status;
+       const struct ndr_syntax_id *selected_transfer = NULL;
+       size_t i;
+       bool ok;
+
+       if (b == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+       if (ctx == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+       if (ctx->num_transfer_syntaxes < 1) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+       if (ack == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+       if (supported_transfer == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       switch (ack->result) {
+       case DCERPC_BIND_ACK_RESULT_ACCEPTANCE:
+       case DCERPC_BIND_ACK_RESULT_NEGOTIATE_ACK:
+               /*
+                * We is already completed.
+                */
+               return NT_STATUS_OK;
+       default:
+               break;
+       }
+
+       ack->result = DCERPC_BIND_ACK_RESULT_PROVIDER_REJECTION;
+       ack->reason.value = DCERPC_BIND_ACK_REASON_ABSTRACT_SYNTAX_NOT_SUPPORTED;
+
+       if_version = ctx->abstract_syntax.if_version;
+       uuid = ctx->abstract_syntax.uuid;
+
+       iface = find_interface_by_uuid(call->conn->endpoint, &uuid, if_version);
+       if (iface == NULL) {
+               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 report this only via ack->result
+                */
+               return NT_STATUS_OK;
+       }
+
+       ack->result = DCERPC_BIND_ACK_RESULT_PROVIDER_REJECTION;
+       ack->reason.value = DCERPC_BIND_ACK_REASON_TRANSFER_SYNTAXES_NOT_SUPPORTED;
+
+       if (validate_only) {
+               /*
+                * We report this only via ack->result
+                */
+               return NT_STATUS_OK;
+       }
+
+       for (i = 0; i < ctx->num_transfer_syntaxes; i++) {
+               /*
+                * we only do NDR encoded dcerpc for now.
+                */
+               ok = ndr_syntax_id_equal(&ctx->transfer_syntaxes[i],
+                                        supported_transfer);
+               if (ok) {
+                       selected_transfer = supported_transfer;
+                       break;
+               }
+       }
+
+       context = dcesrv_find_context(call->conn, ctx->context_id);
+       if (context != NULL) {
+               ok = ndr_syntax_id_equal(&context->iface->syntax_id,
+                                        &ctx->abstract_syntax);
+               if (!ok) {
+                       return NT_STATUS_RPC_PROTOCOL_ERROR;
+               }
+
+               if (selected_transfer != NULL) {
+                       ok = ndr_syntax_id_equal(&context->transfer_syntax,
+                                                selected_transfer);
+                       if (!ok) {
+                               return NT_STATUS_RPC_PROTOCOL_ERROR;
+                       }
+
+                       ack->result = DCERPC_BIND_ACK_RESULT_ACCEPTANCE;
+                       ack->reason.value = DCERPC_BIND_ACK_REASON_NOT_SPECIFIED;
+                       ack->syntax = context->transfer_syntax;
+               }
+
+               /*
+                * We report this only via ack->result
+                */
+               return NT_STATUS_OK;
+       }
+
+       if (selected_transfer == NULL) {
+               /*
+                * We report this only via ack->result
+                */
+               return NT_STATUS_OK;
+       }
+
+       ack->result = DCERPC_BIND_ACK_RESULT_USER_REJECTION;
+       ack->reason.value = DCERPC_BIND_ACK_REASON_LOCAL_LIMIT_EXCEEDED;
+
+       /* add this context to the list of available context_ids */
+       context = talloc_zero(call->conn, struct dcesrv_connection_context);
+       if (context == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       context->conn = call->conn;
+       context->context_id = ctx->context_id;
+       context->iface = iface;
+       context->transfer_syntax = *selected_transfer;
+       context->private_data = NULL;
+       DLIST_ADD(call->conn->contexts, context);
+       call->context = context;
+       talloc_set_destructor(context, dcesrv_connection_context_destructor);
+
+       dcesrv_prepare_context_auth(call);
+
+       /*
+        * Multiplex is supported by default
+        */
+       call->state_flags |= DCESRV_CALL_STATE_FLAG_MULTIPLEXED;
+
+       status = iface->bind(call, iface, if_version);
+       call->context = NULL;
+       if (!NT_STATUS_IS_OK(status)) {
+               /* we don't want to trigger the iface->unbind() hook */
+               context->iface = NULL;
+               talloc_free(context);
+               /*
+                * We report this only via ack->result
+                */
+               return NT_STATUS_OK;
+       }
+
+       ack->result = DCERPC_BIND_ACK_RESULT_ACCEPTANCE;
+       ack->reason.value = DCERPC_BIND_ACK_REASON_NOT_SPECIFIED;
+       ack->syntax = context->transfer_syntax;
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS dcesrv_negotiate_contexts(struct dcesrv_call_state *call,
+                               const struct dcerpc_bind *b,
+                               struct dcerpc_ack_ctx *ack_ctx_list)
+{
+       NTSTATUS status;
+       size_t i;
+       bool validate_only = false;
+       bool preferred_ndr32;
+
+       /*
+        * Try to negotiate one new presentation context,
+        * using our preferred transfer syntax.
+        */
+       for (i = 0; i < b->num_contexts; i++) {
+               const struct dcerpc_ctx_list *c = &b->ctx_list[i];
+               struct dcerpc_ack_ctx *a = &ack_ctx_list[i];
+
+               status = dcesrv_check_or_create_context(call, b, c, a,
+                                               validate_only,
+                                               call->conn->preferred_transfer);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+
+               if (a->result == DCERPC_BIND_ACK_RESULT_ACCEPTANCE) {
+                       /*
+                        * We managed to negotiate one context.
+                        *
+                        * => we're done.
+                        */
+                       validate_only = true;
+               }
+       }
+
+       preferred_ndr32 = ndr_syntax_id_equal(&ndr_transfer_syntax_ndr,
+                                       call->conn->preferred_transfer);
+       if (preferred_ndr32) {
+               /*
+                * We're done.
+                */
+               return NT_STATUS_OK;
+       }
+
+       /*
+        * Try to negotiate one new presentation context,
+        * using NDR 32 as fallback.
+        */
+       for (i = 0; i < b->num_contexts; i++) {
+               const struct dcerpc_ctx_list *c = &b->ctx_list[i];
+               struct dcerpc_ack_ctx *a = &ack_ctx_list[i];
+
+               status = dcesrv_check_or_create_context(call, b, c, a,
+                                               validate_only,
+                                               &ndr_transfer_syntax_ndr);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+
+               if (a->result == DCERPC_BIND_ACK_RESULT_ACCEPTANCE) {
+                       /*
+                        * We managed to negotiate one context.
+                        *
+                        * => we're done.
+                        */
+                       validate_only = true;
+               }
+       }
+
+       return NT_STATUS_OK;
 }
 
+static void dcesrv_alter_done(struct tevent_req *subreq);
+
 /*
-  process some input to a dcerpc endpoint server.
+  handle a alter context request
 */
-NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
+static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
 {
-       struct ndr_pull *ndr;
-       enum ndr_err_code ndr_err;
+       struct dcesrv_connection *conn = call->conn;
        NTSTATUS status;
-       struct dcesrv_call_state *call;
-       DATA_BLOB blob;
+       bool auth_ok = false;
+       struct ncacn_packet *pkt = &call->ack_pkt;
+       uint32_t extra_flags = 0;
+       struct dcesrv_auth *auth = &call->conn->auth_state;
+       struct dcerpc_ack_ctx *ack_ctx_list = NULL;
+       struct tevent_req *subreq = NULL;
+       size_t i;
+
+       if (!call->conn->allow_alter) {
+               return dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
+       }
+
+       status = dcerpc_verify_ncacn_packet_header(&call->pkt,
+                       DCERPC_PKT_ALTER,
+                       call->pkt.u.alter.auth_info.length,
+                       0, /* required flags */
+                       DCERPC_PFC_FLAG_FIRST |
+                       DCERPC_PFC_FLAG_LAST |
+                       DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN |
+                       0x08 | /* this is not defined, but should be ignored */
+                       DCERPC_PFC_FLAG_CONC_MPX |
+                       DCERPC_PFC_FLAG_DID_NOT_EXECUTE |
+                       DCERPC_PFC_FLAG_MAYBE |
+                       DCERPC_PFC_FLAG_OBJECT_UUID);
+       if (!NT_STATUS_IS_OK(status)) {
+               return dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
+       }
 
-       call = talloc_zero(dce_conn, struct dcesrv_call_state);
-       if (!call) {
-               talloc_free(dce_conn->partial_input.data);
+       auth_ok = dcesrv_auth_alter(call);
+       if (!auth_ok) {
+               if (call->fault_code != 0) {
+                       return dcesrv_fault_disconnect(call, call->fault_code);
+               }
+       }
+
+       if (call->pkt.u.alter.num_contexts < 1) {
+               return dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
+       }
+
+       ack_ctx_list = talloc_zero_array(call, struct dcerpc_ack_ctx,
+                                        call->pkt.u.alter.num_contexts);
+       if (ack_ctx_list == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
-       call->conn              = dce_conn;
-       call->event_ctx         = dce_conn->event_ctx;
-       call->msg_ctx           = dce_conn->msg_ctx;
-       call->state_flags       = call->conn->state_flags;
-       call->time              = timeval_current();
-       call->list              = DCESRV_LIST_NONE;
 
-       talloc_set_destructor(call, dcesrv_call_dequeue);
+       /*
+        * Set some sane defaults (required by dcesrv_negotiate_contexts()/
+        * dcesrv_check_or_create_context()) and do some protocol validation
+        * and set sane defaults.
+        */
+       for (i = 0; i < call->pkt.u.alter.num_contexts; i++) {
+               const struct dcerpc_ctx_list *c = &call->pkt.u.alter.ctx_list[i];
+               struct dcerpc_ack_ctx *a = &ack_ctx_list[i];
+
+               if (c->num_transfer_syntaxes == 0) {
+                       return dcesrv_fault_disconnect(call,
+                                       DCERPC_NCA_S_PROTO_ERROR);
+               }
+
+               a->result = DCERPC_BIND_ACK_RESULT_PROVIDER_REJECTION;
+               a->reason.value = DCERPC_BIND_ACK_REASON_ABSTRACT_SYNTAX_NOT_SUPPORTED;
+       }
+
+       /*
+        * Try to negotiate one new presentation context.
+        */
+       status = dcesrv_negotiate_contexts(call, &call->pkt.u.alter, ack_ctx_list);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROTOCOL_ERROR)) {
+               return dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
+       }
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       if ((call->pkt.pfc_flags & DCERPC_PFC_FLAG_CONC_MPX) &&
+           (call->state_flags & DCESRV_CALL_STATE_FLAG_MULTIPLEXED)) {
+               call->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->conn->state_flags |= DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL;
+       }
+
+       /* handle any authentication that is being requested */
+       if (!auth_ok) {
+               if (call->in_auth_info.auth_type !=
+                   call->conn->auth_state.auth_type)
+               {
+                       return dcesrv_fault_disconnect(call,
+                                       DCERPC_FAULT_SEC_PKG_ERROR);
+               }
+               return dcesrv_fault_disconnect(call, DCERPC_FAULT_ACCESS_DENIED);
+       }
+
+       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 | extra_flags;
+       pkt->u.alter_resp.max_xmit_frag = call->conn->max_xmit_frag;
+       pkt->u.alter_resp.max_recv_frag = call->conn->max_recv_frag;
+       pkt->u.alter_resp.assoc_group_id = call->conn->assoc_group->id;
+       pkt->u.alter_resp.secondary_address = "";
+       pkt->u.alter_resp.num_results = call->pkt.u.alter.num_contexts;
+       pkt->u.alter_resp.ctx_list = ack_ctx_list;
+       pkt->u.alter_resp.auth_info = data_blob_null;
+
+       status = dcesrv_auth_prepare_alter_ack(call, pkt);
+       if (!NT_STATUS_IS_OK(status)) {
+               return dcesrv_fault_disconnect(call, DCERPC_FAULT_SEC_PKG_ERROR);
+       }
+
+       if (auth->auth_finished) {
+               return dcesrv_auth_reply(call);
+       }
+
+       subreq = gensec_update_send(call, call->event_ctx,
+                                   auth->gensec_security,
+                                   call->in_auth_info.credentials);
+       if (subreq == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       tevent_req_set_callback(subreq, dcesrv_alter_done, call);
+
+       return dcesrv_conn_auth_wait_setup(conn);
+}
+
+static void dcesrv_alter_done(struct tevent_req *subreq)
+{
+       struct dcesrv_call_state *call =
+               tevent_req_callback_data(subreq,
+               struct dcesrv_call_state);
+       struct dcesrv_connection *conn = call->conn;
+       NTSTATUS status;
+
+       status = gensec_update_recv(subreq, call,
+                                   &call->out_auth_info->credentials);
+       TALLOC_FREE(subreq);
+
+       status = dcesrv_auth_complete(call, status);
+       if (!NT_STATUS_IS_OK(status)) {
+               status = dcesrv_fault_disconnect(call, DCERPC_FAULT_SEC_PKG_ERROR);
+               dcesrv_conn_auth_wait_finished(conn, status);
+               return;
+       }
+
+       status = dcesrv_auth_reply(call);
+       dcesrv_conn_auth_wait_finished(conn, status);
+       return;
+}
+
+/*
+  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 = call->context->transfer_syntax,
+       };
+       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;
+
+       if (!call->conn->allow_request) {
+               return dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
+       }
+
+       /* 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;
+       }
+
+       if (call->context == NULL) {
+               return dcesrv_fault_with_flags(call, DCERPC_NCA_S_UNKNOWN_IF,
+                                       DCERPC_PFC_FLAG_DID_NOT_EXECUTE);
+       }
+
+       switch (call->conn->auth_state.auth_level) {
+       case DCERPC_AUTH_LEVEL_NONE:
+       case DCERPC_AUTH_LEVEL_PACKET:
+       case DCERPC_AUTH_LEVEL_INTEGRITY:
+       case DCERPC_AUTH_LEVEL_PRIVACY:
+               break;
+       default:
+               if (!call->context->allow_connect) {
+                       char *addr;
+
+                       addr = tsocket_address_string(call->conn->remote_address,
+                                                     call);
+
+                       DEBUG(2, ("%s: restrict auth_level_connect access "
+                                 "to [%s] with auth[type=0x%x,level=0x%x] "
+                                 "on [%s] from [%s]\n",
+                                 __func__, call->context->iface->name,
+                                 call->conn->auth_state.auth_type,
+                                 call->conn->auth_state.auth_level,
+                                 derpc_transport_string_by_transport(transport),
+                                 addr));
+                       return dcesrv_fault(call, DCERPC_FAULT_ACCESS_DENIED);
+               }
+               break;
+       }
+
+       if (call->conn->auth_state.auth_level < call->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__,
+                         call->context->min_auth_level,
+                         call->context->iface->name,
+                         call->conn->auth_state.auth_type,
+                         call->conn->auth_state.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;
+
+       call->ndr_pull  = pull;
+
+       if (!(call->pkt.drep[0] & DCERPC_DREP_LE)) {
+               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 = call->context->iface->ndr_pull(call, call, pull, &call->r);
+       if (!NT_STATUS_IS_OK(status)) {
+               uint8_t extra_flags = 0;
+               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,
+                                call->context->iface->name));
+                       dcesrv_save_call(call, "unknown");
+                       extra_flags |= DCERPC_PFC_FLAG_DID_NOT_EXECUTE;
+               } else {
+                       dcesrv_save_call(call, "pullfail");
+               }
+               return dcesrv_fault_with_flags(call, call->fault_code, extra_flags);
+       }
+
+       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));
+       }
+
+       /* call the dispatch function */
+       status = call->context->iface->dispatch(call, call, call->r);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(5,("dcerpc fault in call %s:%02x - %s\n",
+                        call->context->iface->name,
+                        call->pkt.u.request.opnum,
+                        dcerpc_errstr(pull, call->fault_code)));
+               return dcesrv_fault(call, call->fault_code);
+       }
+
+       /* add the call to the pending list */
+       dcesrv_call_set_list(call, DCESRV_LIST_PENDING_CALL_LIST);
+
+       if (call->state_flags & DCESRV_CALL_STATE_FLAG_ASYNC) {
+               return NT_STATUS_OK;
+       }
+
+       return dcesrv_reply(call);
+}
+
+
+/*
+  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_local_address(struct dcesrv_connection *conn)
+{
+       return conn->local_address;
+}
+
+_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.
+*/
+static NTSTATUS dcesrv_process_ncacn_packet(struct dcesrv_connection *dce_conn,
+                                           struct ncacn_packet *pkt,
+                                           DATA_BLOB blob)
+{
+       NTSTATUS status;
+       struct dcesrv_call_state *call;
+       struct dcesrv_call_state *existing = NULL;
+
+       call = talloc_zero(dce_conn, struct dcesrv_call_state);
+       if (!call) {
+               data_blob_free(&blob);
+               talloc_free(pkt);
+               return NT_STATUS_NO_MEMORY;
+       }
+       call->conn              = dce_conn;
+       call->event_ctx         = dce_conn->event_ctx;
+       call->msg_ctx           = dce_conn->msg_ctx;
+       call->state_flags       = call->conn->state_flags;
+       call->time              = timeval_current();
+       call->list              = DCESRV_LIST_NONE;
+
+       talloc_steal(call, pkt);
+       talloc_steal(call, blob.data);
+       call->pkt = *pkt;
+
+       talloc_set_destructor(call, dcesrv_call_dequeue);
+
+       if (call->conn->allow_bind) {
+               /*
+                * Only one bind is possible per connection
+                */
+               call->conn->allow_bind = false;
+               return dcesrv_bind(call);
+       }
+
+       /* we have to check the signing here, before combining the
+          pdus */
+       if (call->pkt.ptype == DCERPC_PKT_REQUEST) {
+               if (!call->conn->allow_request) {
+                       return dcesrv_fault_disconnect(call,
+                                       DCERPC_NCA_S_PROTO_ERROR);
+               }
+
+               status = dcerpc_verify_ncacn_packet_header(&call->pkt,
+                               DCERPC_PKT_REQUEST,
+                               call->pkt.u.request.stub_and_verifier.length,
+                               0, /* required_flags */
+                               DCERPC_PFC_FLAG_FIRST |
+                               DCERPC_PFC_FLAG_LAST |
+                               DCERPC_PFC_FLAG_PENDING_CANCEL |
+                               0x08 | /* this is not defined, but should be ignored */
+                               DCERPC_PFC_FLAG_CONC_MPX |
+                               DCERPC_PFC_FLAG_DID_NOT_EXECUTE |
+                               DCERPC_PFC_FLAG_MAYBE |
+                               DCERPC_PFC_FLAG_OBJECT_UUID);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return dcesrv_fault_disconnect(call,
+                                       DCERPC_NCA_S_PROTO_ERROR);
+               }
+
+               if (call->pkt.frag_length > DCERPC_FRAG_MAX_SIZE) {
+                       /*
+                        * We don't use dcesrv_fault_disconnect()
+                        * here, because we don't want to set
+                        * DCERPC_PFC_FLAG_DID_NOT_EXECUTE
+                        *
+                        * Note that we don't check against the negotiated
+                        * max_recv_frag, but a hard coded value.
+                        */
+                       dcesrv_call_disconnect_after(call,
+                               "dcesrv_auth_request - frag_length too large");
+                       return dcesrv_fault(call,
+                                       DCERPC_NCA_S_PROTO_ERROR);
+               }
+
+               if (call->pkt.pfc_flags & DCERPC_PFC_FLAG_FIRST) {
+                       if (dce_conn->pending_call_list != NULL) {
+                               /*
+                                * concurrent requests are only allowed
+                                * if DCERPC_PFC_FLAG_CONC_MPX was negotiated.
+                                */
+                               if (!(dce_conn->state_flags & DCESRV_CALL_STATE_FLAG_MULTIPLEXED)) {
+                                       dcesrv_call_disconnect_after(call,
+                                               "dcesrv_auth_request - "
+                                               "existing pending call without CONN_MPX");
+                                       return dcesrv_fault(call,
+                                               DCERPC_NCA_S_PROTO_ERROR);
+                               }
+                       }
+                       /* only one request is possible in the fragmented list */
+                       if (dce_conn->incoming_fragmented_call_list != NULL) {
+                               if (!(dce_conn->state_flags & DCESRV_CALL_STATE_FLAG_MULTIPLEXED)) {
+                                       /*
+                                        * Without DCERPC_PFC_FLAG_CONC_MPX
+                                        * we need to return the FAULT on the
+                                        * already existing call.
+                                        *
+                                        * This is important to get the
+                                        * call_id and context_id right.
+                                        */
+                                       TALLOC_FREE(call);
+                                       call = dce_conn->incoming_fragmented_call_list;
+                               }
+                               dcesrv_call_disconnect_after(call,
+                                       "dcesrv_auth_request - "
+                                       "existing fragmented call");
+                               return dcesrv_fault(call,
+                                               DCERPC_NCA_S_PROTO_ERROR);
+                       }
+                       if (call->pkt.pfc_flags & DCERPC_PFC_FLAG_PENDING_CANCEL) {
+                               return dcesrv_fault_disconnect(call,
+                                               DCERPC_FAULT_NO_CALL_ACTIVE);
+                       }
+                       call->context = dcesrv_find_context(call->conn,
+                                               call->pkt.u.request.context_id);
+                       if (call->context == NULL) {
+                               return dcesrv_fault_with_flags(call, DCERPC_NCA_S_UNKNOWN_IF,
+                                       DCERPC_PFC_FLAG_DID_NOT_EXECUTE);
+                       }
+               } else {
+                       const struct dcerpc_request *nr = &call->pkt.u.request;
+                       const struct dcerpc_request *er = NULL;
+                       int cmp;
+
+                       existing = dcesrv_find_fragmented_call(dce_conn,
+                                                       call->pkt.call_id);
+                       if (existing == NULL) {
+                               dcesrv_call_disconnect_after(call,
+                                       "dcesrv_auth_request - "
+                                       "no existing fragmented call");
+                               return dcesrv_fault(call,
+                                               DCERPC_NCA_S_PROTO_ERROR);
+                       }
+                       er = &existing->pkt.u.request;
+
+                       if (call->pkt.ptype != existing->pkt.ptype) {
+                               /* trying to play silly buggers are we? */
+                               return dcesrv_fault_disconnect(existing,
+                                               DCERPC_NCA_S_PROTO_ERROR);
+                       }
+                       cmp = memcmp(call->pkt.drep, existing->pkt.drep,
+                                    sizeof(pkt->drep));
+                       if (cmp != 0) {
+                               return dcesrv_fault_disconnect(existing,
+                                               DCERPC_NCA_S_PROTO_ERROR);
+                       }
+                       if (nr->context_id != er->context_id)  {
+                               return dcesrv_fault_disconnect(existing,
+                                               DCERPC_NCA_S_PROTO_ERROR);
+                       }
+                       if (nr->opnum != er->opnum)  {
+                               return dcesrv_fault_disconnect(existing,
+                                               DCERPC_NCA_S_PROTO_ERROR);
+                       }
+               }
+       }
+
+       if (call->pkt.ptype == DCERPC_PKT_REQUEST) {
+               bool ok;
+               uint8_t payload_offset = DCERPC_REQUEST_LENGTH;
+
+               if (call->pkt.pfc_flags & DCERPC_PFC_FLAG_OBJECT_UUID) {
+                       payload_offset += 16;
+               }
+
+               ok = dcesrv_auth_pkt_pull(call, &blob,
+                                         0, /* required_flags */
+                                         DCERPC_PFC_FLAG_FIRST |
+                                         DCERPC_PFC_FLAG_LAST |
+                                         DCERPC_PFC_FLAG_PENDING_CANCEL |
+                                         0x08 | /* this is not defined, but should be ignored */
+                                         DCERPC_PFC_FLAG_CONC_MPX |
+                                         DCERPC_PFC_FLAG_DID_NOT_EXECUTE |
+                                         DCERPC_PFC_FLAG_MAYBE |
+                                         DCERPC_PFC_FLAG_OBJECT_UUID,
+                                         payload_offset,
+                                         &call->pkt.u.request.stub_and_verifier);
+               if (!ok) {
+                       /*
+                        * We don't use dcesrv_fault_disconnect()
+                        * here, because we don't want to set
+                        * DCERPC_PFC_FLAG_DID_NOT_EXECUTE
+                        */
+                       dcesrv_call_disconnect_after(call,
+                                               "dcesrv_auth_request - failed");
+                       if (call->fault_code == 0) {
+                               call->fault_code = DCERPC_FAULT_ACCESS_DENIED;
+                       }
+                       return dcesrv_fault(call, call->fault_code);
+               }
+       }
+
+       /* see if this is a continued packet */
+       if (existing != NULL) {
+               struct dcerpc_request *er = &existing->pkt.u.request;
+               const struct dcerpc_request *nr = &call->pkt.u.request;
+               size_t available;
+               size_t alloc_size;
+               size_t alloc_hint;
+
+               /*
+                * Up to 4 MByte are allowed by all fragments
+                */
+               available = dce_conn->max_total_request_size;
+               if (er->stub_and_verifier.length > available) {
+                       dcesrv_call_disconnect_after(existing,
+                               "dcesrv_auth_request - existing payload too large");
+                       return dcesrv_fault(existing, DCERPC_FAULT_ACCESS_DENIED);
+               }
+               available -= er->stub_and_verifier.length;
+               if (nr->alloc_hint > available) {
+                       dcesrv_call_disconnect_after(existing,
+                               "dcesrv_auth_request - alloc hint too large");
+                       return dcesrv_fault(existing, DCERPC_FAULT_ACCESS_DENIED);
+               }
+               if (nr->stub_and_verifier.length > available) {
+                       dcesrv_call_disconnect_after(existing,
+                               "dcesrv_auth_request - new payload too large");
+                       return dcesrv_fault(existing, DCERPC_FAULT_ACCESS_DENIED);
+               }
+               alloc_hint = er->stub_and_verifier.length + nr->alloc_hint;
+               /* allocate at least 1 byte */
+               alloc_hint = MAX(alloc_hint, 1);
+               alloc_size = er->stub_and_verifier.length +
+                            nr->stub_and_verifier.length;
+               alloc_size = MAX(alloc_size, alloc_hint);
+
+               er->stub_and_verifier.data =
+                       talloc_realloc(existing,
+                                      er->stub_and_verifier.data,
+                                      uint8_t, alloc_size);
+               if (er->stub_and_verifier.data == NULL) {
+                       TALLOC_FREE(call);
+                       return dcesrv_fault_with_flags(existing,
+                                                      DCERPC_FAULT_OUT_OF_RESOURCES,
+                                                      DCERPC_PFC_FLAG_DID_NOT_EXECUTE);
+               }
+               memcpy(er->stub_and_verifier.data +
+                      er->stub_and_verifier.length,
+                      nr->stub_and_verifier.data,
+                      nr->stub_and_verifier.length);
+               er->stub_and_verifier.length += nr->stub_and_verifier.length;
+
+               existing->pkt.pfc_flags |= (call->pkt.pfc_flags & DCERPC_PFC_FLAG_LAST);
+
+               TALLOC_FREE(call);
+               call = existing;
+       }
+
+       /* this may not be the last pdu in the chain - if its isn't then
+          just put it on the incoming_fragmented_call_list and wait for the rest */
+       if (call->pkt.ptype == DCERPC_PKT_REQUEST &&
+           !(call->pkt.pfc_flags & DCERPC_PFC_FLAG_LAST)) {
+               /*
+                * Up to 4 MByte are allowed by all fragments
+                */
+               if (call->pkt.u.request.alloc_hint > dce_conn->max_total_request_size) {
+                       dcesrv_call_disconnect_after(call,
+                               "dcesrv_auth_request - initial alloc hint too large");
+                       return dcesrv_fault(call, DCERPC_FAULT_ACCESS_DENIED);
+               }
+               dcesrv_call_set_list(call, DCESRV_LIST_FRAGMENTED_CALL_LIST);
+               return NT_STATUS_OK;
+       } 
+       
+       /* This removes any fragments we may have had stashed away */
+       dcesrv_call_set_list(call, DCESRV_LIST_NONE);
+
+       switch (call->pkt.ptype) {
+       case DCERPC_PKT_BIND:
+               status = dcesrv_bind_nak(call,
+                       DCERPC_BIND_NAK_REASON_NOT_SPECIFIED);
+               break;
+       case DCERPC_PKT_AUTH3:
+               status = dcesrv_auth3(call);
+               break;
+       case DCERPC_PKT_ALTER:
+               status = dcesrv_alter(call);
+               break;
+       case DCERPC_PKT_REQUEST:
+               status = dcesrv_request(call);
+               break;
+       case DCERPC_PKT_CO_CANCEL:
+       case DCERPC_PKT_ORPHANED:
+               /*
+                * Window just ignores CO_CANCEL and ORPHANED,
+                * so we do...
+                */
+               status = NT_STATUS_OK;
+               TALLOC_FREE(call);
+               break;
+       case DCERPC_PKT_BIND_ACK:
+       case DCERPC_PKT_BIND_NAK:
+       case DCERPC_PKT_ALTER_RESP:
+       case DCERPC_PKT_RESPONSE:
+       case DCERPC_PKT_FAULT:
+       case DCERPC_PKT_SHUTDOWN:
+       default:
+               status = dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
+               break;
+       }
+
+       /* if we are going to be sending a reply then add
+          it to the list of pending calls. We add it to the end to keep the call
+          list in the order we will answer */
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(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)
+{
+       NTSTATUS status;
+       struct dcesrv_context *dce_ctx;
+       int i;
+
+       if (!endpoint_servers) {
+               DEBUG(0,("dcesrv_init_context: no endpoint servers configured\n"));
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       dce_ctx = talloc_zero(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;
+
+               ep_server = dcesrv_ep_server_byname(endpoint_servers[i]);
+               if (!ep_server) {
+                       DEBUG(0,("dcesrv_init_context: failed to find endpoint server = '%s'\n", endpoint_servers[i]));
+                       return NT_STATUS_INTERNAL_ERROR;
+               }
+
+               status = ep_server->init_server(dce_ctx, ep_server);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("dcesrv_init_context: failed to init endpoint server = '%s': %s\n", endpoint_servers[i],
+                               nt_errstr(status)));
+                       return status;
+               }
+       }
+
+       *_dce_ctx = dce_ctx;
+       return NT_STATUS_OK;
+}
+
+/* the list of currently registered DCERPC endpoint servers.
+ */
+static struct ep_server {
+       struct dcesrv_endpoint_server *ep_server;
+} *ep_servers = NULL;
+static int num_ep_servers;
+
+/*
+  register a DCERPC endpoint server. 
+
+  The 'name' can be later used by other backends to find the operations
+  structure for this backend.  
+
+*/
+_PUBLIC_ NTSTATUS dcerpc_register_ep_server(const struct dcesrv_endpoint_server *ep_server)
+{
+       
+       if (dcesrv_ep_server_byname(ep_server->name) != NULL) {
+               /* its already registered! */
+               DEBUG(0,("DCERPC endpoint server '%s' already registered\n", 
+                        ep_server->name));
+               return NT_STATUS_OBJECT_NAME_COLLISION;
+       }
+
+       ep_servers = realloc_p(ep_servers, struct ep_server, num_ep_servers+1);
+       if (!ep_servers) {
+               smb_panic("out of memory in dcerpc_register");
+       }
+
+       ep_servers[num_ep_servers].ep_server = smb_xmemdup(ep_server, sizeof(*ep_server));
+       ep_servers[num_ep_servers].ep_server->name = smb_xstrdup(ep_server->name);
+
+       num_ep_servers++;
+
+       DEBUG(3,("DCERPC endpoint server '%s' registered\n", 
+                ep_server->name));
+
+       return NT_STATUS_OK;
+}
+
+/*
+  return the operations structure for a named backend of the specified type
+*/
+const struct dcesrv_endpoint_server *dcesrv_ep_server_byname(const char *name)
+{
+       int i;
+
+       for (i=0;i<num_ep_servers;i++) {
+               if (strcmp(ep_servers[i].ep_server->name, name) == 0) {
+                       return ep_servers[i].ep_server;
+               }
+       }
+
+       return NULL;
+}
+
+void dcerpc_server_init(struct loadparm_context *lp_ctx)
+{
+       static bool initialized;
+#define _MODULE_PROTO(init) extern NTSTATUS init(TALLOC_CTX *);
+       STATIC_dcerpc_server_MODULES_PROTO;
+       init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES };
+       init_module_fn *shared_init;
+
+       if (initialized) {
+               return;
+       }
+       initialized = true;
+
+       shared_init = load_samba_modules(NULL, "dcerpc_server");
+
+       run_init_functions(NULL, static_init);
+       run_init_functions(NULL, shared_init);
+
+       talloc_free(shared_init);
+}
+
+/*
+  return the DCERPC module version, and the size of some critical types
+  This can be used by endpoint server modules to either detect compilation errors, or provide
+  multiple implementations for different smbd compilation options in one module
+*/
+const struct dcesrv_critical_sizes *dcerpc_module_version(void)
+{
+       static const struct dcesrv_critical_sizes critical_sizes = {
+               DCERPC_MODULE_VERSION,
+               sizeof(struct dcesrv_context),
+               sizeof(struct dcesrv_endpoint),
+               sizeof(struct dcesrv_endpoint_server),
+               sizeof(struct dcesrv_interface),
+               sizeof(struct dcesrv_if_list),
+               sizeof(struct dcesrv_connection),
+               sizeof(struct dcesrv_call_state),
+               sizeof(struct dcesrv_auth),
+               sizeof(struct dcesrv_handle)
+       };
+
+       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);
+
+       dce_conn->wait_send = NULL;
+       dce_conn->wait_recv = NULL;
+       dce_conn->wait_private = NULL;
+
+       dce_conn->allow_bind = false;
+       dce_conn->allow_auth3 = false;
+       dce_conn->allow_alter = false;
+       dce_conn->allow_request = false;
+
+       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' deferred due to pending calls\n",
+                reason));
+       dce_conn->terminate = talloc_strdup(dce_conn, reason);
+       if (dce_conn->terminate == NULL) {
+               dce_conn->terminate = "dcesrv: deferred 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_call_terminate_step1(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_zero(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 && call->terminate_reason == 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);
+       }
+
+       if (call->terminate_reason != NULL) {
+               struct tevent_req *subreq;
+
+               subreq = tevent_queue_wait_send(call,
+                                               dce_conn->event_ctx,
+                                               dce_conn->send_queue);
+               if (!subreq) {
+                       dcesrv_terminate_connection(dce_conn, __location__);
+                       return;
+               }
+               tevent_req_set_callback(subreq, dcesrv_call_terminate_step1,
+                                       call);
+       }
+
+       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);
+       }
+}
+
+static void dcesrv_call_terminate_step2(struct tevent_req *subreq);
+
+static void dcesrv_call_terminate_step1(struct tevent_req *subreq)
+{
+       struct dcesrv_call_state *call = tevent_req_callback_data(subreq,
+                                               struct dcesrv_call_state);
+       bool ok;
+       struct timeval tv;
+
+       /* make sure we stop send queue before removing subreq */
+       tevent_queue_stop(call->conn->send_queue);
+
+       ok = tevent_queue_wait_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!ok) {
+               dcesrv_terminate_connection(call->conn, __location__);
+               return;
+       }
+
+       /* disconnect after 200 usecs */
+       tv = timeval_current_ofs_usec(200);
+       subreq = tevent_wakeup_send(call, call->conn->event_ctx, tv);
+       if (subreq == NULL) {
+               dcesrv_terminate_connection(call->conn, __location__);
+               return;
+       }
+       tevent_req_set_callback(subreq, dcesrv_call_terminate_step2,
+                               call);
+}
+
+static void dcesrv_call_terminate_step2(struct tevent_req *subreq)
+{
+       struct dcesrv_call_state *call = tevent_req_callback_data(subreq,
+                                               struct dcesrv_call_state);
+       bool ok;
+
+       ok = tevent_wakeup_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!ok) {
+               dcesrv_terminate_connection(call->conn, __location__);
+               return;
+       }
+
+       dcesrv_terminate_connection(call->conn, call->terminate_reason);
+}
+
+struct dcesrv_socket_context {
+       const struct dcesrv_endpoint *endpoint;
+       struct dcesrv_context *dcesrv_ctx;
+};
+
 
-       blob = dce_conn->partial_input;
-       blob.length = dcerpc_get_frag_length(&blob);
+static void dcesrv_read_fragment_done(struct tevent_req *subreq);
 
-       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;
+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;
+               }
        }
 
-       if (!(CVAL(blob.data, DCERPC_DREP_OFFSET) & DCERPC_DREP_LE)) {
-               ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
-       }
+       /*
+        * This fills in dcesrv_conn->endpoint with the endpoint
+        * associated with the socket.  From this point on we know
+        * which (group of) services we are handling, but not the
+        * specific interface.
+        */
 
-       if (CVAL(blob.data, DCERPC_PFC_OFFSET) & DCERPC_PFC_FLAG_OBJECT_UUID) {
-               ndr->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
+       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;
        }
 
-       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);
+       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;
        }
 
-       /* 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);          
+       if (transport == NCACN_NP) {
+               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);
        }
 
-       dce_partial_advance(dce_conn, blob.length);
+       dcesrv_conn->local_address = srv_conn->local_address;
+       dcesrv_conn->remote_address = srv_conn->remote_address;
 
-       /* see if this is a continued packet */
-       if (call->pkt.ptype == DCERPC_PKT_REQUEST &&
-           !(call->pkt.pfc_flags & DCERPC_PFC_FLAG_FIRST)) {
-               struct dcesrv_call_state *call2 = call;
-               uint32_t alloc_size;
+       if (transport == NCALRPC) {
+               uid_t uid;
+               gid_t gid;
+               int sock_fd;
 
-               /* we only allow fragmented requests, no other packet types */
-               if (call->pkt.ptype != DCERPC_PKT_REQUEST) {
-                       return dcesrv_fault(call2, DCERPC_FAULT_OTHER);
+               sock_fd = socket_get_fd(srv_conn->socket);
+               if (sock_fd == -1) {
+                       stream_terminate_connection(
+                               srv_conn, "socket_get_fd failed\n");
+                       return;
                }
 
-               /* 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);
+               ret = getpeereid(sock_fd, &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 (call->pkt.ptype != call2->pkt.ptype) {
-                       /* trying to play silly buggers are we? */
-                       return dcesrv_fault(call2, DCERPC_FAULT_OTHER);
+               if (uid == dcesrv_conn->dce_ctx->initial_euid) {
+                       struct tsocket_address *r = NULL;
+
+                       ret = tsocket_address_unix_from_path(dcesrv_conn,
+                                                            AS_SYSTEM_MAGIC_PATH_TOKEN,
+                                                            &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;
                }
+       }
 
-               alloc_size = call->pkt.u.request.stub_and_verifier.length +
-                       call2->pkt.u.request.stub_and_verifier.length;
-               if (call->pkt.u.request.alloc_hint > alloc_size) {
-                       alloc_size = call->pkt.u.request.alloc_hint;
-               }
+       srv_conn->private_data = dcesrv_conn;
 
-               call->pkt.u.request.stub_and_verifier.data = 
-                       talloc_realloc(call, 
-                                      call->pkt.u.request.stub_and_verifier.data, 
-                                      uint8_t, alloc_size);
-               if (!call->pkt.u.request.stub_and_verifier.data) {
-                       return dcesrv_fault(call2, DCERPC_FAULT_OTHER);
-               }
-               memcpy(call->pkt.u.request.stub_and_verifier.data +
-                      call->pkt.u.request.stub_and_verifier.length,
-                      call2->pkt.u.request.stub_and_verifier.data,
-                      call2->pkt.u.request.stub_and_verifier.length);
-               call->pkt.u.request.stub_and_verifier.length += 
-                       call2->pkt.u.request.stub_and_verifier.length;
+       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);
 
-               call->pkt.pfc_flags |= (call2->pkt.pfc_flags & DCERPC_PFC_FLAG_LAST);
+       return;
+}
+
+static void dcesrv_conn_wait_done(struct tevent_req *subreq);
+
+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;
 
-               talloc_free(call2);
+       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;
        }
 
-       /* this may not be the last pdu in the chain - if its isn't then
-          just put it on the incoming_fragmented_call_list and wait for the rest */
-       if (call->pkt.ptype == DCERPC_PKT_REQUEST &&
-           !(call->pkt.pfc_flags & DCERPC_PFC_FLAG_LAST)) {
-               dcesrv_call_set_list(call, DCESRV_LIST_FRAGMENTED_CALL_LIST);
-               return NT_STATUS_OK;
-       } 
-       
-       /* This removes any fragments we may have had stashed away */
-       dcesrv_call_set_list(call, DCESRV_LIST_NONE);
+       dcesrv_cleanup_broken_connections(dce_ctx);
 
-       switch (call->pkt.ptype) {
-       case DCERPC_PKT_BIND:
-               status = dcesrv_bind(call);
-               break;
-       case DCERPC_PKT_AUTH3:
-               status = dcesrv_auth3(call);
-               break;
-       case DCERPC_PKT_ALTER:
-               status = dcesrv_alter(call);
-               break;
-       case DCERPC_PKT_REQUEST:
-               status = dcesrv_request(call);
-               break;
-       default:
-               status = NT_STATUS_INVALID_PARAMETER;
-               break;
+       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;
        }
 
-       /* if we are going to be sending a reply then add
-          it to the list of pending calls. We add it to the end to keep the call
-          list in the order we will answer */
+       status = dcesrv_process_ncacn_packet(dce_conn, pkt, buffer);
        if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(call);
+               dcesrv_terminate_connection(dce_conn, nt_errstr(status));
+               return;
        }
 
-       return status;
-}
+       /*
+        * This is used to block the connection during
+        * pending authentication.
+        */
+       if (dce_conn->wait_send != NULL) {
+               subreq = dce_conn->wait_send(dce_conn,
+                                            dce_conn->event_ctx,
+                                            dce_conn->wait_private);
+               if (!subreq) {
+                       status = NT_STATUS_NO_MEMORY;
+                       dcesrv_terminate_connection(dce_conn, nt_errstr(status));
+                       return;
+               }
+               tevent_req_set_callback(subreq, dcesrv_conn_wait_done, dce_conn);
+               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);
+}
 
-/*
-  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)
+static void dcesrv_conn_wait_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;
        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;
+       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;
        }
-       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;
-               }
+       dcesrv_cleanup_broken_connections(dce_ctx);
+
+       status = dce_conn->wait_recv(subreq);
+       dce_conn->wait_send = NULL;
+       dce_conn->wait_recv = NULL;
+       dce_conn->wait_private = NULL;
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               dcesrv_terminate_connection(dce_conn, nt_errstr(status));
+               return;
        }
 
-       return NT_STATUS_OK;
+       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);
 }
 
-/*
-  retrieve some output from a dcerpc server
-  The caller supplies a function that will be called to do the
-  actual output. 
+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");
+}
 
-  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))
+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,
+                                  void *process_context)
 {
+       struct dcesrv_socket_context *dcesrv_sock;
+       uint16_t port = 1;
        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;
+       const char *endpoint;
 
-       status = write_fn(private_data, &rep->blob, &nwritten);
-       NT_STATUS_IS_ERR_RETURN(status);
+       dcesrv_sock = talloc_zero(event_ctx, struct dcesrv_socket_context);
+       NT_STATUS_HAVE_NO_MEMORY(dcesrv_sock);
 
-       rep->blob.length -= nwritten;
-       rep->blob.data += nwritten;
+       /* remember the endpoint of this socket */
+       dcesrv_sock->endpoint           = e;
+       dcesrv_sock->dcesrv_ctx         = talloc_reference(dcesrv_sock, dce_ctx);
 
-       if (rep->blob.length == 0) {
-               /* we're done with this section of the call */
-               DLIST_REMOVE(call->replies, rep);
-       }
+       endpoint = dcerpc_binding_get_string_option(e->ep_description, "endpoint");
 
-       if (call->replies == NULL) {
-               /* we're done with the whole call */
-               dcesrv_call_set_list(call, DCESRV_LIST_NONE);
-               talloc_free(call);
+       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, process_context);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("service_setup_stream_socket(path=%s) failed - %s\n",
+                        endpoint, nt_errstr(status)));
        }
 
        return status;
 }
 
-_PUBLIC_ NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx, 
+static NTSTATUS dcesrv_add_ep_ncalrpc(struct dcesrv_context *dce_ctx, 
                                      struct loadparm_context *lp_ctx,
-                                     const char **endpoint_servers, struct dcesrv_context **_dce_ctx)
+                                     struct dcesrv_endpoint *e,
+                                     struct tevent_context *event_ctx,
+                                     const struct model_ops *model_ops,
+                                     void *process_context)
 {
+       struct dcesrv_socket_context *dcesrv_sock;
+       uint16_t port = 1;
+       char *full_path;
        NTSTATUS status;
-       struct dcesrv_context *dce_ctx;
-       int i;
-
-       if (!endpoint_servers) {
-               DEBUG(0,("dcesrv_init_context: no endpoint servers configured\n"));
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       dce_ctx = talloc(mem_ctx, struct dcesrv_context);
-       NT_STATUS_HAVE_NO_MEMORY(dce_ctx);
-       dce_ctx->endpoint_list  = NULL;
-       dce_ctx->lp_ctx = lp_ctx;
-
-       for (i=0;endpoint_servers[i];i++) {
-               const struct dcesrv_endpoint_server *ep_server;
+       const char *endpoint;
 
-               ep_server = dcesrv_ep_server_byname(endpoint_servers[i]);
-               if (!ep_server) {
-                       DEBUG(0,("dcesrv_init_context: failed to find endpoint server = '%s'\n", endpoint_servers[i]));
-                       return NT_STATUS_INTERNAL_ERROR;
-               }
+       endpoint = dcerpc_binding_get_string_option(e->ep_description, "endpoint");
 
-               status = ep_server->init_server(dce_ctx, ep_server);
+       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,("dcesrv_init_context: failed to init endpoint server = '%s': %s\n", endpoint_servers[i],
-                               nt_errstr(status)));
+                       DEBUG(0,("dcerpc_binding_set_string_option() failed - %s\n",
+                                 nt_errstr(status)));
                        return status;
                }
        }
 
-       *_dce_ctx = dce_ctx;
-       return NT_STATUS_OK;
-}
+       full_path = talloc_asprintf(dce_ctx, "%s/%s", lpcfg_ncalrpc_dir(lp_ctx),
+                                   endpoint);
 
-/* the list of currently registered DCERPC endpoint servers.
- */
-static struct ep_server {
-       struct dcesrv_endpoint_server *ep_server;
-} *ep_servers = NULL;
-static int num_ep_servers;
+       dcesrv_sock = talloc_zero(event_ctx, struct dcesrv_socket_context);
+       NT_STATUS_HAVE_NO_MEMORY(dcesrv_sock);
 
-/*
-  register a DCERPC endpoint server. 
+       /* remember the endpoint of this socket */
+       dcesrv_sock->endpoint           = e;
+       dcesrv_sock->dcesrv_ctx         = talloc_reference(dcesrv_sock, dce_ctx);
 
-  The 'name' can be later used by other backends to find the operations
-  structure for this backend.  
+       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, process_context);
+       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;
+}
 
-  The 'type' is used to specify whether this is for a disk, printer or IPC$ share
-*/
-_PUBLIC_ NTSTATUS dcerpc_register_ep_server(const void *_ep_server)
+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,
+                                void *process_context)
 {
-       const struct dcesrv_endpoint_server *ep_server = _ep_server;
-       
-       if (dcesrv_ep_server_byname(ep_server->name) != NULL) {
-               /* its already registered! */
-               DEBUG(0,("DCERPC endpoint server '%s' already registered\n", 
-                        ep_server->name));
-               return NT_STATUS_OBJECT_NAME_COLLISION;
-       }
+       struct dcesrv_socket_context *dcesrv_sock;
+       NTSTATUS status;
+       const char *endpoint;
 
-       ep_servers = realloc_p(ep_servers, struct ep_server, num_ep_servers+1);
-       if (!ep_servers) {
-               smb_panic("out of memory in dcerpc_register");
+       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;
        }
 
-       ep_servers[num_ep_servers].ep_server = smb_xmemdup(ep_server, sizeof(*ep_server));
-       ep_servers[num_ep_servers].ep_server->name = smb_xstrdup(ep_server->name);
+       dcesrv_sock = talloc_zero(event_ctx, struct dcesrv_socket_context);
+       NT_STATUS_HAVE_NO_MEMORY(dcesrv_sock);
 
-       num_ep_servers++;
+       /* remember the endpoint of this socket */
+       dcesrv_sock->endpoint           = e;
+       dcesrv_sock->dcesrv_ctx         = talloc_reference(dcesrv_sock, dce_ctx);
 
-       DEBUG(3,("DCERPC endpoint server '%s' registered\n", 
-                ep_server->name));
+       status = tstream_setup_named_pipe(dce_ctx, event_ctx, lp_ctx,
+                                         model_ops, &dcesrv_stream_ops,
+                                         endpoint,
+                                         dcesrv_sock, process_context);
+       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;
 }
 
 /*
-  return the operations structure for a named backend of the specified type
+  add a socket address to the list of events, one event per dcerpc endpoint
 */
-const struct dcesrv_endpoint_server *dcesrv_ep_server_byname(const char *name)
+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,
+                                        void *process_context)
 {
-       int i;
+       struct dcesrv_socket_context *dcesrv_sock;
+       uint16_t port = 0;
+       NTSTATUS status;
+       const char *endpoint;
+       char port_str[6];
 
-       for (i=0;i<num_ep_servers;i++) {
-               if (strcmp(ep_servers[i].ep_server->name, name) == 0) {
-                       return ep_servers[i].ep_server;
+       endpoint = dcerpc_binding_get_string_option(e->ep_description, "endpoint");
+       if (endpoint != NULL) {
+               port = atoi(endpoint);
+       }
+
+       dcesrv_sock = talloc_zero(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, process_context);
+       if (!NT_STATUS_IS_OK(status)) {
+               struct dcesrv_if_list *iface;
+               DEBUG(0,("service_setup_stream_socket(address=%s,port=%u) for ",
+                        address, port));
+               for (iface = e->interface_list; iface; iface = iface->next) {
+                       DEBUGADD(0, ("%s ", iface->iface.name));
+               }
+               DEBUGADD(0, ("failed - %s",
+                            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;
+       } else {
+               struct dcesrv_if_list *iface;
+               DEBUG(4,("Successfully listening on ncacn_ip_tcp endpoint [%s]:[%s] for ",
+                        address, port_str));
+               for (iface = e->interface_list; iface; iface = iface->next) {
+                       DEBUGADD(4, ("%s ", iface->iface.name));
                }
+               DEBUGADD(4, ("\n"));
        }
 
-       return NULL;
+       return NT_STATUS_OK;
 }
 
-/*
-  return the DCERPC module version, and the size of some critical types
-  This can be used by endpoint server modules to either detect compilation errors, or provide
-  multiple implementations for different smbd compilation options in one module
-*/
-const struct dcesrv_critical_sizes *dcerpc_module_version(void)
+#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,
+                                 void *process_context)
 {
-       static const struct dcesrv_critical_sizes critical_sizes = {
-               DCERPC_MODULE_VERSION,
-               sizeof(struct dcesrv_context),
-               sizeof(struct dcesrv_endpoint),
-               sizeof(struct dcesrv_endpoint_server),
-               sizeof(struct dcesrv_interface),
-               sizeof(struct dcesrv_if_list),
-               sizeof(struct dcesrv_connection),
-               sizeof(struct dcesrv_call_state),
-               sizeof(struct dcesrv_auth),
-               sizeof(struct dcesrv_handle)
-       };
+       NTSTATUS status;
 
-       return &critical_sizes;
+       /* 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,
+                                                         process_context);
+                       NT_STATUS_NOT_OK_RETURN(status);
+               }
+       } else {
+               char **wcard;
+               size_t i;
+               size_t 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],
+                                                         process_context);
+                       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;
 }
 
-/*
-  initialise the dcerpc server context for ncacn_np based services
-*/
-_PUBLIC_ NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
-                                         struct dcesrv_context **_dce_ctx)
+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,
+                      void *process_context)
 {
-       NTSTATUS status;
-       struct dcesrv_context *dce_ctx;
+       enum dcerpc_transport_t transport =
+               dcerpc_binding_get_transport(e->ep_description);
 
-       status = dcesrv_init_context(mem_ctx, lp_ctx, lp_dcerpc_endpoint_servers(lp_ctx), &dce_ctx);
-       NT_STATUS_NOT_OK_RETURN(status);
+       switch (transport) {
+       case NCACN_UNIX_STREAM:
+               return dcesrv_add_ep_unix(dce_ctx, lp_ctx, e, event_ctx,
+                                         model_ops, process_context);
 
-       *_dce_ctx = dce_ctx;
-       return NT_STATUS_OK;
+       case NCALRPC:
+               return dcesrv_add_ep_ncalrpc(dce_ctx, lp_ctx, e, event_ctx,
+                                            model_ops, process_context);
+
+       case NCACN_IP_TCP:
+               return dcesrv_add_ep_tcp(dce_ctx, lp_ctx, e, event_ctx,
+                                        model_ops, process_context);
+
+       case NCACN_NP:
+               return dcesrv_add_ep_np(dce_ctx, lp_ctx, e, event_ctx,
+                                       model_ops, process_context);
+
+       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;
+}
 
+/**
+ * retrieve session_info from a dce_call
+ */
+_PUBLIC_ struct auth_session_info *dcesrv_call_session_info(struct dcesrv_call_state *dce_call)
+{
+       return dce_call->context->conn->auth_state.session_info;
+}