s4:librpc/rpc: don't mix up paylod ndr flags with the dcerpc layer
[metze/samba/wip.git] / source4 / librpc / rpc / dcerpc.c
index 4e07cc7b57c89e4233da1df00f7fdca70131de8e..5d286c83c06f0e3dd0b35cdcec651eba0fc45560 100644 (file)
 */
 
 #include "includes.h"
-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"
 #include "lib/events/events.h"
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_proto.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
-#include "libcli/composite/composite.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
+#include "lib/util/tevent_ntstatus.h"
+#include "librpc/rpc/rpc_common.h"
+
+enum rpc_request_state {
+       RPC_REQUEST_QUEUED,
+       RPC_REQUEST_PENDING,
+       RPC_REQUEST_DONE
+};
+
+/*
+  handle for an async dcerpc request
+*/
+struct rpc_request {
+       struct rpc_request *next, *prev;
+       struct dcerpc_pipe *p;
+       NTSTATUS status;
+       uint32_t call_id;
+       enum rpc_request_state state;
+       DATA_BLOB payload;
+       uint32_t flags;
+       uint32_t fault_code;
+
+       /* this is used to distinguish bind and alter_context requests
+          from normal requests */
+       void (*recv_handler)(struct rpc_request *conn, 
+                            DATA_BLOB *blob, struct ncacn_packet *pkt);
+
+       const struct GUID *object;
+       uint16_t opnum;
+       DATA_BLOB request_data;
+       bool ignore_timeout;
+
+       /* use by the ndr level async recv call */
+       struct {
+               const struct ndr_interface_table *table;
+               uint32_t opnum;
+               void *struct_ptr;
+               TALLOC_CTX *mem_ctx;
+       } ndr;
+
+       struct {
+               void (*callback)(struct rpc_request *);
+               void *private_data;
+       } async;
+};
 
 _PUBLIC_ NTSTATUS dcerpc_init(void)
 {
-       return gensec_init(global_loadparm);
+       return gensec_init();
 }
 
-static void dcerpc_connection_dead(struct dcerpc_connection *conn, NTSTATUS status);
-static void dcerpc_ship_next_request(struct dcerpc_connection *c);
+static void dcerpc_connection_dead(struct dcecli_connection *conn, NTSTATUS status);
+static void dcerpc_schedule_io_trigger(struct dcecli_connection *c);
+
+static struct rpc_request *dcerpc_request_send(TALLOC_CTX *mem_ctx,
+                                              struct dcerpc_pipe *p,
+                                              const struct GUID *object,
+                                              uint16_t opnum,
+                                              DATA_BLOB *stub_data);
+static NTSTATUS dcerpc_request_recv(struct rpc_request *req,
+                                   TALLOC_CTX *mem_ctx,
+                                   DATA_BLOB *stub_data);
+static NTSTATUS dcerpc_ndr_validate_in(struct dcecli_connection *c,
+                                      TALLOC_CTX *mem_ctx,
+                                      DATA_BLOB blob,
+                                      size_t struct_size,
+                                      ndr_push_flags_fn_t ndr_push,
+                                      ndr_pull_flags_fn_t ndr_pull);
+static NTSTATUS dcerpc_ndr_validate_out(struct dcecli_connection *c,
+                                       struct ndr_pull *pull_in,
+                                       void *struct_ptr,
+                                       size_t struct_size,
+                                       ndr_push_flags_fn_t ndr_push,
+                                       ndr_pull_flags_fn_t ndr_pull,
+                                       ndr_print_function_t ndr_print);
 
 /* destroy a dcerpc connection */
-static int dcerpc_connection_destructor(struct dcerpc_connection *conn)
+static int dcerpc_connection_destructor(struct dcecli_connection *conn)
 {
        if (conn->dead) {
                conn->free_skipped = true;
@@ -54,20 +120,17 @@ static int dcerpc_connection_destructor(struct dcerpc_connection *conn)
 /* initialise a dcerpc connection. 
    the event context is optional
 */
-static struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx, 
-                                                struct event_context *ev,
-                                                struct smb_iconv_convenience *ic)
+static struct dcecli_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx, 
+                                                struct tevent_context *ev)
 {
-       struct dcerpc_connection *c;
+       struct dcecli_connection *c;
 
-       c = talloc_zero(mem_ctx, struct dcerpc_connection);
+       c = talloc_zero(mem_ctx, struct dcecli_connection);
        if (!c) {
                return NULL;
        }
 
-       c->iconv_convenience = talloc_reference(c, ic);
-
-       c->event_ctx = talloc_reference(c, ev);
+       c->event_ctx = ev;
 
        if (c->event_ctx == NULL) {
                talloc_free(c);
@@ -84,23 +147,459 @@ static struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx,
        c->srv_max_recv_frag = 0;
        c->pending = NULL;
 
+       c->io_trigger = tevent_create_immediate(c);
+       if (c->io_trigger == NULL) {
+               talloc_free(c);
+               return NULL;
+       }
+
        talloc_set_destructor(c, dcerpc_connection_destructor);
 
        return c;
 }
 
+struct dcerpc_bh_state {
+       struct dcerpc_pipe *p;
+};
+
+static bool dcerpc_bh_is_connected(struct dcerpc_binding_handle *h)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+
+       if (!hs->p) {
+               return false;
+       }
+
+       if (!hs->p->conn) {
+               return false;
+       }
+
+       if (hs->p->conn->dead) {
+               return false;
+       }
+
+       return true;
+}
+
+static uint32_t dcerpc_bh_set_timeout(struct dcerpc_binding_handle *h,
+                                     uint32_t timeout)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+       uint32_t old;
+
+       if (!hs->p) {
+               return DCERPC_REQUEST_TIMEOUT;
+       }
+
+       old = hs->p->request_timeout;
+       hs->p->request_timeout = timeout;
+
+       return old;
+}
+
+struct dcerpc_bh_raw_call_state {
+       struct tevent_context *ev;
+       struct dcerpc_binding_handle *h;
+       DATA_BLOB in_data;
+       DATA_BLOB out_data;
+       uint32_t out_flags;
+};
+
+static void dcerpc_bh_raw_call_done(struct rpc_request *subreq);
+
+static struct tevent_req *dcerpc_bh_raw_call_send(TALLOC_CTX *mem_ctx,
+                                                 struct tevent_context *ev,
+                                                 struct dcerpc_binding_handle *h,
+                                                 const struct GUID *object,
+                                                 uint32_t opnum,
+                                                 uint32_t in_flags,
+                                                 const uint8_t *in_data,
+                                                 size_t in_length)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+       struct tevent_req *req;
+       struct dcerpc_bh_raw_call_state *state;
+       bool ok;
+       struct rpc_request *subreq;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct dcerpc_bh_raw_call_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->h = h;
+       state->in_data.data = discard_const_p(uint8_t, in_data);
+       state->in_data.length = in_length;
+
+       ok = dcerpc_bh_is_connected(h);
+       if (!ok) {
+               tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
+               return tevent_req_post(req, ev);
+       }
+
+       subreq = dcerpc_request_send(state,
+                                    hs->p,
+                                    object,
+                                    opnum,
+                                    &state->in_data);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       subreq->async.callback = dcerpc_bh_raw_call_done;
+       subreq->async.private_data = req;
+
+       return req;
+}
+
+static void dcerpc_bh_raw_call_done(struct rpc_request *subreq)
+{
+       struct tevent_req *req =
+               talloc_get_type_abort(subreq->async.private_data,
+               struct tevent_req);
+       struct dcerpc_bh_raw_call_state *state =
+               tevent_req_data(req,
+               struct dcerpc_bh_raw_call_state);
+       NTSTATUS status;
+       uint32_t fault_code;
+
+       state->out_flags = 0;
+       if (subreq->flags & DCERPC_PULL_BIGENDIAN) {
+               state->out_flags |= LIBNDR_FLAG_BIGENDIAN;
+       }
+
+       fault_code = subreq->fault_code;
+
+       status = dcerpc_request_recv(subreq, state, &state->out_data);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+               status = dcerpc_fault_to_nt_status(fault_code);
+       }
+
+       /*
+        * We trigger the callback in the next event run
+        * because the code in this file might trigger
+        * multiple request callbacks from within a single
+        * while loop.
+        *
+        * In order to avoid segfaults from within
+        * dcerpc_connection_dead() we call
+        * tevent_req_defer_callback().
+        */
+       tevent_req_defer_callback(req, state->ev);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       tevent_req_done(req);
+}
+
+static NTSTATUS dcerpc_bh_raw_call_recv(struct tevent_req *req,
+                                       TALLOC_CTX *mem_ctx,
+                                       uint8_t **out_data,
+                                       size_t *out_length,
+                                       uint32_t *out_flags)
+{
+       struct dcerpc_bh_raw_call_state *state =
+               tevent_req_data(req,
+               struct dcerpc_bh_raw_call_state);
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               tevent_req_received(req);
+               return status;
+       }
+
+       *out_data = talloc_move(mem_ctx, &state->out_data.data);
+       *out_length = state->out_data.length;
+       *out_flags = state->out_flags;
+       tevent_req_received(req);
+       return NT_STATUS_OK;
+}
+
+struct dcerpc_bh_disconnect_state {
+       uint8_t _dummy;
+};
+
+static struct tevent_req *dcerpc_bh_disconnect_send(TALLOC_CTX *mem_ctx,
+                                               struct tevent_context *ev,
+                                               struct dcerpc_binding_handle *h)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+       struct tevent_req *req;
+       struct dcerpc_bh_disconnect_state *state;
+       bool ok;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct dcerpc_bh_disconnect_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       ok = dcerpc_bh_is_connected(h);
+       if (!ok) {
+               tevent_req_nterror(req, NT_STATUS_CONNECTION_DISCONNECTED);
+               return tevent_req_post(req, ev);
+       }
+
+       /* TODO: do a real disconnect ... */
+       hs->p = NULL;
+
+       tevent_req_done(req);
+       return tevent_req_post(req, ev);
+}
+
+static NTSTATUS dcerpc_bh_disconnect_recv(struct tevent_req *req)
+{
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               tevent_req_received(req);
+               return status;
+       }
+
+       tevent_req_received(req);
+       return NT_STATUS_OK;
+}
+
+static bool dcerpc_bh_push_bigendian(struct dcerpc_binding_handle *h)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+
+       if (hs->p->conn->flags & DCERPC_PUSH_BIGENDIAN) {
+               return true;
+       }
+
+       return false;
+}
+
+static bool dcerpc_bh_ref_alloc(struct dcerpc_binding_handle *h)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+
+       if (hs->p->conn->flags & DCERPC_NDR_REF_ALLOC) {
+               return true;
+       }
+
+       return false;
+}
+
+static bool dcerpc_bh_use_ndr64(struct dcerpc_binding_handle *h)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+
+       if (hs->p->conn->flags & DCERPC_NDR64) {
+               return true;
+       }
+
+       return false;
+}
+
+static void dcerpc_bh_do_ndr_print(struct dcerpc_binding_handle *h,
+                                  int ndr_flags,
+                                  const void *_struct_ptr,
+                                  const struct ndr_interface_call *call)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+       void *struct_ptr = discard_const(_struct_ptr);
+
+       if (ndr_flags & NDR_IN) {
+               if (hs->p->conn->flags & DCERPC_DEBUG_PRINT_IN) {
+                       ndr_print_function_debug(call->ndr_print,
+                                                call->name,
+                                                ndr_flags,
+                                                struct_ptr);
+               }
+       }
+       if (ndr_flags & NDR_OUT) {
+               if (hs->p->conn->flags & DCERPC_DEBUG_PRINT_OUT) {
+                       ndr_print_function_debug(call->ndr_print,
+                                                call->name,
+                                                ndr_flags,
+                                                struct_ptr);
+               }
+       }
+}
+
+static void dcerpc_bh_ndr_push_failed(struct dcerpc_binding_handle *h,
+                                     NTSTATUS error,
+                                     const void *struct_ptr,
+                                     const struct ndr_interface_call *call)
+{
+       DEBUG(2,("Unable to ndr_push structure for %s - %s\n",
+                call->name, nt_errstr(error)));
+}
+
+static void dcerpc_bh_ndr_pull_failed(struct dcerpc_binding_handle *h,
+                                     NTSTATUS error,
+                                     const DATA_BLOB *blob,
+                                     const struct ndr_interface_call *call)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+       const uint32_t num_examples = 20;
+       uint32_t i;
+
+       DEBUG(2,("Unable to ndr_pull structure for %s - %s\n",
+                call->name, nt_errstr(error)));
+
+       if (hs->p->conn->packet_log_dir == NULL) return;
+
+       for (i=0;i<num_examples;i++) {
+               char *name=NULL;
+               asprintf(&name, "%s/rpclog/%s-out.%d",
+                        hs->p->conn->packet_log_dir,
+                        call->name, i);
+               if (name == NULL) {
+                       return;
+               }
+               if (!file_exist(name)) {
+                       if (file_save(name, blob->data, blob->length)) {
+                               DEBUG(10,("Logged rpc packet to %s\n", name));
+                       }
+                       free(name);
+                       break;
+               }
+               free(name);
+       }
+}
+
+static NTSTATUS dcerpc_bh_ndr_validate_in(struct dcerpc_binding_handle *h,
+                                         TALLOC_CTX *mem_ctx,
+                                         const DATA_BLOB *blob,
+                                         const struct ndr_interface_call *call)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+
+       if (hs->p->conn->flags & DCERPC_DEBUG_VALIDATE_IN) {
+               NTSTATUS status;
+
+               status = dcerpc_ndr_validate_in(hs->p->conn,
+                                               mem_ctx,
+                                               *blob,
+                                               call->struct_size,
+                                               call->ndr_push,
+                                               call->ndr_pull);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("Validation [in] failed for %s - %s\n",
+                                call->name, nt_errstr(status)));
+                       return status;
+               }
+       }
+
+       DEBUG(10,("rpc request data:\n"));
+       dump_data(10, blob->data, blob->length);
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS dcerpc_bh_ndr_validate_out(struct dcerpc_binding_handle *h,
+                                          struct ndr_pull *pull_in,
+                                          const void *_struct_ptr,
+                                          const struct ndr_interface_call *call)
+{
+       struct dcerpc_bh_state *hs = dcerpc_binding_handle_data(h,
+                                    struct dcerpc_bh_state);
+       void *struct_ptr = discard_const(_struct_ptr);
+
+       DEBUG(10,("rpc reply data:\n"));
+       dump_data(10, pull_in->data, pull_in->data_size);
+
+       if (pull_in->offset != pull_in->data_size) {
+               DEBUG(0,("Warning! ignoring %u unread bytes at ofs:%u (0x%08X) for %s!\n",
+                        pull_in->data_size - pull_in->offset,
+                        pull_in->offset, pull_in->offset,
+                        call->name));
+               /* we used to return NT_STATUS_INFO_LENGTH_MISMATCH here,
+                  but it turns out that early versions of NT
+                  (specifically NT3.1) add junk onto the end of rpc
+                  packets, so if we want to interoperate at all with
+                  those versions then we need to ignore this error */
+       }
+
+       if (hs->p->conn->flags & DCERPC_DEBUG_VALIDATE_OUT) {
+               NTSTATUS status;
+
+               status = dcerpc_ndr_validate_out(hs->p->conn,
+                                                pull_in,
+                                                struct_ptr,
+                                                call->struct_size,
+                                                call->ndr_push,
+                                                call->ndr_pull,
+                                                call->ndr_print);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(2,("Validation [out] failed for %s - %s\n",
+                                call->name, nt_errstr(status)));
+                       return status;
+               }
+       }
+
+       return NT_STATUS_OK;
+}
+
+static const struct dcerpc_binding_handle_ops dcerpc_bh_ops = {
+       .name                   = "dcerpc",
+       .is_connected           = dcerpc_bh_is_connected,
+       .set_timeout            = dcerpc_bh_set_timeout,
+       .raw_call_send          = dcerpc_bh_raw_call_send,
+       .raw_call_recv          = dcerpc_bh_raw_call_recv,
+       .disconnect_send        = dcerpc_bh_disconnect_send,
+       .disconnect_recv        = dcerpc_bh_disconnect_recv,
+
+       .push_bigendian         = dcerpc_bh_push_bigendian,
+       .ref_alloc              = dcerpc_bh_ref_alloc,
+       .use_ndr64              = dcerpc_bh_use_ndr64,
+       .do_ndr_print           = dcerpc_bh_do_ndr_print,
+       .ndr_push_failed        = dcerpc_bh_ndr_push_failed,
+       .ndr_pull_failed        = dcerpc_bh_ndr_pull_failed,
+       .ndr_validate_in        = dcerpc_bh_ndr_validate_in,
+       .ndr_validate_out       = dcerpc_bh_ndr_validate_out,
+};
+
 /* initialise a dcerpc pipe. */
-_PUBLIC_ struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct event_context *ev,
-                                    struct smb_iconv_convenience *ic)
+struct dcerpc_binding_handle *dcerpc_pipe_binding_handle(struct dcerpc_pipe *p)
+{
+       struct dcerpc_binding_handle *h;
+       struct dcerpc_bh_state *hs;
+
+       h = dcerpc_binding_handle_create(p,
+                                        &dcerpc_bh_ops,
+                                        NULL,
+                                        NULL, /* TODO */
+                                        &hs,
+                                        struct dcerpc_bh_state,
+                                        __location__);
+       if (h == NULL) {
+               return NULL;
+       }
+       hs->p = p;
+
+       dcerpc_binding_handle_set_sync_ev(h, p->conn->event_ctx);
+
+       return h;
+}
+
+/* initialise a dcerpc pipe. */
+_PUBLIC_ struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev)
 {
        struct dcerpc_pipe *p;
 
-       p = talloc(mem_ctx, struct dcerpc_pipe);
+       p = talloc_zero(mem_ctx, struct dcerpc_pipe);
        if (!p) {
                return NULL;
        }
 
-       p->conn = dcerpc_connection_init(p, ev, ic);
+       p->conn = dcerpc_connection_init(p, ev);
        if (p->conn == NULL) {
                talloc_free(p);
                return NULL;
@@ -114,6 +613,16 @@ _PUBLIC_ struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct event_
        ZERO_STRUCT(p->syntax);
        ZERO_STRUCT(p->transfer_syntax);
 
+       if (DEBUGLVL(100)) {
+               p->conn->flags |= DCERPC_DEBUG_PRINT_BOTH;
+       }
+
+       p->binding_handle = dcerpc_pipe_binding_handle(p);
+       if (p->binding_handle == NULL) {
+               talloc_free(p);
+               return NULL;
+       }
+
        return p;
 }
 
@@ -121,7 +630,7 @@ _PUBLIC_ struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct event_
 /* 
    choose the next call id to use
 */
-static uint32_t next_call_id(struct dcerpc_connection *c)
+static uint32_t next_call_id(struct dcecli_connection *c)
 {
        c->call_id++;
        if (c->call_id == 0) {
@@ -130,43 +639,13 @@ static uint32_t next_call_id(struct dcerpc_connection *c)
        return c->call_id;
 }
 
-/* we need to be able to get/set the fragment length without doing a full
-   decode */
-void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v)
-{
-       if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) {
-               SSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET, v);
-       } else {
-               RSSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET, v);
-       }
-}
-
-uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob)
-{
-       if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) {
-               return SVAL(blob->data, DCERPC_FRAG_LEN_OFFSET);
-       } else {
-               return RSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET);
-       }
-}
-
-void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v)
-{
-       if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) {
-               SSVAL(blob->data, DCERPC_AUTH_LEN_OFFSET, v);
-       } else {
-               RSSVAL(blob->data, DCERPC_AUTH_LEN_OFFSET, v);
-       }
-}
-
-
 /**
   setup for a ndr pull, also setting up any flags from the binding string
 */
-static struct ndr_pull *ndr_pull_init_flags(struct dcerpc_connection *c, 
+static struct ndr_pull *ndr_pull_init_flags(struct dcecli_connection *c, 
                                            DATA_BLOB *blob, TALLOC_CTX *mem_ctx)
 {
-       struct ndr_pull *ndr = ndr_pull_init_blob(blob, mem_ctx, c->iconv_convenience);
+       struct ndr_pull *ndr = ndr_pull_init_blob(blob, mem_ctx);
 
        if (ndr == NULL) return ndr;
 
@@ -178,6 +657,10 @@ static struct ndr_pull *ndr_pull_init_flags(struct dcerpc_connection *c,
                ndr->flags |= LIBNDR_FLAG_REF_ALLOC;
        }
 
+       if (c->flags & DCERPC_NDR64) {
+               ndr->flags |= LIBNDR_FLAG_NDR64;
+       }
+
        return ndr;
 }
 
@@ -185,13 +668,13 @@ static struct ndr_pull *ndr_pull_init_flags(struct dcerpc_connection *c,
    parse a data blob into a ncacn_packet structure. This handles both
    input and output packets
 */
-static NTSTATUS ncacn_pull(struct dcerpc_connection *c, DATA_BLOB *blob, TALLOC_CTX *mem_ctx, 
+static NTSTATUS ncacn_pull(struct dcecli_connection *c, DATA_BLOB *blob, TALLOC_CTX *mem_ctx, 
                            struct ncacn_packet *pkt)
 {
        struct ndr_pull *ndr;
        enum ndr_err_code ndr_err;
 
-       ndr = ndr_pull_init_flags(c, blob, mem_ctx);
+       ndr = ndr_pull_init_blob(blob, mem_ctx);
        if (!ndr) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -211,15 +694,13 @@ static NTSTATUS ncacn_pull(struct dcerpc_connection *c, DATA_BLOB *blob, TALLOC_
 /* 
    parse the authentication information on a dcerpc response packet
 */
-static NTSTATUS ncacn_pull_request_auth(struct dcerpc_connection *c, TALLOC_CTX *mem_ctx, 
+static NTSTATUS ncacn_pull_request_auth(struct dcecli_connection *c, TALLOC_CTX *mem_ctx, 
                                        DATA_BLOB *raw_packet,
                                        struct ncacn_packet *pkt)
 {
-       struct ndr_pull *ndr;
        NTSTATUS status;
        struct dcerpc_auth auth;
-       DATA_BLOB auth_blob;
-       enum ndr_err_code ndr_err;
+       uint32_t auth_length;
 
        if (!c->security_state.auth_info ||
            !c->security_state.generic_state) {
@@ -246,39 +727,17 @@ static NTSTATUS ncacn_pull_request_auth(struct dcerpc_connection *c, TALLOC_CTX
                return NT_STATUS_INVALID_LEVEL;
        }
 
-       auth_blob.length = 8 + pkt->auth_length;
-
-       /* check for a valid length */
-       if (pkt->u.response.stub_and_verifier.length < auth_blob.length) {
-               return NT_STATUS_INFO_LENGTH_MISMATCH;
-       }
-
-       auth_blob.data = 
-               pkt->u.response.stub_and_verifier.data + 
-               pkt->u.response.stub_and_verifier.length - auth_blob.length;
-       pkt->u.response.stub_and_verifier.length -= auth_blob.length;
-
-       /* pull the auth structure */
-       ndr = ndr_pull_init_flags(c, &auth_blob, mem_ctx);
-       if (!ndr) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!(pkt->drep[0] & DCERPC_DREP_LE)) {
-               ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
-       }
+       status = dcerpc_pull_auth_trailer(pkt, mem_ctx,
+                                         &pkt->u.response.stub_and_verifier,
+                                         &auth, &auth_length, false);
+       NT_STATUS_NOT_OK_RETURN(status);
 
-       ndr_err = ndr_pull_dcerpc_auth(ndr, NDR_SCALARS|NDR_BUFFERS, &auth);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return ndr_map_error2ntstatus(ndr_err);
-       }
-       status = NT_STATUS_OK;
+       pkt->u.response.stub_and_verifier.length -= auth_length;
 
        /* check signature or unseal the packet */
        switch (c->security_state.auth_info->auth_level) {
        case DCERPC_AUTH_LEVEL_PRIVACY:
                status = gensec_unseal_packet(c->security_state.generic_state, 
-                                             mem_ctx, 
                                              raw_packet->data + DCERPC_REQUEST_LENGTH,
                                              pkt->u.response.stub_and_verifier.length, 
                                              raw_packet->data,
@@ -291,7 +750,6 @@ static NTSTATUS ncacn_pull_request_auth(struct dcerpc_connection *c, TALLOC_CTX
                
        case DCERPC_AUTH_LEVEL_INTEGRITY:
                status = gensec_check_packet(c->security_state.generic_state, 
-                                            mem_ctx, 
                                             pkt->u.response.stub_and_verifier.data, 
                                             pkt->u.response.stub_and_verifier.length, 
                                             raw_packet->data,
@@ -309,7 +767,7 @@ static NTSTATUS ncacn_pull_request_auth(struct dcerpc_connection *c, TALLOC_CTX
                break;
        }
        
-       /* remove the indicated amount of paddiing */
+       /* remove the indicated amount of padding */
        if (pkt->u.response.stub_and_verifier.length < auth.auth_pad_length) {
                return NT_STATUS_INFO_LENGTH_MISMATCH;
        }
@@ -322,7 +780,7 @@ static NTSTATUS ncacn_pull_request_auth(struct dcerpc_connection *c, TALLOC_CTX
 /* 
    push a dcerpc request packet into a blob, possibly signing it.
 */
-static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c, 
+static NTSTATUS ncacn_push_request_sign(struct dcecli_connection *c, 
                                         DATA_BLOB *blob, TALLOC_CTX *mem_ctx, 
                                         size_t sig_size,
                                         struct ncacn_packet *pkt)
@@ -336,7 +794,7 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c,
 
        /* non-signed packets are simpler */
        if (sig_size == 0) {
-               return ncacn_push_auth(blob, mem_ctx, c->iconv_convenience, pkt, NULL);
+               return ncacn_push_auth(blob, mem_ctx, pkt, NULL);
        }
 
        switch (c->security_state.auth_info->auth_level) {
@@ -346,16 +804,16 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c,
 
        case DCERPC_AUTH_LEVEL_CONNECT:
                /* TODO: let the gensec mech decide if it wants to generate a signature */
-               return ncacn_push_auth(blob, mem_ctx, c->iconv_convenience, pkt, NULL);
+               return ncacn_push_auth(blob, mem_ctx, pkt, NULL);
 
        case DCERPC_AUTH_LEVEL_NONE:
-               return ncacn_push_auth(blob, mem_ctx, c->iconv_convenience, pkt, NULL);
+               return ncacn_push_auth(blob, mem_ctx, pkt, NULL);
 
        default:
                return NT_STATUS_INVALID_LEVEL;
        }
 
-       ndr = ndr_push_init_ctx(mem_ctx, c->iconv_convenience);
+       ndr = ndr_push_init_ctx(mem_ctx);
        if (!ndr) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -364,6 +822,10 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c,
                ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
 
+       if (c->flags & DCERPC_NDR64) {
+               ndr->flags |= LIBNDR_FLAG_NDR64;
+       }
+
        if (pkt->pfc_flags & DCERPC_PFC_FLAG_OBJECT_UUID) {
                ndr->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
                hdr_size += 16;
@@ -373,17 +835,18 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c,
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                return ndr_map_error2ntstatus(ndr_err);
        }
-       status = NT_STATUS_OK;
 
        /* pad to 16 byte multiple in the payload portion of the
-          packet. This matches what w2k3 does */
-       c->security_state.auth_info->auth_pad_length = 
+          packet. This matches what w2k3 does. Note that we can't use
+          ndr_push_align() as that is relative to the start of the
+          whole packet, whereas w2k8 wants it relative to the start
+          of the stub */
+       c->security_state.auth_info->auth_pad_length =
                (16 - (pkt->u.request.stub_and_verifier.length & 15)) & 15;
        ndr_err = ndr_push_zero(ndr, c->security_state.auth_info->auth_pad_length);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                return ndr_map_error2ntstatus(ndr_err);
        }
-       status = NT_STATUS_OK;
 
        payload_length = pkt->u.request.stub_and_verifier.length + 
                c->security_state.auth_info->auth_pad_length;
@@ -396,7 +859,6 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c,
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                return ndr_map_error2ntstatus(ndr_err);
        }
-       status = NT_STATUS_OK;
 
        /* extract the whole packet as a blob */
        *blob = ndr_push_blob(ndr);
@@ -444,11 +906,17 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c,
        }
 
        if (creds2.length != sig_size) {
-               DEBUG(0,("dcesrv_auth_response: creds2.length[%u] != sig_size[%u] pad[%u] stub[%u]\n",
-                       creds2.length, (uint32_t)sig_size,
-                       c->security_state.auth_info->auth_pad_length,
-                       pkt->u.request.stub_and_verifier.length));
-               return NT_STATUS_INTERNAL_ERROR;
+               /* this means the sig_size estimate for the signature
+                  was incorrect. We have to correct the packet
+                  sizes. That means we could go over the max fragment
+                  length */
+               DEBUG(3,("ncacn_push_request_sign: creds2.length[%u] != sig_size[%u] pad[%u] stub[%u]\n",
+                       (unsigned) creds2.length,
+                       (unsigned) sig_size,
+                       (unsigned) c->security_state.auth_info->auth_pad_length,
+                       (unsigned) pkt->u.request.stub_and_verifier.length));
+               dcerpc_set_frag_length(blob, blob->length + creds2.length);
+               dcerpc_set_auth_length(blob, creds2.length);
        }
 
        if (!data_blob_append(mem_ctx, blob, creds2.data, creds2.length)) {
@@ -462,7 +930,7 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c,
 /* 
    fill in the fixed values in a dcerpc header 
 */
-static void init_ncacn_hdr(struct dcerpc_connection *c, struct ncacn_packet *pkt)
+static void init_ncacn_hdr(struct dcecli_connection *c, struct ncacn_packet *pkt)
 {
        pkt->rpc_vers = 5;
        pkt->rpc_vers_minor = 0;
@@ -490,16 +958,6 @@ static NTSTATUS dcerpc_map_reason(uint16_t reason)
        return NT_STATUS_UNSUCCESSFUL;
 }
 
-/*
-  a bind or alter context has failed
-*/
-static void dcerpc_composite_fail(struct rpc_request *req)
-{
-       struct composite_context *c = talloc_get_type(req->async.private_data, 
-                                                     struct composite_context);
-       composite_error(c, req->status);
-}
-
 /*
   remove requests from the pending or queued queues
  */
@@ -522,12 +980,17 @@ static int dcerpc_req_dequeue(struct rpc_request *req)
 /*
   mark the dcerpc connection dead. All outstanding requests get an error
 */
-static void dcerpc_connection_dead(struct dcerpc_connection *conn, NTSTATUS status)
+static void dcerpc_connection_dead(struct dcecli_connection *conn, NTSTATUS status)
 {
        if (conn->dead) return;
 
        conn->dead = true;
 
+       TALLOC_FREE(conn->io_trigger);
+       conn->io_trigger_pending = false;
+
+       conn->transport.recv_data = NULL;
+
        if (conn->transport.shutdown_pipe) {
                conn->transport.shutdown_pipe(conn, status);
        }
@@ -543,6 +1006,17 @@ static void dcerpc_connection_dead(struct dcerpc_connection *conn, NTSTATUS stat
                }
        }       
 
+       /* all requests, which are not shipped */
+       while (conn->request_queue) {
+               struct rpc_request *req = conn->request_queue;
+               dcerpc_req_dequeue(req);
+               req->state = RPC_REQUEST_DONE;
+               req->status = status;
+               if (req->async.callback) {
+                       req->async.callback(req);
+               }
+       }
+
        talloc_set_destructor(conn, NULL);
        if (conn->free_skipped) {
                talloc_free(conn);
@@ -553,7 +1027,7 @@ static void dcerpc_connection_dead(struct dcerpc_connection *conn, NTSTATUS stat
   forward declarations of the recv_data handlers for the types of
   packets we need to handle
 */
-static void dcerpc_request_recv_data(struct dcerpc_connection *c, 
+static void dcerpc_request_recv_data(struct dcecli_connection *c, 
                                     DATA_BLOB *raw_packet, struct ncacn_packet *pkt);
 
 /*
@@ -561,7 +1035,7 @@ static void dcerpc_request_recv_data(struct dcerpc_connection *c,
   type of reply it is (normal request, bind or alter context) and
   dispatch to the appropriate handler
 */
-static void dcerpc_recv_data(struct dcerpc_connection *conn, DATA_BLOB *blob, NTSTATUS status)
+static void dcerpc_recv_data(struct dcecli_connection *conn, DATA_BLOB *blob, NTSTATUS status)
 {
        struct ncacn_packet pkt;
 
@@ -582,80 +1056,19 @@ static void dcerpc_recv_data(struct dcerpc_connection *conn, DATA_BLOB *blob, NT
        if (!NT_STATUS_IS_OK(status)) {
                data_blob_free(blob);
                dcerpc_connection_dead(conn, status);
-       }
-
-       dcerpc_request_recv_data(conn, blob, &pkt);
-}
-
-
-/*
-  Receive a bind reply from the transport
-*/
-static void dcerpc_bind_recv_handler(struct rpc_request *req, 
-                                    DATA_BLOB *raw_packet, struct ncacn_packet *pkt)
-{
-       struct composite_context *c;
-       struct dcerpc_connection *conn;
-
-       c = talloc_get_type(req->async.private_data, struct composite_context);
-
-       if (pkt->ptype == DCERPC_PKT_BIND_NAK) {
-               DEBUG(2,("dcerpc: bind_nak reason %d\n",
-                        pkt->u.bind_nak.reject_reason));
-               composite_error(c, dcerpc_map_reason(pkt->u.bind_nak.
-                                                    reject_reason));
-               return;
-       }
-
-       if ((pkt->ptype != DCERPC_PKT_BIND_ACK) ||
-           (pkt->u.bind_ack.num_results == 0) ||
-           (pkt->u.bind_ack.ctx_list[0].result != 0)) {
-               composite_error(c, NT_STATUS_NET_WRITE_FAULT);
                return;
        }
 
-       conn = req->p->conn;
-
-       conn->srv_max_xmit_frag = pkt->u.bind_ack.max_xmit_frag;
-       conn->srv_max_recv_frag = pkt->u.bind_ack.max_recv_frag;
-
-       if ((req->p->binding->flags & DCERPC_CONCURRENT_MULTIPLEX) &&
-           (pkt->pfc_flags & DCERPC_PFC_FLAG_CONC_MPX)) {
-               conn->flags |= DCERPC_CONCURRENT_MULTIPLEX;
-       }
-
-       if ((req->p->binding->flags & DCERPC_HEADER_SIGNING) &&
-           (pkt->pfc_flags & DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN)) {
-               conn->flags |= DCERPC_HEADER_SIGNING;
-       }
-
-       /* the bind_ack might contain a reply set of credentials */
-       if (conn->security_state.auth_info &&
-           pkt->u.bind_ack.auth_info.length) {
-               enum ndr_err_code ndr_err;
-               ndr_err = ndr_pull_struct_blob(
-                       &pkt->u.bind_ack.auth_info, conn,
-                       NULL,
-                       conn->security_state.auth_info,
-                       (ndr_pull_flags_fn_t)ndr_pull_dcerpc_auth);
-               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       c->status = ndr_map_error2ntstatus(ndr_err);
-                       if (!composite_is_ok(c)) return;
-               }
-       }
-
-       req->p->assoc_group_id = pkt->u.bind_ack.assoc_group_id;
-
-       composite_done(c);
+       dcerpc_request_recv_data(conn, blob, &pkt);
 }
 
 /*
   handle timeouts of individual dcerpc requests
 */
-static void dcerpc_timeout_handler(struct event_context *ev, struct timed_event *te, 
-                                  struct timeval t, void *private)
+static void dcerpc_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
+                                  struct timeval t, void *private_data)
 {
-       struct rpc_request *req = talloc_get_type(private, struct rpc_request);
+       struct rpc_request *req = talloc_get_type(private_data, struct rpc_request);
 
        if (req->ignore_timeout) {
                dcerpc_req_dequeue(req);
@@ -670,23 +1083,37 @@ static void dcerpc_timeout_handler(struct event_context *ev, struct timed_event
        dcerpc_connection_dead(req->p->conn, NT_STATUS_IO_TIMEOUT);
 }
 
-/*
-  send a async dcerpc bind request
-*/
-struct composite_context *dcerpc_bind_send(struct dcerpc_pipe *p,
-                                          TALLOC_CTX *mem_ctx,
-                                          const struct ndr_syntax_id *syntax,
-                                          const struct ndr_syntax_id *transfer_syntax)
+struct dcerpc_bind_state {
+       struct tevent_context *ev;
+       struct dcerpc_pipe *p;
+};
+
+static void dcerpc_bind_fail_handler(struct rpc_request *subreq);
+static void dcerpc_bind_recv_handler(struct rpc_request *subreq,
+                                    DATA_BLOB *raw_packet,
+                                    struct ncacn_packet *pkt);
+
+struct tevent_req *dcerpc_bind_send(TALLOC_CTX *mem_ctx,
+                                   struct tevent_context *ev,
+                                   struct dcerpc_pipe *p,
+                                   const struct ndr_syntax_id *syntax,
+                                   const struct ndr_syntax_id *transfer_syntax)
 {
-       struct composite_context *c;
+       struct tevent_req *req;
+       struct dcerpc_bind_state *state;
        struct ncacn_packet pkt;
        DATA_BLOB blob;
-       struct rpc_request *req;
+       NTSTATUS status;
+       struct rpc_request *subreq;
 
-       c = composite_create(mem_ctx,p->conn->event_ctx);
-       if (c == NULL) return NULL;
+       req = tevent_req_create(mem_ctx, &state,
+                               struct dcerpc_bind_state);
+       if (req == NULL) {
+               return NULL;
+       }
 
-       c->private_data = p;
+       state->ev = ev;
+       state->p = p;
 
        p->syntax = *syntax;
        p->transfer_syntax = *transfer_syntax;
@@ -711,7 +1138,9 @@ struct composite_context *dcerpc_bind_send(struct dcerpc_pipe *p,
        pkt.u.bind.assoc_group_id = p->binding->assoc_group_id;
        pkt.u.bind.num_contexts = 1;
        pkt.u.bind.ctx_list = talloc_array(mem_ctx, struct dcerpc_ctx_list, 1);
-       if (composite_nomem(pkt.u.bind.ctx_list, c)) return c;
+       if (tevent_req_nomem(pkt.u.bind.ctx_list, req)) {
+               return tevent_req_post(req, ev);
+       }
        pkt.u.bind.ctx_list[0].context_id = p->context_id;
        pkt.u.bind.ctx_list[0].num_transfer_syntaxes = 1;
        pkt.u.bind.ctx_list[0].abstract_syntax = p->syntax;
@@ -719,9 +1148,11 @@ struct composite_context *dcerpc_bind_send(struct dcerpc_pipe *p,
        pkt.u.bind.auth_info = data_blob(NULL, 0);
 
        /* construct the NDR form of the packet */
-       c->status = ncacn_push_auth(&blob, c, p->conn->iconv_convenience, &pkt,
-                                   p->conn->security_state.auth_info);
-       if (!composite_is_ok(c)) return c;
+       status = ncacn_push_auth(&blob, state, &pkt,
+                                p->conn->security_state.auth_info);
+       if (tevent_req_nterror(req, status)) {
+               return tevent_req_post(req, ev);
+       }
 
        p->conn->transport.recv_data = dcerpc_recv_data;
 
@@ -729,37 +1160,141 @@ struct composite_context *dcerpc_bind_send(struct dcerpc_pipe *p,
         * we allocate a dcerpc_request so we can be in the same
         * request queue as normal requests
         */
-       req = talloc_zero(c, struct rpc_request);
-       if (composite_nomem(req, c)) return c;
+       subreq = talloc_zero(state, struct rpc_request);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
 
-       req->state = RPC_REQUEST_PENDING;
-       req->call_id = pkt.call_id;
-       req->async.private_data = c;
-       req->async.callback = dcerpc_composite_fail;
-       req->p = p;
-       req->recv_handler = dcerpc_bind_recv_handler;
-       DLIST_ADD_END(p->conn->pending, req, struct rpc_request *);
-       talloc_set_destructor(req, dcerpc_req_dequeue);
+       subreq->state = RPC_REQUEST_PENDING;
+       subreq->call_id = pkt.call_id;
+       subreq->async.private_data = req;
+       subreq->async.callback = dcerpc_bind_fail_handler;
+       subreq->p = p;
+       subreq->recv_handler = dcerpc_bind_recv_handler;
+       DLIST_ADD_END(p->conn->pending, subreq, struct rpc_request *);
+       talloc_set_destructor(subreq, dcerpc_req_dequeue);
+
+       status = p->conn->transport.send_request(p->conn, &blob, true);
+       if (tevent_req_nterror(req, status)) {
+               return tevent_req_post(req, ev);
+       }
+
+       tevent_add_timer(ev, subreq,
+                        timeval_current_ofs(DCERPC_REQUEST_TIMEOUT, 0),
+                        dcerpc_timeout_handler, subreq);
+
+       return req;
+}
+
+static void dcerpc_bind_fail_handler(struct rpc_request *subreq)
+{
+       struct tevent_req *req =
+               talloc_get_type_abort(subreq->async.private_data,
+               struct tevent_req);
+       struct dcerpc_bind_state *state =
+               tevent_req_data(req,
+               struct dcerpc_bind_state);
+       NTSTATUS status = subreq->status;
+
+       TALLOC_FREE(subreq);
+
+       /*
+        * We trigger the callback in the next event run
+        * because the code in this file might trigger
+        * multiple request callbacks from within a single
+        * while loop.
+        *
+        * In order to avoid segfaults from within
+        * dcerpc_connection_dead() we call
+        * tevent_req_defer_callback().
+        */
+       tevent_req_defer_callback(req, state->ev);
+
+       tevent_req_nterror(req, status);
+}
+
+static void dcerpc_bind_recv_handler(struct rpc_request *subreq,
+                                    DATA_BLOB *raw_packet,
+                                    struct ncacn_packet *pkt)
+{
+       struct tevent_req *req =
+               talloc_get_type_abort(subreq->async.private_data,
+               struct tevent_req);
+       struct dcerpc_bind_state *state =
+               tevent_req_data(req,
+               struct dcerpc_bind_state);
+       struct dcecli_connection *conn = state->p->conn;
+       NTSTATUS status;
+
+       /*
+        * Note that pkt is allocated under raw_packet->data,
+        * while raw_packet->data is a child of subreq.
+        */
+       talloc_steal(state, raw_packet->data);
+       TALLOC_FREE(subreq);
+
+       /*
+        * We trigger the callback in the next event run
+        * because the code in this file might trigger
+        * multiple request callbacks from within a single
+        * while loop.
+        *
+        * In order to avoid segfaults from within
+        * dcerpc_connection_dead() we call
+        * tevent_req_defer_callback().
+        */
+       tevent_req_defer_callback(req, state->ev);
+
+       if (pkt->ptype == DCERPC_PKT_BIND_NAK) {
+               status = dcerpc_map_reason(pkt->u.bind_nak.reject_reason);
+
+               DEBUG(2,("dcerpc: bind_nak reason %d - %s\n",
+                        pkt->u.bind_nak.reject_reason, nt_errstr(status)));
+
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       if ((pkt->ptype != DCERPC_PKT_BIND_ACK) ||
+           (pkt->u.bind_ack.num_results == 0) ||
+           (pkt->u.bind_ack.ctx_list[0].result != 0)) {
+               state->p->last_fault_code = DCERPC_NCA_S_PROTO_ERROR;
+               tevent_req_nterror(req, NT_STATUS_NET_WRITE_FAULT);
+               return;
+       }
+
+       conn->srv_max_xmit_frag = pkt->u.bind_ack.max_xmit_frag;
+       conn->srv_max_recv_frag = pkt->u.bind_ack.max_recv_frag;
+
+       if ((state->p->binding->flags & DCERPC_CONCURRENT_MULTIPLEX) &&
+           (pkt->pfc_flags & DCERPC_PFC_FLAG_CONC_MPX)) {
+               conn->flags |= DCERPC_CONCURRENT_MULTIPLEX;
+       }
+
+       if ((state->p->binding->flags & DCERPC_HEADER_SIGNING) &&
+           (pkt->pfc_flags & DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN)) {
+               conn->flags |= DCERPC_HEADER_SIGNING;
+       }
+
+       /* the bind_ack might contain a reply set of credentials */
+       if (conn->security_state.auth_info && pkt->u.bind_ack.auth_info.length) {
+               uint32_t auth_length;
 
-       c->status = p->conn->transport.send_request(p->conn, &blob,
-                                                   true);
-       if (!composite_is_ok(c)) return c;
+               status = dcerpc_pull_auth_trailer(pkt, conn, &pkt->u.bind_ack.auth_info,
+                                                 conn->security_state.auth_info, &auth_length, true);
+               if (tevent_req_nterror(req, status)) {
+                       return;
+               }
+       }
 
-       event_add_timed(c->event_ctx, req,
-                       timeval_current_ofs(DCERPC_REQUEST_TIMEOUT, 0),
-                       dcerpc_timeout_handler, req);
+       state->p->assoc_group_id = pkt->u.bind_ack.assoc_group_id;
 
-       return c;
+       tevent_req_done(req);
 }
 
-/*
-  recv side of async dcerpc bind request
-*/
-NTSTATUS dcerpc_bind_recv(struct composite_context *ctx)
+NTSTATUS dcerpc_bind_recv(struct tevent_req *req)
 {
-       NTSTATUS result = composite_wait(ctx);
-       talloc_free(ctx);
-       return result;
+       return tevent_req_simple_recv_ntstatus(req);
 }
 
 /* 
@@ -778,7 +1313,6 @@ NTSTATUS dcerpc_auth3(struct dcerpc_pipe *p,
        pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
        pkt.call_id = next_call_id(p->conn);
        pkt.auth_length = 0;
-       pkt.u.auth3._pad = 0;
        pkt.u.auth3.auth_info = data_blob(NULL, 0);
 
        if (p->binding->flags & DCERPC_CONCURRENT_MULTIPLEX) {
@@ -791,7 +1325,6 @@ NTSTATUS dcerpc_auth3(struct dcerpc_pipe *p,
 
        /* construct the NDR form of the packet */
        status = ncacn_push_auth(&blob, mem_ctx,
-                                p->conn->iconv_convenience,
                                 &pkt,
                                 p->conn->security_state.auth_info);
        if (!NT_STATUS_IS_OK(status)) {
@@ -814,11 +1347,11 @@ NTSTATUS dcerpc_auth3(struct dcerpc_pipe *p,
 
   This function frees the data 
 */
-static void dcerpc_request_recv_data(struct dcerpc_connection *c, 
+static void dcerpc_request_recv_data(struct dcecli_connection *c, 
                                     DATA_BLOB *raw_packet, struct ncacn_packet *pkt)
 {
        struct rpc_request *req;
-       uint_t length;
+       unsigned int length;
        NTSTATUS status = NT_STATUS_OK;
 
        /*
@@ -917,11 +1450,11 @@ req_done:
        req->state = RPC_REQUEST_DONE;
        DLIST_REMOVE(c->pending, req);
 
-       if (c->request_queue != NULL) {
-               /* We have to look at shipping further requests before calling
-                * the async function, that one might close the pipe */
-               dcerpc_ship_next_request(c);
-       }
+       /*
+        * We have to look at shipping further requests before calling
+        * the async function, that one might close the pipe
+        */
+       dcerpc_schedule_io_trigger(c);
 
        if (req->async.callback) {
                req->async.callback(req);
@@ -931,17 +1464,17 @@ req_done:
 /*
   perform the send side of a async dcerpc request
 */
-static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p, 
+static struct rpc_request *dcerpc_request_send(TALLOC_CTX *mem_ctx,
+                                              struct dcerpc_pipe *p,
                                               const struct GUID *object,
                                               uint16_t opnum,
-                                              bool async,
                                               DATA_BLOB *stub_data)
 {
        struct rpc_request *req;
 
        p->conn->transport.recv_data = dcerpc_recv_data;
 
-       req = talloc(p, struct rpc_request);
+       req = talloc(mem_ctx, struct rpc_request);
        if (req == NULL) {
                return NULL;
        }
@@ -953,7 +1486,6 @@ static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
        req->payload = data_blob(NULL, 0);
        req->flags = 0;
        req->fault_code = 0;
-       req->async_call = async;
        req->ignore_timeout = false;
        req->async.callback = NULL;
        req->async.private_data = NULL;
@@ -971,18 +1503,15 @@ static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
 
        req->opnum = opnum;
        req->request_data.length = stub_data->length;
-       req->request_data.data = talloc_reference(req, stub_data->data);
-       if (req->request_data.length && req->request_data.data == NULL) {
-               return NULL;
-       }
+       req->request_data.data = stub_data->data;
 
        DLIST_ADD_END(p->conn->request_queue, req, struct rpc_request *);
        talloc_set_destructor(req, dcerpc_req_dequeue);
 
-       dcerpc_ship_next_request(p->conn);
+       dcerpc_schedule_io_trigger(p->conn);
 
        if (p->request_timeout) {
-               event_add_timed(dcerpc_event_context(p), req, 
+               tevent_add_timer(dcerpc_event_context(p), req,
                                timeval_current_ofs(p->request_timeout, 0), 
                                dcerpc_timeout_handler, req);
        }
@@ -994,7 +1523,7 @@ static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
   Send a request using the transport
 */
 
-static void dcerpc_ship_next_request(struct dcerpc_connection *c)
+static void dcerpc_ship_next_request(struct dcecli_connection *c)
 {
        struct rpc_request *req;
        struct dcerpc_pipe *p;
@@ -1004,6 +1533,7 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
        uint32_t remaining, chunk_size;
        bool first_packet = true;
        size_t sig_size = 0;
+       bool need_async = false;
 
        req = c->request_queue;
        if (req == NULL) {
@@ -1013,8 +1543,8 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
        p = req->p;
        stub_data = &req->request_data;
 
-       if (!req->async_call && (c->pending != NULL)) {
-               return;
+       if (c->pending) {
+               need_async = true;
        }
 
        DLIST_REMOVE(c->request_queue, req);
@@ -1058,6 +1588,7 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
        while (remaining > 0 || first_packet) {
                uint32_t chunk = MIN(chunk_size, remaining);
                bool last_frag = false;
+               bool do_trans = false;
 
                first_packet = false;
                pkt.pfc_flags &= ~(DCERPC_PFC_FLAG_FIRST |DCERPC_PFC_FLAG_LAST);
@@ -1080,23 +1611,73 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
                        DLIST_REMOVE(p->conn->pending, req);
                        return;
                }
-               
-               req->status = p->conn->transport.send_request(p->conn, &blob, last_frag);
+
+               if (last_frag && !need_async) {
+                       do_trans = true;
+               }
+
+               req->status = p->conn->transport.send_request(p->conn, &blob, do_trans);
                if (!NT_STATUS_IS_OK(req->status)) {
                        req->state = RPC_REQUEST_DONE;
                        DLIST_REMOVE(p->conn->pending, req);
                        return;
                }               
 
+               if (last_frag && !do_trans) {
+                       req->status = p->conn->transport.send_read(p->conn);
+                       if (!NT_STATUS_IS_OK(req->status)) {
+                               req->state = RPC_REQUEST_DONE;
+                               DLIST_REMOVE(p->conn->pending, req);
+                               return;
+                       }
+               }
+
                remaining -= chunk;
        }
 }
 
+static void dcerpc_io_trigger(struct tevent_context *ctx,
+                             struct tevent_immediate *im,
+                             void *private_data)
+{
+       struct dcecli_connection *c =
+               talloc_get_type_abort(private_data,
+               struct dcecli_connection);
+
+       c->io_trigger_pending = false;
+
+       dcerpc_schedule_io_trigger(c);
+
+       dcerpc_ship_next_request(c);
+}
+
+static void dcerpc_schedule_io_trigger(struct dcecli_connection *c)
+{
+       if (c->dead) {
+               return;
+       }
+
+       if (c->request_queue == NULL) {
+               return;
+       }
+
+       if (c->io_trigger_pending) {
+               return;
+       }
+
+       c->io_trigger_pending = true;
+
+       tevent_schedule_immediate(c->io_trigger,
+                                 c->event_ctx,
+                                 dcerpc_io_trigger,
+                                 c);
+}
+
 /*
   return the event context for a dcerpc pipe
   used by callers who wish to operate asynchronously
 */
-_PUBLIC_ struct event_context *dcerpc_event_context(struct dcerpc_pipe *p)
+_PUBLIC_ struct tevent_context *dcerpc_event_context(struct dcerpc_pipe *p)
 {
        return p->conn->event_ctx;
 }
@@ -1106,15 +1687,15 @@ _PUBLIC_ struct event_context *dcerpc_event_context(struct dcerpc_pipe *p)
 /*
   perform the receive side of a async dcerpc request
 */
-NTSTATUS dcerpc_request_recv(struct rpc_request *req,
-                            TALLOC_CTX *mem_ctx,
-                            DATA_BLOB *stub_data)
+static NTSTATUS dcerpc_request_recv(struct rpc_request *req,
+                                   TALLOC_CTX *mem_ctx,
+                                   DATA_BLOB *stub_data)
 {
        NTSTATUS status;
 
        while (req->state != RPC_REQUEST_DONE) {
-               struct event_context *ctx = dcerpc_event_context(req->p);
-               if (event_loop_once(ctx) != 0) {
+               struct tevent_context *ctx = dcerpc_event_context(req->p);
+               if (tevent_loop_once(ctx) != 0) {
                        return NT_STATUS_CONNECTION_DISCONNECTED;
                }
        }
@@ -1126,39 +1707,17 @@ NTSTATUS dcerpc_request_recv(struct rpc_request *req,
        if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                req->p->last_fault_code = req->fault_code;
        }
-       talloc_free(req);
+       talloc_unlink(talloc_parent(req), req);
        return status;
 }
 
-/*
-  perform a full request/response pair on a dcerpc pipe
-*/
-NTSTATUS dcerpc_request(struct dcerpc_pipe *p, 
-                       struct GUID *object,
-                       uint16_t opnum,
-                       bool async,
-                       TALLOC_CTX *mem_ctx,
-                       DATA_BLOB *stub_data_in,
-                       DATA_BLOB *stub_data_out)
-{
-       struct rpc_request *req;
-
-       req = dcerpc_request_send(p, object, opnum, async, stub_data_in);
-       if (req == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       return dcerpc_request_recv(req, mem_ctx, stub_data_out);
-}
-
-
 /*
   this is a paranoid NDR validator. For every packet we push onto the wire
   we pull it back again, then push it again. Then we compare the raw NDR data
   for that to the NDR we initially generated. If they don't match then we know
   we must have a bug in either the pull or push side of our code
 */
-static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_connection *c, 
+static NTSTATUS dcerpc_ndr_validate_in(struct dcecli_connection *c, 
                                       TALLOC_CTX *mem_ctx,
                                       DATA_BLOB blob,
                                       size_t struct_size,
@@ -1182,6 +1741,14 @@ static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_connection *c,
        }
        pull->flags |= LIBNDR_FLAG_REF_ALLOC;
 
+       if (c->flags & DCERPC_PUSH_BIGENDIAN) {
+               pull->flags |= LIBNDR_FLAG_BIGENDIAN;
+       }
+
+       if (c->flags & DCERPC_NDR64) {
+               pull->flags |= LIBNDR_FLAG_NDR64;
+       }
+
        ndr_err = ndr_pull(pull, NDR_IN, st);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
@@ -1191,11 +1758,19 @@ static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_connection *c,
                return ndr_map_error2ntstatus(ndr_err);
        }
 
-       push = ndr_push_init_ctx(mem_ctx, c->iconv_convenience);
+       push = ndr_push_init_ctx(mem_ctx);
        if (!push) {
                return NT_STATUS_NO_MEMORY;
        }       
 
+       if (c->flags & DCERPC_PUSH_BIGENDIAN) {
+               push->flags |= LIBNDR_FLAG_BIGENDIAN;
+       }
+
+       if (c->flags & DCERPC_NDR64) {
+               push->flags |= LIBNDR_FLAG_NDR64;
+       }
+
        ndr_err = ndr_push(push, NDR_IN, st);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
@@ -1227,7 +1802,7 @@ static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_connection *c,
   initially generated. If they don't match then we know we must have a
   bug in either the pull or push side of our code
 */
-static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
+static NTSTATUS dcerpc_ndr_validate_out(struct dcecli_connection *c,
                                        struct ndr_pull *pull_in,
                                        void *struct_ptr,
                                        size_t struct_size,
@@ -1249,7 +1824,7 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
        }
        memcpy(st, struct_ptr, struct_size);
 
-       push = ndr_push_init_ctx(mem_ctx, c->iconv_convenience);
+       push = ndr_push_init_ctx(mem_ctx);
        if (!push) {
                return NT_STATUS_NO_MEMORY;
        }       
@@ -1280,7 +1855,7 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
                return ndr_map_error2ntstatus(ndr_err);
        }
 
-       push = ndr_push_init_ctx(mem_ctx, c->iconv_convenience);
+       push = ndr_push_init_ctx(mem_ctx);
        if (!push) {
                return NT_STATUS_NO_MEMORY;
        }       
@@ -1330,189 +1905,6 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
        return NT_STATUS_OK;
 }
 
-
-/**
- send a rpc request given a dcerpc_call structure 
- */
-struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
-                                               const struct GUID *object,
-                                               const struct ndr_interface_table *table,
-                                               uint32_t opnum, 
-                                               TALLOC_CTX *mem_ctx, 
-                                               void *r)
-{
-       const struct ndr_interface_call *call;
-       struct ndr_push *push;
-       NTSTATUS status;
-       DATA_BLOB request;
-       struct rpc_request *req;
-       enum ndr_err_code ndr_err;
-
-       call = &table->calls[opnum];
-
-       /* setup for a ndr_push_* call */
-       push = ndr_push_init_ctx(mem_ctx, p->conn->iconv_convenience);
-       if (!push) {
-               return NULL;
-       }
-
-       if (p->conn->flags & DCERPC_PUSH_BIGENDIAN) {
-               push->flags |= LIBNDR_FLAG_BIGENDIAN;
-       }
-
-       /* push the structure into a blob */
-       ndr_err = call->ndr_push(push, NDR_IN, r);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               status = ndr_map_error2ntstatus(ndr_err);
-               DEBUG(2,("Unable to ndr_push structure in dcerpc_ndr_request_send - %s\n",
-                        nt_errstr(status)));
-               talloc_free(push);
-               return NULL;
-       }
-
-       /* retrieve the blob */
-       request = ndr_push_blob(push);
-
-       if (p->conn->flags & DCERPC_DEBUG_VALIDATE_IN) {
-               status = dcerpc_ndr_validate_in(p->conn, push, request, call->struct_size, 
-                                               call->ndr_push, call->ndr_pull);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(2,("Validation failed in dcerpc_ndr_request_send - %s\n",
-                                nt_errstr(status)));
-                       talloc_free(push);
-                       return NULL;
-               }
-       }
-
-       DEBUG(10,("rpc request data:\n"));
-       dump_data(10, request.data, request.length);
-
-       /* make the actual dcerpc request */
-       req = dcerpc_request_send(p, object, opnum, table->calls[opnum].async,
-                                 &request);
-
-       if (req != NULL) {
-               req->ndr.table = table;
-               req->ndr.opnum = opnum;
-               req->ndr.struct_ptr = r;
-               req->ndr.mem_ctx = mem_ctx;
-       }
-
-       talloc_free(push);
-
-       return req;
-}
-
-/*
-  receive the answer from a dcerpc_ndr_request_send()
-*/
-_PUBLIC_ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
-{
-       struct dcerpc_pipe *p = req->p;
-       NTSTATUS status;
-       DATA_BLOB response;
-       struct ndr_pull *pull;
-       uint_t flags;
-       TALLOC_CTX *mem_ctx = req->ndr.mem_ctx;
-       void *r = req->ndr.struct_ptr;
-       uint32_t opnum = req->ndr.opnum;
-       const struct ndr_interface_table *table = req->ndr.table;
-       const struct ndr_interface_call *call = &table->calls[opnum];
-       enum ndr_err_code ndr_err;
-
-       /* make sure the recv code doesn't free the request, as we
-          need to grab the flags element before it is freed */
-       if (talloc_reference(p, req) == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       status = dcerpc_request_recv(req, mem_ctx, &response);
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_unlink(p, req);
-               return status;
-       }
-
-       flags = req->flags;
-
-       /* prepare for ndr_pull_* */
-       pull = ndr_pull_init_flags(p->conn, &response, mem_ctx);
-       if (!pull) {
-               talloc_unlink(p, req);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (pull->data) {
-               pull->data = talloc_steal(pull, pull->data);
-       }
-       talloc_unlink(p, req);
-
-       if (flags & DCERPC_PULL_BIGENDIAN) {
-               pull->flags |= LIBNDR_FLAG_BIGENDIAN;
-       }
-
-       DEBUG(10,("rpc reply data:\n"));
-       dump_data(10, pull->data, pull->data_size);
-
-       /* pull the structure from the blob */
-       ndr_err = call->ndr_pull(pull, NDR_OUT, r);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               status = ndr_map_error2ntstatus(ndr_err);
-               dcerpc_log_packet(table, opnum, NDR_OUT, 
-                                 &response);
-               return status;
-       }
-
-       if (p->conn->flags & DCERPC_DEBUG_VALIDATE_OUT) {
-               status = dcerpc_ndr_validate_out(p->conn, pull, r, call->struct_size, 
-                                                call->ndr_push, call->ndr_pull, 
-                                                call->ndr_print);
-               if (!NT_STATUS_IS_OK(status)) {
-                       dcerpc_log_packet(table, opnum, NDR_OUT, 
-                                 &response);
-                       return status;
-               }
-       }
-
-       if (pull->offset != pull->data_size) {
-               DEBUG(0,("Warning! ignoring %d unread bytes in rpc packet!\n", 
-                        pull->data_size - pull->offset));
-               /* we used to return NT_STATUS_INFO_LENGTH_MISMATCH here,
-                  but it turns out that early versions of NT
-                  (specifically NT3.1) add junk onto the end of rpc
-                  packets, so if we want to interoperate at all with
-                  those versions then we need to ignore this error */
-       }
-
-       /* TODO: make pull context independent from the output mem_ctx and free the pull context */
-
-       return NT_STATUS_OK;
-}
-
-
-/*
-  a useful helper function for synchronous rpc requests 
-
-  this can be used when you have ndr push/pull functions in the
-  standard format
-*/
-_PUBLIC_ NTSTATUS dcerpc_ndr_request(struct dcerpc_pipe *p,
-                           const struct GUID *object,
-                           const struct ndr_interface_table *table,
-                           uint32_t opnum, 
-                           TALLOC_CTX *mem_ctx, 
-                           void *r)
-{
-       struct rpc_request *req;
-
-       req = dcerpc_ndr_request_send(p, object, table, opnum, mem_ctx, r);
-       if (req == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       return dcerpc_ndr_request_recv(req);
-}
-
-
 /*
   a useful function for retrieving the server name we connected to
 */
@@ -1531,7 +1923,7 @@ _PUBLIC_ const char *dcerpc_server_name(struct dcerpc_pipe *p)
 /*
   get the dcerpc auth_level for a open connection
 */
-uint32_t dcerpc_auth_level(struct dcerpc_connection *c) 
+uint32_t dcerpc_auth_level(struct dcecli_connection *c) 
 {
        uint8_t auth_level;
 
@@ -1547,69 +1939,37 @@ uint32_t dcerpc_auth_level(struct dcerpc_connection *c)
        return auth_level;
 }
 
-/*
-  Receive an alter reply from the transport
-*/
-static void dcerpc_alter_recv_handler(struct rpc_request *req,
-                                     DATA_BLOB *raw_packet, struct ncacn_packet *pkt)
-{
-       struct composite_context *c;
-       struct dcerpc_pipe *recv_pipe;
-
-       c = talloc_get_type(req->async.private_data, struct composite_context);
-       recv_pipe = talloc_get_type(c->private_data, struct dcerpc_pipe);
-
-       if (pkt->ptype == DCERPC_PKT_ALTER_RESP &&
-           pkt->u.alter_resp.num_results == 1 &&
-           pkt->u.alter_resp.ctx_list[0].result != 0) {
-               DEBUG(2,("dcerpc: alter_resp failed - reason %d\n", 
-                        pkt->u.alter_resp.ctx_list[0].reason));
-               composite_error(c, dcerpc_map_reason(pkt->u.alter_resp.ctx_list[0].reason));
-               return;
-       }
-
-       if (pkt->ptype != DCERPC_PKT_ALTER_RESP ||
-           pkt->u.alter_resp.num_results == 0 ||
-           pkt->u.alter_resp.ctx_list[0].result != 0) {
-               composite_error(c, NT_STATUS_NET_WRITE_FAULT);
-               return;
-       }
-
-       /* the alter_resp might contain a reply set of credentials */
-       if (recv_pipe->conn->security_state.auth_info &&
-           pkt->u.alter_resp.auth_info.length) {
-               enum ndr_err_code ndr_err;
-               ndr_err = ndr_pull_struct_blob(
-                       &pkt->u.alter_resp.auth_info, recv_pipe,
-                       NULL,
-                       recv_pipe->conn->security_state.auth_info,
-                       (ndr_pull_flags_fn_t)ndr_pull_dcerpc_auth);
-               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       c->status = ndr_map_error2ntstatus(ndr_err);
-                       if (!composite_is_ok(c)) return;
-               }
-       }
-
-       composite_done(c);
-}
-
-/* 
-   send a dcerpc alter_context request
-*/
-struct composite_context *dcerpc_alter_context_send(struct dcerpc_pipe *p, 
-                                                   TALLOC_CTX *mem_ctx,
-                                                   const struct ndr_syntax_id *syntax,
-                                                   const struct ndr_syntax_id *transfer_syntax)
+struct dcerpc_alter_context_state {
+       struct tevent_context *ev;
+       struct dcerpc_pipe *p;
+};
+
+static void dcerpc_alter_context_fail_handler(struct rpc_request *subreq);
+static void dcerpc_alter_context_recv_handler(struct rpc_request *req,
+                                             DATA_BLOB *raw_packet,
+                                             struct ncacn_packet *pkt);
+
+struct tevent_req *dcerpc_alter_context_send(TALLOC_CTX *mem_ctx,
+                                            struct tevent_context *ev,
+                                            struct dcerpc_pipe *p,
+                                            const struct ndr_syntax_id *syntax,
+                                            const struct ndr_syntax_id *transfer_syntax)
 {
-       struct composite_context *c;
+       struct tevent_req *req;
+       struct dcerpc_alter_context_state *state;
        struct ncacn_packet pkt;
        DATA_BLOB blob;
-       struct rpc_request *req;
+       NTSTATUS status;
+       struct rpc_request *subreq;
 
-       c = composite_create(mem_ctx, p->conn->event_ctx);
-       if (c == NULL) return NULL;
+       req = tevent_req_create(mem_ctx, &state,
+                               struct dcerpc_alter_context_state);
+       if (req == NULL) {
+               return NULL;
+       }
 
-       c->private_data = p;
+       state->ev = ev;
+       state->p = p;
 
        p->syntax = *syntax;
        p->transfer_syntax = *transfer_syntax;
@@ -1633,8 +1993,10 @@ struct composite_context *dcerpc_alter_context_send(struct dcerpc_pipe *p,
        pkt.u.alter.max_recv_frag = 5840;
        pkt.u.alter.assoc_group_id = p->binding->assoc_group_id;
        pkt.u.alter.num_contexts = 1;
-       pkt.u.alter.ctx_list = talloc_array(c, struct dcerpc_ctx_list, 1);
-       if (composite_nomem(pkt.u.alter.ctx_list, c)) return c;
+       pkt.u.alter.ctx_list = talloc_array(state, struct dcerpc_ctx_list, 1);
+       if (tevent_req_nomem(pkt.u.alter.ctx_list, req)) {
+               return tevent_req_post(req, ev);
+       }
        pkt.u.alter.ctx_list[0].context_id = p->context_id;
        pkt.u.alter.ctx_list[0].num_transfer_syntaxes = 1;
        pkt.u.alter.ctx_list[0].abstract_syntax = p->syntax;
@@ -1642,9 +2004,11 @@ struct composite_context *dcerpc_alter_context_send(struct dcerpc_pipe *p,
        pkt.u.alter.auth_info = data_blob(NULL, 0);
 
        /* construct the NDR form of the packet */
-       c->status = ncacn_push_auth(&blob, mem_ctx, p->conn->iconv_convenience, &pkt,
-                                   p->conn->security_state.auth_info);
-       if (!composite_is_ok(c)) return c;
+       status = ncacn_push_auth(&blob, state, &pkt,
+                                p->conn->security_state.auth_info);
+       if (tevent_req_nterror(req, status)) {
+               return tevent_req_post(req, ev);
+       }
 
        p->conn->transport.recv_data = dcerpc_recv_data;
 
@@ -1652,33 +2016,136 @@ struct composite_context *dcerpc_alter_context_send(struct dcerpc_pipe *p,
         * we allocate a dcerpc_request so we can be in the same
         * request queue as normal requests
         */
-       req = talloc_zero(c, struct rpc_request);
-       if (composite_nomem(req, c)) return c;
+       subreq = talloc_zero(state, struct rpc_request);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
 
-       req->state = RPC_REQUEST_PENDING;
-       req->call_id = pkt.call_id;
-       req->async.private_data = c;
-       req->async.callback = dcerpc_composite_fail;
-       req->p = p;
-       req->recv_handler = dcerpc_alter_recv_handler;
-       DLIST_ADD_END(p->conn->pending, req, struct rpc_request *);
-       talloc_set_destructor(req, dcerpc_req_dequeue);
+       subreq->state = RPC_REQUEST_PENDING;
+       subreq->call_id = pkt.call_id;
+       subreq->async.private_data = req;
+       subreq->async.callback = dcerpc_alter_context_fail_handler;
+       subreq->p = p;
+       subreq->recv_handler = dcerpc_alter_context_recv_handler;
+       DLIST_ADD_END(p->conn->pending, subreq, struct rpc_request *);
+       talloc_set_destructor(subreq, dcerpc_req_dequeue);
 
-       c->status = p->conn->transport.send_request(p->conn, &blob, true);
-       if (!composite_is_ok(c)) return c;
+       status = p->conn->transport.send_request(p->conn, &blob, true);
+       if (tevent_req_nterror(req, status)) {
+               return tevent_req_post(req, ev);
+       }
 
-       event_add_timed(c->event_ctx, req,
-                       timeval_current_ofs(DCERPC_REQUEST_TIMEOUT, 0),
-                       dcerpc_timeout_handler, req);
+       tevent_add_timer(ev, subreq,
+                        timeval_current_ofs(DCERPC_REQUEST_TIMEOUT, 0),
+                        dcerpc_timeout_handler, subreq);
 
-       return c;
+       return req;
+}
+
+static void dcerpc_alter_context_fail_handler(struct rpc_request *subreq)
+{
+       struct tevent_req *req =
+               talloc_get_type_abort(subreq->async.private_data,
+               struct tevent_req);
+       struct dcerpc_alter_context_state *state =
+               tevent_req_data(req,
+               struct dcerpc_alter_context_state);
+       NTSTATUS status = subreq->status;
+
+       TALLOC_FREE(subreq);
+
+       /*
+        * We trigger the callback in the next event run
+        * because the code in this file might trigger
+        * multiple request callbacks from within a single
+        * while loop.
+        *
+        * In order to avoid segfaults from within
+        * dcerpc_connection_dead() we call
+        * tevent_req_defer_callback().
+        */
+       tevent_req_defer_callback(req, state->ev);
+
+       tevent_req_nterror(req, status);
+}
+
+static void dcerpc_alter_context_recv_handler(struct rpc_request *subreq,
+                                             DATA_BLOB *raw_packet,
+                                             struct ncacn_packet *pkt)
+{
+       struct tevent_req *req =
+               talloc_get_type_abort(subreq->async.private_data,
+               struct tevent_req);
+       struct dcerpc_alter_context_state *state =
+               tevent_req_data(req,
+               struct dcerpc_alter_context_state);
+       struct dcecli_connection *conn = state->p->conn;
+       NTSTATUS status;
+
+       /*
+        * Note that pkt is allocated under raw_packet->data,
+        * while raw_packet->data is a child of subreq.
+        */
+       talloc_steal(state, raw_packet->data);
+       TALLOC_FREE(subreq);
+
+       /*
+        * We trigger the callback in the next event run
+        * because the code in this file might trigger
+        * multiple request callbacks from within a single
+        * while loop.
+        *
+        * In order to avoid segfaults from within
+        * dcerpc_connection_dead() we call
+        * tevent_req_defer_callback().
+        */
+       tevent_req_defer_callback(req, state->ev);
+
+       if (pkt->ptype == DCERPC_PKT_ALTER_RESP &&
+           pkt->u.alter_resp.num_results == 1 &&
+           pkt->u.alter_resp.ctx_list[0].result != 0) {
+               status = dcerpc_map_reason(pkt->u.alter_resp.ctx_list[0].reason);
+               DEBUG(2,("dcerpc: alter_resp failed - reason %d - %s\n",
+                        pkt->u.alter_resp.ctx_list[0].reason,
+                        nt_errstr(status)));
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       if (pkt->ptype == DCERPC_PKT_FAULT) {
+               DEBUG(5,("dcerpc: alter_resp - rpc fault: %s\n",
+                        dcerpc_errstr(state, pkt->u.fault.status)));
+               state->p->last_fault_code = pkt->u.fault.status;
+               tevent_req_nterror(req, NT_STATUS_NET_WRITE_FAULT);
+               return;
+       }
+
+       if (pkt->ptype != DCERPC_PKT_ALTER_RESP ||
+           pkt->u.alter_resp.num_results == 0 ||
+           pkt->u.alter_resp.ctx_list[0].result != 0) {
+               state->p->last_fault_code = DCERPC_NCA_S_PROTO_ERROR;
+               tevent_req_nterror(req, NT_STATUS_NET_WRITE_FAULT);
+               return;
+       }
+
+       /* the alter_resp might contain a reply set of credentials */
+       if (conn->security_state.auth_info &&
+           pkt->u.alter_resp.auth_info.length) {
+               uint32_t auth_length;
+
+               status = dcerpc_pull_auth_trailer(pkt, conn, &pkt->u.alter_resp.auth_info,
+                                                 conn->security_state.auth_info, &auth_length, true);
+               if (tevent_req_nterror(req, status)) {
+                       return;
+               }
+       }
+
+       tevent_req_done(req);
 }
 
-NTSTATUS dcerpc_alter_context_recv(struct composite_context *ctx)
+NTSTATUS dcerpc_alter_context_recv(struct tevent_req *req)
 {
-       NTSTATUS result = composite_wait(ctx);
-       talloc_free(ctx);
-       return result;
+       return tevent_req_simple_recv_ntstatus(req);
 }
 
 /* 
@@ -1689,7 +2156,25 @@ _PUBLIC_ NTSTATUS dcerpc_alter_context(struct dcerpc_pipe *p,
                              const struct ndr_syntax_id *syntax,
                              const struct ndr_syntax_id *transfer_syntax)
 {
-       struct composite_context *creq;
-       creq = dcerpc_alter_context_send(p, mem_ctx, syntax, transfer_syntax);
-       return dcerpc_alter_context_recv(creq);
+       struct tevent_req *subreq;
+       struct tevent_context *ev = p->conn->event_ctx;
+       bool ok;
+
+       /* TODO: create a new event context here */
+
+       subreq = dcerpc_alter_context_send(mem_ctx, p->conn->event_ctx,
+                                          p, syntax, transfer_syntax);
+       if (subreq == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       ok = tevent_req_poll(subreq, ev);
+       if (!ok) {
+               NTSTATUS status;
+               status = map_nt_error_from_unix_common(errno);
+               return status;
+       }
+
+       return dcerpc_alter_context_recv(subreq);
 }
+