s3-rpc_client: use NL_AUTH_MESSAGE in create_schannel_auth_rpc_bind_req().
[ira/wip.git] / source3 / rpc_client / cli_pipe.c
index d0411e5422c16a3c6b7451c7b1f891c8ff9ab8c3..82f6b105b7e3cd8910c42118345ae4686eaa299e 100644 (file)
@@ -18,7 +18,9 @@
  */
 
 #include "includes.h"
+#include "../libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/cli_epmapper.h"
+#include "../librpc/gen_ndr/ndr_schannel.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_CLI
@@ -55,7 +57,7 @@ static const struct pipe_id_info {
        /* the names appear not to matter: the syntaxes _do_ matter */
 
        const char *client_pipe;
-       const RPC_IFACE *abstr_syntax; /* this one is the abstract syntax id */
+       const struct ndr_syntax_id *abstr_syntax; /* this one is the abstract syntax id */
 } pipe_names [] =
 {
        { PIPE_LSARPC,          &ndr_table_lsarpc.syntax_id },
@@ -65,7 +67,7 @@ static const struct pipe_id_info {
        { PIPE_SRVSVC,          &ndr_table_srvsvc.syntax_id },
        { PIPE_WKSSVC,          &ndr_table_wkssvc.syntax_id },
        { PIPE_WINREG,          &ndr_table_winreg.syntax_id },
-       { PIPE_SPOOLSS,         &syntax_spoolss },
+       { PIPE_SPOOLSS,         &ndr_table_spoolss.syntax_id },
        { PIPE_NETDFS,          &ndr_table_netdfs.syntax_id },
        { PIPE_ECHO,            &ndr_table_rpcecho.syntax_id },
        { PIPE_SHUTDOWN,        &ndr_table_initshutdown.syntax_id },
@@ -81,10 +83,10 @@ static const struct pipe_id_info {
  Return the pipe name from the interface.
  ****************************************************************************/
 
-const char *cli_get_pipe_name_from_iface(TALLOC_CTX *mem_ctx,
-                                        struct cli_state *cli,
-                                        const struct ndr_syntax_id *interface)
+const char *get_pipe_name_from_iface(const struct ndr_syntax_id *interface)
 {
+       char *guid_str;
+       const char *result;
        int i;
        for (i = 0; pipe_names[i].client_pipe; i++) {
                if (ndr_syntax_id_equal(pipe_names[i].abstr_syntax,
@@ -98,7 +100,18 @@ const char *cli_get_pipe_name_from_iface(TALLOC_CTX *mem_ctx,
         * interested in the known pipes mentioned in pipe_names[]
         */
 
-       return NULL;
+       guid_str = GUID_string(talloc_tos(), &interface->uuid);
+       if (guid_str == NULL) {
+               return NULL;
+       }
+       result = talloc_asprintf(talloc_tos(), "Interface %s.%d", guid_str,
+                                (int)interface->if_version);
+       TALLOC_FREE(guid_str);
+
+       if (result == NULL) {
+               return "PIPE";
+       }
+       return result;
 }
 
 /********************************************************************
@@ -137,28 +150,13 @@ static int map_pipe_auth_type_to_rpc_auth_type(enum pipe_auth_type auth_type)
 /********************************************************************
  Pipe description for a DEBUG
  ********************************************************************/
-static char *rpccli_pipe_txt(TALLOC_CTX *mem_ctx, struct rpc_pipe_client *cli)
+static const char *rpccli_pipe_txt(TALLOC_CTX *mem_ctx,
+                                  struct rpc_pipe_client *cli)
 {
-       char *result;
-
-       switch (cli->transport_type) {
-       case NCACN_NP:
-               result = talloc_asprintf(mem_ctx, "host %s, pipe %s, "
-                                        "fnum 0x%x",
-                                        cli->desthost,
-                                        cli->trans.np.pipe_name,
-                                        (unsigned int)(cli->trans.np.fnum));
-               break;
-       case NCACN_IP_TCP:
-       case NCACN_UNIX_STREAM:
-               result = talloc_asprintf(mem_ctx, "host %s, fd %d",
-                                        cli->desthost, cli->trans.sock.fd);
-               break;
-       default:
-               result = talloc_asprintf(mem_ctx, "host %s", cli->desthost);
-               break;
+       char *result = talloc_asprintf(mem_ctx, "host %s", cli->desthost);
+       if (result == NULL) {
+               return "pipe";
        }
-       SMB_ASSERT(result != NULL);
        return result;
 }
 
@@ -205,143 +203,164 @@ static bool rpc_grow_buffer(prs_struct *pdu, size_t size)
 
 struct rpc_read_state {
        struct event_context *ev;
-       struct rpc_pipe_client *cli;
-       char *data;
+       struct rpc_cli_transport *transport;
+       uint8_t *data;
        size_t size;
        size_t num_read;
 };
 
-static void rpc_read_np_done(struct async_req *subreq);
-static void rpc_read_sock_done(struct async_req *subreq);
+static void rpc_read_done(struct tevent_req *subreq);
 
-static struct async_req *rpc_read_send(TALLOC_CTX *mem_ctx,
-                                      struct event_context *ev,
-                                      struct rpc_pipe_client *cli,
-                                      char *data, size_t size)
+static struct tevent_req *rpc_read_send(TALLOC_CTX *mem_ctx,
+                                       struct event_context *ev,
+                                       struct rpc_cli_transport *transport,
+                                       uint8_t *data, size_t size)
 {
-       struct async_req *result, *subreq;
+       struct tevent_req *req, *subreq;
        struct rpc_read_state *state;
 
-       result = async_req_new(mem_ctx);
-       if (result == NULL) {
+       req = tevent_req_create(mem_ctx, &state, struct rpc_read_state);
+       if (req == NULL) {
                return NULL;
        }
-       state = talloc(result, struct rpc_read_state);
-       if (state == NULL) {
-               goto fail;
-       }
-       result->private_data = state;
-
        state->ev = ev;
-       state->cli = cli;
+       state->transport = transport;
        state->data = data;
        state->size = size;
        state->num_read = 0;
 
        DEBUG(5, ("rpc_read_send: data_to_read: %u\n", (unsigned int)size));
 
-       if (cli->transport_type == NCACN_NP) {
-               subreq = cli_read_andx_send(
-                       state, ev, cli->trans.np.cli,
-                       cli->trans.np.fnum, 0, size);
-               if (subreq == NULL) {
-                       DEBUG(10, ("cli_read_andx_send failed\n"));
-                       goto fail;
-               }
-               subreq->async.fn = rpc_read_np_done;
-               subreq->async.priv = result;
-               return result;
-       }
-
-       if ((cli->transport_type == NCACN_IP_TCP)
-           || (cli->transport_type == NCACN_UNIX_STREAM)) {
-               subreq = recvall_send(state, ev, cli->trans.sock.fd,
-                                     data, size, 0);
-               if (subreq == NULL) {
-                       DEBUG(10, ("recvall_send failed\n"));
-                       goto fail;
-               }
-               subreq->async.fn = rpc_read_sock_done;
-               subreq->async.priv = result;
-               return result;
+       subreq = transport->read_send(state, ev, (uint8_t *)data, size,
+                                     transport->priv);
+       if (subreq == NULL) {
+               goto fail;
        }
+       tevent_req_set_callback(subreq, rpc_read_done, req);
+       return req;
 
-       if (async_post_status(result, ev, NT_STATUS_INVALID_PARAMETER)) {
-               return result;
-       }
  fail:
-       TALLOC_FREE(result);
+       TALLOC_FREE(req);
        return NULL;
 }
 
-static void rpc_read_np_done(struct async_req *subreq)
+static void rpc_read_done(struct tevent_req *subreq)
 {
-       struct async_req *req = talloc_get_type_abort(
-               subreq->async.priv, struct async_req);
-       struct rpc_read_state *state = talloc_get_type_abort(
-               req->private_data, struct rpc_read_state);
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct rpc_read_state *state = tevent_req_data(
+               req, struct rpc_read_state);
        NTSTATUS status;
        ssize_t received;
-       uint8_t *rcvbuf;
 
-       status = cli_read_andx_recv(subreq, &received, &rcvbuf);
-       /*
-        * We can't TALLOC_FREE(subreq) as usual here, as rcvbuf still is a
-        * child of that.
-        */
-       if (NT_STATUS_EQUAL(status, NT_STATUS_BUFFER_TOO_SMALL)) {
-               status = NT_STATUS_OK;
-       }
+       status = state->transport->read_recv(subreq, &received);
+       TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(subreq);
-               async_req_error(req, status);
+               tevent_req_nterror(req, status);
                return;
        }
 
-       memcpy(state->data + state->num_read, rcvbuf, received);
-       TALLOC_FREE(subreq);
-
        state->num_read += received;
-
        if (state->num_read == state->size) {
-               async_req_done(req);
+               tevent_req_done(req);
                return;
        }
 
-       subreq = cli_read_andx_send(
-               state, state->ev, state->cli->trans.np.cli,
-               state->cli->trans.np.fnum, 0,
-               state->size - state->num_read);
-
-       if (async_req_nomem(subreq, req)) {
+       subreq = state->transport->read_send(state, state->ev,
+                                            state->data + state->num_read,
+                                            state->size - state->num_read,
+                                            state->transport->priv);
+       if (tevent_req_nomem(subreq, req)) {
                return;
        }
+       tevent_req_set_callback(subreq, rpc_read_done, req);
+}
+
+static NTSTATUS rpc_read_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
+
+struct rpc_write_state {
+       struct event_context *ev;
+       struct rpc_cli_transport *transport;
+       const uint8_t *data;
+       size_t size;
+       size_t num_written;
+};
+
+static void rpc_write_done(struct tevent_req *subreq);
+
+static struct tevent_req *rpc_write_send(TALLOC_CTX *mem_ctx,
+                                        struct event_context *ev,
+                                        struct rpc_cli_transport *transport,
+                                        const uint8_t *data, size_t size)
+{
+       struct tevent_req *req, *subreq;
+       struct rpc_write_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct rpc_write_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->transport = transport;
+       state->data = data;
+       state->size = size;
+       state->num_written = 0;
 
-       subreq->async.fn = rpc_read_np_done;
-       subreq->async.priv = req;
+       DEBUG(5, ("rpc_write_send: data_to_write: %u\n", (unsigned int)size));
+
+       subreq = transport->write_send(state, ev, data, size, transport->priv);
+       if (subreq == NULL) {
+               goto fail;
+       }
+       tevent_req_set_callback(subreq, rpc_write_done, req);
+       return req;
+ fail:
+       TALLOC_FREE(req);
+       return NULL;
 }
 
-static void rpc_read_sock_done(struct async_req *subreq)
+static void rpc_write_done(struct tevent_req *subreq)
 {
-       struct async_req *req = talloc_get_type_abort(
-               subreq->async.priv, struct async_req);
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct rpc_write_state *state = tevent_req_data(
+               req, struct rpc_write_state);
        NTSTATUS status;
+       ssize_t written;
 
-       status = recvall_recv(subreq);
+       status = state->transport->write_recv(subreq, &written);
        TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
-               async_req_error(req, status);
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       state->num_written += written;
+
+       if (state->num_written == state->size) {
+               tevent_req_done(req);
                return;
        }
 
-       async_req_done(req);
+       subreq = state->transport->write_send(state, state->ev,
+                                             state->data + state->num_written,
+                                             state->size - state->num_written,
+                                             state->transport->priv);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, rpc_write_done, req);
 }
 
-static NTSTATUS rpc_read_recv(struct async_req *req)
+static NTSTATUS rpc_write_recv(struct tevent_req *req)
 {
-       return async_req_simple_recv(req);
+       return tevent_req_simple_recv_ntstatus(req);
 }
 
+
 static NTSTATUS parse_rpc_header(struct rpc_pipe_client *cli,
                                 struct rpc_hdr_info *prhdr,
                                 prs_struct *pdu)
@@ -371,37 +390,32 @@ static NTSTATUS parse_rpc_header(struct rpc_pipe_client *cli,
  from the wire.
  ****************************************************************************/
 
-struct get_complete_pdu_state {
+struct get_complete_frag_state {
        struct event_context *ev;
        struct rpc_pipe_client *cli;
        struct rpc_hdr_info *prhdr;
        prs_struct *pdu;
 };
 
-static void get_complete_pdu_got_header(struct async_req *subreq);
-static void get_complete_pdu_got_rest(struct async_req *subreq);
+static void get_complete_frag_got_header(struct tevent_req *subreq);
+static void get_complete_frag_got_rest(struct tevent_req *subreq);
 
-static struct async_req *get_complete_pdu_send(TALLOC_CTX *mem_ctx,
-                                              struct event_context *ev,
-                                              struct rpc_pipe_client *cli,
-                                              struct rpc_hdr_info *prhdr,
-                                              prs_struct *pdu)
+static struct tevent_req *get_complete_frag_send(TALLOC_CTX *mem_ctx,
+                                                struct event_context *ev,
+                                                struct rpc_pipe_client *cli,
+                                                struct rpc_hdr_info *prhdr,
+                                                prs_struct *pdu)
 {
-       struct async_req *result, *subreq;
-       struct get_complete_pdu_state *state;
+       struct tevent_req *req, *subreq;
+       struct get_complete_frag_state *state;
        uint32_t pdu_len;
        NTSTATUS status;
 
-       result = async_req_new(mem_ctx);
-       if (result == NULL) {
+       req = tevent_req_create(mem_ctx, &state,
+                               struct get_complete_frag_state);
+       if (req == NULL) {
                return NULL;
        }
-       state = talloc(result, struct get_complete_pdu_state);
-       if (state == NULL) {
-               goto fail;
-       }
-       result->private_data = state;
-
        state->ev = ev;
        state->cli = cli;
        state->prhdr = prhdr;
@@ -413,16 +427,18 @@ static struct async_req *get_complete_pdu_send(TALLOC_CTX *mem_ctx,
                        status = NT_STATUS_NO_MEMORY;
                        goto post_status;
                }
-               subreq = rpc_read_send(state, state->ev, state->cli,
-                                      prs_data_p(state->pdu) + pdu_len,
-                                      RPC_HEADER_LEN - pdu_len);
+               subreq = rpc_read_send(
+                       state, state->ev,
+                       state->cli->transport,
+                       (uint8_t *)(prs_data_p(state->pdu) + pdu_len),
+                       RPC_HEADER_LEN - pdu_len);
                if (subreq == NULL) {
                        status = NT_STATUS_NO_MEMORY;
                        goto post_status;
                }
-               subreq->async.fn = get_complete_pdu_got_header;
-               subreq->async.priv = result;
-               return result;
+               tevent_req_set_callback(subreq, get_complete_frag_got_header,
+                                       req);
+               return req;
        }
 
        status = parse_rpc_header(cli, prhdr, pdu);
@@ -438,51 +454,52 @@ static struct async_req *get_complete_pdu_send(TALLOC_CTX *mem_ctx,
                        status = NT_STATUS_NO_MEMORY;
                        goto post_status;
                }
-               subreq = rpc_read_send(state, state->ev, state->cli,
-                                      prs_data_p(pdu) + pdu_len,
+               subreq = rpc_read_send(state, state->ev,
+                                      state->cli->transport,
+                                      (uint8_t *)(prs_data_p(pdu) + pdu_len),
                                       prhdr->frag_len - pdu_len);
                if (subreq == NULL) {
                        status = NT_STATUS_NO_MEMORY;
                        goto post_status;
                }
-               subreq->async.fn = get_complete_pdu_got_rest;
-               subreq->async.priv = result;
-               return result;
+               tevent_req_set_callback(subreq, get_complete_frag_got_rest,
+                                       req);
+               return req;
        }
 
        status = NT_STATUS_OK;
  post_status:
-       if (async_post_status(result, ev, status)) {
-               return result;
+       if (NT_STATUS_IS_OK(status)) {
+               tevent_req_done(req);
+       } else {
+               tevent_req_nterror(req, status);
        }
- fail:
-       TALLOC_FREE(result);
-       return NULL;
+       return tevent_req_post(req, ev);
 }
 
-static void get_complete_pdu_got_header(struct async_req *subreq)
+static void get_complete_frag_got_header(struct tevent_req *subreq)
 {
-       struct async_req *req = talloc_get_type_abort(
-               subreq->async.priv, struct async_req);
-       struct get_complete_pdu_state *state = talloc_get_type_abort(
-               req->private_data, struct get_complete_pdu_state);
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct get_complete_frag_state *state = tevent_req_data(
+               req, struct get_complete_frag_state);
        NTSTATUS status;
 
        status = rpc_read_recv(subreq);
        TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
-               async_req_error(req, status);
+               tevent_req_nterror(req, status);
                return;
        }
 
        status = parse_rpc_header(state->cli, state->prhdr, state->pdu);
        if (!NT_STATUS_IS_OK(status)) {
-               async_req_error(req, status);
+               tevent_req_nterror(req, status);
                return;
        }
 
        if (!rpc_grow_buffer(state->pdu, state->prhdr->frag_len)) {
-               async_req_error(req, NT_STATUS_NO_MEMORY);
+               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
                return;
        }
 
@@ -491,63 +508,34 @@ static void get_complete_pdu_got_header(struct async_req *subreq)
         * RPC_HEADER_LEN bytes into state->pdu.
         */
 
-       subreq = rpc_read_send(state, state->ev, state->cli,
-                              prs_data_p(state->pdu) + RPC_HEADER_LEN,
-                              state->prhdr->frag_len - RPC_HEADER_LEN);
-       if (async_req_nomem(subreq, req)) {
+       subreq = rpc_read_send(
+               state, state->ev, state->cli->transport,
+               (uint8_t *)(prs_data_p(state->pdu) + RPC_HEADER_LEN),
+               state->prhdr->frag_len - RPC_HEADER_LEN);
+       if (tevent_req_nomem(subreq, req)) {
                return;
        }
-       subreq->async.fn = get_complete_pdu_got_rest;
-       subreq->async.priv = req;
+       tevent_req_set_callback(subreq, get_complete_frag_got_rest, req);
 }
 
-static void get_complete_pdu_got_rest(struct async_req *subreq)
+static void get_complete_frag_got_rest(struct tevent_req *subreq)
 {
-       struct async_req *req = talloc_get_type_abort(
-               subreq->async.priv, struct async_req);
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
        NTSTATUS status;
 
        status = rpc_read_recv(subreq);
        TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
-               async_req_error(req, status);
+               tevent_req_nterror(req, status);
                return;
        }
-       async_req_done(req);
-}
-
-static NTSTATUS get_complete_pdu_recv(struct async_req *req)
-{
-       return async_req_simple_recv(req);
+       tevent_req_done(req);
 }
 
-static NTSTATUS get_complete_pdu(struct rpc_pipe_client *cli,
-                                struct rpc_hdr_info *prhdr,
-                                prs_struct *pdu)
+static NTSTATUS get_complete_frag_recv(struct tevent_req *req)
 {
-       TALLOC_CTX *frame = talloc_stackframe();
-       struct event_context *ev;
-       struct async_req *req;
-       NTSTATUS status = NT_STATUS_NO_MEMORY;
-
-       ev = event_context_init(frame);
-       if (ev == NULL) {
-               goto fail;
-       }
-
-       req = get_complete_pdu_send(frame, ev, cli, prhdr, pdu);
-       if (req == NULL) {
-               goto fail;
-       }
-
-       while (req->state < ASYNC_REQ_DONE) {
-               event_loop_once(ev);
-       }
-
-       status = get_complete_pdu_recv(req);
- fail:
-       TALLOC_FREE(frame);
-       return status;
+       return tevent_req_simple_recv_ntstatus(req);
 }
 
 /****************************************************************************
@@ -694,7 +682,7 @@ static NTSTATUS cli_pipe_verify_schannel(struct rpc_pipe_client *cli, RPC_HDR *p
                return NT_STATUS_OK;
        }
 
-       if (auth_len != RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN) {
+       if (auth_len < RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN) {
                DEBUG(0,("cli_pipe_verify_schannel: auth_len %u.\n", (unsigned int)auth_len ));
                return NT_STATUS_INVALID_PARAMETER;
        }
@@ -1043,41 +1031,33 @@ static NTSTATUS cli_pipe_reset_current_pdu(struct rpc_pipe_client *cli, RPC_HDR
 
 struct cli_api_pipe_state {
        struct event_context *ev;
-       struct rpc_pipe_client *cli;
-       uint32_t max_rdata_len;
+       struct rpc_cli_transport *transport;
        uint8_t *rdata;
        uint32_t rdata_len;
 };
 
-static void cli_api_pipe_np_trans_done(struct async_req *subreq);
-static void cli_api_pipe_sock_send_done(struct async_req *subreq);
-static void cli_api_pipe_sock_read_done(struct async_req *subreq);
+static void cli_api_pipe_trans_done(struct tevent_req *subreq);
+static void cli_api_pipe_write_done(struct tevent_req *subreq);
+static void cli_api_pipe_read_done(struct tevent_req *subreq);
 
-static struct async_req *cli_api_pipe_send(TALLOC_CTX *mem_ctx,
-                                          struct event_context *ev,
-                                          struct rpc_pipe_client *cli,
-                                          uint8_t *data, size_t data_len,
-                                          uint32_t max_rdata_len)
+static struct tevent_req *cli_api_pipe_send(TALLOC_CTX *mem_ctx,
+                                           struct event_context *ev,
+                                           struct rpc_cli_transport *transport,
+                                           uint8_t *data, size_t data_len,
+                                           uint32_t max_rdata_len)
 {
-       struct async_req *result, *subreq;
+       struct tevent_req *req, *subreq;
        struct cli_api_pipe_state *state;
        NTSTATUS status;
 
-       result = async_req_new(mem_ctx);
-       if (result == NULL) {
+       req = tevent_req_create(mem_ctx, &state, struct cli_api_pipe_state);
+       if (req == NULL) {
                return NULL;
        }
-       state = talloc(result, struct cli_api_pipe_state);
-       if (state == NULL) {
-               goto fail;
-       }
-       result->private_data = state;
-
        state->ev = ev;
-       state->cli = cli;
-       state->max_rdata_len = max_rdata_len;
+       state->transport = transport;
 
-       if (state->max_rdata_len < RPC_HEADER_LEN) {
+       if (max_rdata_len < RPC_HEADER_LEN) {
                /*
                 * For a RPC reply we always need at least RPC_HEADER_LEN
                 * bytes. We check this here because we will receive
@@ -1087,120 +1067,117 @@ static struct async_req *cli_api_pipe_send(TALLOC_CTX *mem_ctx,
                goto post_status;
        }
 
-       if (cli->transport_type == NCACN_NP) {
-
-               uint16_t setup[2];
-               SSVAL(setup+0, 0, TRANSACT_DCERPCCMD);
-               SSVAL(setup+1, 0, cli->trans.np.fnum);
-
-               subreq = cli_trans_send(
-                       state, ev, cli->trans.np.cli, SMBtrans,
-                       "\\PIPE\\", 0, 0, 0, setup, 2, 0,
-                       NULL, 0, 0, data, data_len, max_rdata_len);
+       if (transport->trans_send != NULL) {
+               subreq = transport->trans_send(state, ev, data, data_len,
+                                              max_rdata_len, transport->priv);
                if (subreq == NULL) {
-                       status = NT_STATUS_NO_MEMORY;
-                       goto post_status;
+                       goto fail;
                }
-               subreq->async.fn = cli_api_pipe_np_trans_done;
-               subreq->async.priv = result;
-               return result;
+               tevent_req_set_callback(subreq, cli_api_pipe_trans_done, req);
+               return req;
        }
 
-       if ((cli->transport_type == NCACN_IP_TCP)
-           || (cli->transport_type == NCACN_UNIX_STREAM)) {
-               subreq = sendall_send(state, ev, cli->trans.sock.fd,
-                                     data, data_len, 0);
-               if (subreq == NULL) {
-                       status = NT_STATUS_NO_MEMORY;
-                       goto post_status;
-               }
-               subreq->async.fn = cli_api_pipe_sock_send_done;
-               subreq->async.priv = result;
-               return result;
+       /*
+        * If the transport does not provide a "trans" routine, i.e. for
+        * example the ncacn_ip_tcp transport, do the write/read step here.
+        */
+
+       subreq = rpc_write_send(state, ev, transport, data, data_len);
+       if (subreq == NULL) {
+               goto fail;
        }
+       tevent_req_set_callback(subreq, cli_api_pipe_write_done, req);
+       return req;
 
        status = NT_STATUS_INVALID_PARAMETER;
 
  post_status:
-       if (async_post_status(result, ev, status)) {
-               return result;
-       }
+       tevent_req_nterror(req, status);
+       return tevent_req_post(req, ev);
  fail:
-       TALLOC_FREE(result);
+       TALLOC_FREE(req);
        return NULL;
 }
 
-static void cli_api_pipe_np_trans_done(struct async_req *subreq)
+static void cli_api_pipe_trans_done(struct tevent_req *subreq)
 {
-       struct async_req *req = talloc_get_type_abort(
-               subreq->async.priv, struct async_req);
-       struct cli_api_pipe_state *state = talloc_get_type_abort(
-               req->private_data, struct cli_api_pipe_state);
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_api_pipe_state *state = tevent_req_data(
+               req, struct cli_api_pipe_state);
        NTSTATUS status;
 
-       status = cli_trans_recv(subreq, state, NULL, NULL, NULL, NULL,
-                               &state->rdata, &state->rdata_len);
+       status = state->transport->trans_recv(subreq, state, &state->rdata,
+                                             &state->rdata_len);
        TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
-               async_req_error(req, status);
+               tevent_req_nterror(req, status);
                return;
        }
-       async_req_done(req);
+       tevent_req_done(req);
 }
 
-static void cli_api_pipe_sock_send_done(struct async_req *subreq)
+static void cli_api_pipe_write_done(struct tevent_req *subreq)
 {
-       struct async_req *req = talloc_get_type_abort(
-               subreq->async.priv, struct async_req);
-       struct cli_api_pipe_state *state = talloc_get_type_abort(
-               req->private_data, struct cli_api_pipe_state);
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_api_pipe_state *state = tevent_req_data(
+               req, struct cli_api_pipe_state);
        NTSTATUS status;
 
-       status = sendall_recv(subreq);
+       status = rpc_write_recv(subreq);
        TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
-               async_req_error(req, status);
+               tevent_req_nterror(req, status);
                return;
        }
 
        state->rdata = TALLOC_ARRAY(state, uint8_t, RPC_HEADER_LEN);
-       if (async_req_nomem(state->rdata, req)) {
+       if (tevent_req_nomem(state->rdata, req)) {
                return;
        }
-       state->rdata_len = RPC_HEADER_LEN;
 
-       subreq = recvall_send(state, state->ev, state->cli->trans.sock.fd,
-                             state->rdata, RPC_HEADER_LEN, 0);
-       if (async_req_nomem(subreq, req)) {
+       /*
+        * We don't need to use rpc_read_send here, the upper layer will cope
+        * with a short read, transport->trans_send could also return less
+        * than state->max_rdata_len.
+        */
+       subreq = state->transport->read_send(state, state->ev, state->rdata,
+                                            RPC_HEADER_LEN,
+                                            state->transport->priv);
+       if (tevent_req_nomem(subreq, req)) {
                return;
        }
-       subreq->async.fn = cli_api_pipe_sock_read_done;
-       subreq->async.priv = req;
+       tevent_req_set_callback(subreq, cli_api_pipe_read_done, req);
 }
 
-static void cli_api_pipe_sock_read_done(struct async_req *subreq)
+static void cli_api_pipe_read_done(struct tevent_req *subreq)
 {
-       struct async_req *req = talloc_get_type_abort(
-               subreq->async.priv, struct async_req);
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_api_pipe_state *state = tevent_req_data(
+               req, struct cli_api_pipe_state);
        NTSTATUS status;
+       ssize_t received;
 
-       status = recvall_recv(subreq);
+       status = state->transport->read_recv(subreq, &received);
        TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
-               async_req_error(req, status);
+               tevent_req_nterror(req, status);
                return;
        }
-       async_req_done(req);
+       state->rdata_len = received;
+       tevent_req_done(req);
 }
 
-static NTSTATUS cli_api_pipe_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+static NTSTATUS cli_api_pipe_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                                  uint8_t **prdata, uint32_t *prdata_len)
 {
-       struct cli_api_pipe_state *state = talloc_get_type_abort(
-               req->private_data, struct cli_api_pipe_state);
+       struct cli_api_pipe_state *state = tevent_req_data(
+               req, struct cli_api_pipe_state);
        NTSTATUS status;
 
-       if (async_req_is_error(req, &status)) {
+       if (tevent_req_is_nterror(req, &status)) {
                return status;
        }
 
@@ -1209,36 +1186,6 @@ static NTSTATUS cli_api_pipe_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-static NTSTATUS cli_api_pipe(TALLOC_CTX *mem_ctx, struct rpc_pipe_client *cli,
-                            uint8_t *data, uint32_t data_len,
-                            uint32_t max_rdata_len,
-                            uint8_t **prdata, uint32_t *prdata_len)
-{
-       TALLOC_CTX *frame = talloc_stackframe();
-       struct event_context *ev;
-       struct async_req *req;
-       NTSTATUS status = NT_STATUS_NO_MEMORY;
-
-       ev = event_context_init(frame);
-       if (ev == NULL) {
-               goto fail;
-       }
-
-       req = cli_api_pipe_send(frame, ev, cli, data, data_len, max_rdata_len);
-       if (req == NULL) {
-               goto fail;
-       }
-
-       while (req->state < ASYNC_REQ_DONE) {
-               event_loop_once(ev);
-       }
-
-       status = cli_api_pipe_recv(req, mem_ctx, prdata, prdata_len);
- fail:
-       TALLOC_FREE(frame);
-       return status;
-}
-
 /****************************************************************************
  Send data on an rpc pipe via trans. The prs_struct data must be the last
  pdu fragment of an NDR data stream.
@@ -1265,142 +1212,248 @@ static NTSTATUS cli_api_pipe(TALLOC_CTX *mem_ctx, struct rpc_pipe_client *cli,
 
  ****************************************************************************/
 
-static NTSTATUS rpc_api_pipe(struct rpc_pipe_client *cli,
-                       prs_struct *data, /* Outgoing pdu fragment, already formatted for send. */
-                       prs_struct *rbuf, /* Incoming reply - return as an NDR stream. */
-                       uint8 expected_pkt_type)
+struct rpc_api_pipe_state {
+       struct event_context *ev;
+       struct rpc_pipe_client *cli;
+       uint8_t expected_pkt_type;
+
+       prs_struct incoming_frag;
+       struct rpc_hdr_info rhdr;
+
+       prs_struct incoming_pdu;        /* Incoming reply */
+       uint32_t incoming_pdu_offset;
+};
+
+static int rpc_api_pipe_state_destructor(struct rpc_api_pipe_state *state)
 {
-       NTSTATUS ret;
-       uint32 data_len = prs_offset(data);
-       uint8_t *rdata = NULL;
-       uint8_t *rdata_copy;
-       uint32_t rdata_len = 0;
-       uint32 max_data = cli->max_xmit_frag ? cli->max_xmit_frag : RPC_MAX_PDU_FRAG_LEN;
-       uint32 current_rbuf_offset = 0;
-       prs_struct current_pdu;
+       prs_mem_free(&state->incoming_frag);
+       prs_mem_free(&state->incoming_pdu);
+       return 0;
+}
+
+static void rpc_api_pipe_trans_done(struct tevent_req *subreq);
+static void rpc_api_pipe_got_pdu(struct tevent_req *subreq);
+
+static struct tevent_req *rpc_api_pipe_send(TALLOC_CTX *mem_ctx,
+                                           struct event_context *ev,
+                                           struct rpc_pipe_client *cli,
+                                           prs_struct *data, /* Outgoing PDU */
+                                           uint8_t expected_pkt_type)
+{
+       struct tevent_req *req, *subreq;
+       struct rpc_api_pipe_state *state;
+       uint16_t max_recv_frag;
+       NTSTATUS status;
+
+       req = tevent_req_create(mem_ctx, &state, struct rpc_api_pipe_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->cli = cli;
+       state->expected_pkt_type = expected_pkt_type;
+       state->incoming_pdu_offset = 0;
+
+       prs_init_empty(&state->incoming_frag, state, UNMARSHALL);
+
+       prs_init_empty(&state->incoming_pdu, state, UNMARSHALL);
+       /* Make incoming_pdu dynamic with no memory. */
+       prs_give_memory(&state->incoming_pdu, NULL, 0, true);
+
+       talloc_set_destructor(state, rpc_api_pipe_state_destructor);
+
+       /*
+        * Ensure we're not sending too much.
+        */
+       if (prs_offset(data) > cli->max_xmit_frag) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto post_status;
+       }
+
+       DEBUG(5,("rpc_api_pipe: %s\n", rpccli_pipe_txt(debug_ctx(), cli)));
+
+       max_recv_frag = cli->max_recv_frag;
 
 #ifdef DEVELOPER
-       /* Ensure we're not sending too much. */
-       SMB_ASSERT(data_len <= max_data);
+       max_recv_frag = RPC_HEADER_LEN + 10 + (sys_random() % 32);
 #endif
 
-       /* Set up the current pdu parse struct. */
-       prs_init_empty(&current_pdu, prs_get_mem_context(rbuf), UNMARSHALL);
+       subreq = cli_api_pipe_send(state, ev, cli->transport,
+                                  (uint8_t *)prs_data_p(data),
+                                  prs_offset(data), max_recv_frag);
+       if (subreq == NULL) {
+               goto fail;
+       }
+       tevent_req_set_callback(subreq, rpc_api_pipe_trans_done, req);
+       return req;
 
-       DEBUG(5,("rpc_api_pipe: %s\n", rpccli_pipe_txt(debug_ctx(), cli)));
+ post_status:
+       tevent_req_nterror(req, status);
+       return tevent_req_post(req, ev);
+ fail:
+       TALLOC_FREE(req);
+       return NULL;
+}
+
+static void rpc_api_pipe_trans_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct rpc_api_pipe_state *state = tevent_req_data(
+               req, struct rpc_api_pipe_state);
+       NTSTATUS status;
+       uint8_t *rdata = NULL;
+       uint32_t rdata_len = 0;
+       char *rdata_copy;
 
-       ret = cli_api_pipe(talloc_tos(), cli,
-                          (uint8_t *)prs_data_p(data), prs_offset(data),
-                          cli->max_recv_frag
-                          ? cli->max_recv_frag : RPC_MAX_PDU_FRAG_LEN,
-                          &rdata, &rdata_len);
-       if (!NT_STATUS_IS_OK(ret)) {
-               DEBUG(5, ("cli_api_pipe failed: %s\n", nt_errstr(ret)));
-               return ret;
+       status = cli_api_pipe_recv(subreq, state, &rdata, &rdata_len);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(5, ("cli_api_pipe failed: %s\n", nt_errstr(status)));
+               tevent_req_nterror(req, status);
+               return;
        }
 
        if (rdata == NULL) {
                DEBUG(3,("rpc_api_pipe: %s failed to return data.\n",
-                        rpccli_pipe_txt(debug_ctx(), cli)));
-               /* Yes - some calls can truely return no data... */
-               prs_mem_free(&current_pdu);
-               return NT_STATUS_OK;
+                        rpccli_pipe_txt(debug_ctx(), state->cli)));
+               tevent_req_done(req);
+               return;
        }
 
        /*
-        * Give this memory as dynamic to the current pdu. Duplicating it
-        * sucks, but prs_struct doesn't know about talloc :-(
+        * Give the memory received from cli_trans as dynamic to the current
+        * pdu. Duplicating it sucks, but prs_struct doesn't know about talloc
+        * :-(
         */
-       rdata_copy = (uint8_t *)memdup(rdata, rdata_len);
+       rdata_copy = (char *)memdup(rdata, rdata_len);
        TALLOC_FREE(rdata);
-       if (rdata_copy == NULL) {
-               prs_mem_free(&current_pdu);
-               return NT_STATUS_NO_MEMORY;
+       if (tevent_req_nomem(rdata_copy, req)) {
+               return;
        }
-       prs_give_memory(&current_pdu, (char *)rdata_copy, rdata_len, true);
+       prs_give_memory(&state->incoming_frag, rdata_copy, rdata_len, true);
 
-       /* Ensure we can mess with the return prs_struct. */
-       SMB_ASSERT(UNMARSHALLING(rbuf));
-       SMB_ASSERT(prs_data_size(rbuf) == 0);
+       /* Ensure we have enough data for a pdu. */
+       subreq = get_complete_frag_send(state, state->ev, state->cli,
+                                       &state->rhdr, &state->incoming_frag);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, rpc_api_pipe_got_pdu, req);
+}
 
-       /* Make rbuf dynamic with no memory. */
-       prs_give_memory(rbuf, 0, 0, True);
+static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct rpc_api_pipe_state *state = tevent_req_data(
+               req, struct rpc_api_pipe_state);
+       NTSTATUS status;
+       char *rdata = NULL;
+       uint32_t rdata_len = 0;
 
-       while(1) {
-               RPC_HDR rhdr;
-               char *ret_data = NULL;
-               uint32 ret_data_len = 0;
+       status = get_complete_frag_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(5, ("get_complete_frag failed: %s\n",
+                         nt_errstr(status)));
+               tevent_req_nterror(req, status);
+               return;
+       }
 
-               /* Ensure we have enough data for a pdu. */
-               ret = get_complete_pdu(cli, &rhdr, &current_pdu);
-               if (!NT_STATUS_IS_OK(ret)) {
-                       goto err;
-               }
+       status = cli_pipe_validate_current_pdu(
+               state->cli, &state->rhdr, &state->incoming_frag,
+               state->expected_pkt_type, &rdata, &rdata_len,
+               &state->incoming_pdu);
 
-               /* We pass in rbuf here so if the alloc hint is set correctly 
-                  we can set the output size and avoid reallocs. */
+       DEBUG(10,("rpc_api_pipe: got frag len of %u at offset %u: %s\n",
+                 (unsigned)prs_data_size(&state->incoming_frag),
+                 (unsigned)state->incoming_pdu_offset,
+                 nt_errstr(status)));
 
-               ret = cli_pipe_validate_current_pdu(cli, &rhdr, &current_pdu, expected_pkt_type,
-                               &ret_data, &ret_data_len, rbuf);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
 
-               DEBUG(10,("rpc_api_pipe: got PDU len of %u at offset %u\n",
-                       prs_data_size(&current_pdu), current_rbuf_offset ));
+       if ((state->rhdr.flags & RPC_FLG_FIRST)
+           && (state->rhdr.pack_type[0] == 0)) {
+               /*
+                * Set the data type correctly for big-endian data on the
+                * first packet.
+                */
+               DEBUG(10,("rpc_api_pipe: On %s PDU data format is "
+                         "big-endian.\n",
+                         rpccli_pipe_txt(debug_ctx(), state->cli)));
+               prs_set_endian_data(&state->incoming_pdu, RPC_BIG_ENDIAN);
+       }
+       /*
+        * Check endianness on subsequent packets.
+        */
+       if (state->incoming_frag.bigendian_data
+           != state->incoming_pdu.bigendian_data) {
+               DEBUG(0,("rpc_api_pipe: Error : Endianness changed from %s to "
+                        "%s\n",
+                        state->incoming_pdu.bigendian_data?"big":"little",
+                        state->incoming_frag.bigendian_data?"big":"little"));
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return;
+       }
 
-               if (!NT_STATUS_IS_OK(ret)) {
-                       goto err;
-               }
+       /* Now copy the data portion out of the pdu into rbuf. */
+       if (!prs_force_grow(&state->incoming_pdu, rdata_len)) {
+               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+               return;
+       }
 
-               if ((rhdr.flags & RPC_FLG_FIRST)) {
-                       if (rhdr.pack_type[0] == 0) {
-                               /* Set the data type correctly for big-endian data on the first packet. */
-                               DEBUG(10,("rpc_api_pipe: On %s "
-                                       "PDU data format is big-endian.\n",
-                                       rpccli_pipe_txt(debug_ctx(), cli)));
+       memcpy(prs_data_p(&state->incoming_pdu) + state->incoming_pdu_offset,
+              rdata, (size_t)rdata_len);
+       state->incoming_pdu_offset += rdata_len;
 
-                               prs_set_endian_data(rbuf, RPC_BIG_ENDIAN);
-                       } else {
-                               /* Check endianness on subsequent packets. */
-                               if (current_pdu.bigendian_data != rbuf->bigendian_data) {
-                                       DEBUG(0,("rpc_api_pipe: Error : Endianness changed from %s to %s\n",
-                                               rbuf->bigendian_data ? "big" : "little",
-                                               current_pdu.bigendian_data ? "big" : "little" ));
-                                       ret = NT_STATUS_INVALID_PARAMETER;
-                                       goto err;
-                               }
-                       }
-               }
+       status = cli_pipe_reset_current_pdu(state->cli, &state->rhdr,
+                                           &state->incoming_frag);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
 
-               /* Now copy the data portion out of the pdu into rbuf. */
-               if (!prs_force_grow(rbuf, ret_data_len)) {
-                        ret = NT_STATUS_NO_MEMORY;
-                        goto err;
-                }
-               memcpy(prs_data_p(rbuf)+current_rbuf_offset, ret_data, (size_t)ret_data_len);
-               current_rbuf_offset += ret_data_len;
-
-               /* See if we've finished with all the data in current_pdu yet ? */
-               ret = cli_pipe_reset_current_pdu(cli, &rhdr, &current_pdu);
-               if (!NT_STATUS_IS_OK(ret)) {
-                       goto err;
-               }
+       if (state->rhdr.flags & RPC_FLG_LAST) {
+               DEBUG(10,("rpc_api_pipe: %s returned %u bytes.\n",
+                         rpccli_pipe_txt(debug_ctx(), state->cli),
+                         (unsigned)prs_data_size(&state->incoming_pdu)));
+               tevent_req_done(req);
+               return;
+       }
 
-               if (rhdr.flags & RPC_FLG_LAST) {
-                       break; /* We're done. */
-               }
+       subreq = get_complete_frag_send(state, state->ev, state->cli,
+                                       &state->rhdr, &state->incoming_frag);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
        }
+       tevent_req_set_callback(subreq, rpc_api_pipe_got_pdu, req);
+}
 
-       DEBUG(10,("rpc_api_pipe: %s returned %u bytes.\n",
-               rpccli_pipe_txt(debug_ctx(), cli),
-               (unsigned int)prs_data_size(rbuf) ));
+static NTSTATUS rpc_api_pipe_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                                 prs_struct *reply_pdu)
+{
+       struct rpc_api_pipe_state *state = tevent_req_data(
+               req, struct rpc_api_pipe_state);
+       NTSTATUS status;
 
-       prs_mem_free(&current_pdu);
-       return NT_STATUS_OK;
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
 
-  err:
+       *reply_pdu = state->incoming_pdu;
+       reply_pdu->mem_ctx = mem_ctx;
 
-       prs_mem_free(&current_pdu);
-       prs_mem_free(rbuf);
-       return ret;
+       /*
+        * Prevent state->incoming_pdu from being freed in
+        * rpc_api_pipe_state_destructor()
+        */
+       prs_init_empty(&state->incoming_pdu, state, UNMARSHALL);
+
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
@@ -1559,7 +1612,9 @@ static NTSTATUS create_schannel_auth_rpc_bind_req( struct rpc_pipe_client *cli,
                                                RPC_HDR_AUTH *pauth_out,
                                                prs_struct *auth_data)
 {
-       RPC_AUTH_SCHANNEL_NEG schannel_neg;
+       struct NL_AUTH_MESSAGE r;
+       enum ndr_err_code ndr_err;
+       DATA_BLOB blob;
 
        /* We may change the pad length before marshalling. */
        init_rpc_hdr_auth(pauth_out, RPC_SCHANNEL_AUTH_TYPE, (int)auth_level, 0, 1);
@@ -1573,16 +1628,30 @@ static NTSTATUS create_schannel_auth_rpc_bind_req( struct rpc_pipe_client *cli,
                }
        }
 
-       init_rpc_auth_schannel_neg(&schannel_neg, cli->auth->domain,
-                                  global_myname());
-
        /*
         * Now marshall the data into the auth parse_struct.
         */
 
-       if(!smb_io_rpc_auth_schannel_neg("schannel_neg",
-                                      &schannel_neg, auth_data, 0)) {
-               DEBUG(0,("Failed to marshall RPC_AUTH_SCHANNEL_NEG.\n"));
+       r.MessageType                   = NL_NEGOTIATE_REQUEST;
+       r.Flags                         = NL_FLAG_OEM_NETBIOS_DOMAIN_NAME |
+                                         NL_FLAG_OEM_NETBIOS_COMPUTER_NAME;
+       r.oem_netbios_domain.a          = cli->auth->domain;
+       r.oem_netbios_computer.a        = global_myname();
+
+       ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), NULL, &r,
+                      (ndr_push_flags_fn_t)ndr_push_NL_AUTH_MESSAGE);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(0,("Failed to marshall NL_AUTH_MESSAGE.\n"));
+               prs_mem_free(auth_data);
+               return ndr_map_error2ntstatus(ndr_err);
+       }
+
+       if (DEBUGLEVEL >= 10) {
+               NDR_PRINT_DEBUG(NL_AUTH_MESSAGE, &r);
+       }
+
+       if (!prs_copy_data_in(auth_data, (const char *)blob.data, blob.length))
+       {
                prs_mem_free(auth_data);
                return NT_STATUS_NO_MEMORY;
        }
@@ -1597,8 +1666,8 @@ static NTSTATUS create_schannel_auth_rpc_bind_req( struct rpc_pipe_client *cli,
 static NTSTATUS create_bind_or_alt_ctx_internal(enum RPC_PKT_TYPE pkt_type,
                                                prs_struct *rpc_out, 
                                                uint32 rpc_call_id,
-                                               const RPC_IFACE *abstract,
-                                               const RPC_IFACE *transfer,
+                                               const struct ndr_syntax_id *abstract,
+                                               const struct ndr_syntax_id *transfer,
                                                RPC_HDR_AUTH *phdr_auth,
                                                prs_struct *pauth_info)
 {
@@ -1679,8 +1748,8 @@ static NTSTATUS create_bind_or_alt_ctx_internal(enum RPC_PKT_TYPE pkt_type,
 static NTSTATUS create_rpc_bind_req(struct rpc_pipe_client *cli,
                                prs_struct *rpc_out, 
                                uint32 rpc_call_id,
-                               const RPC_IFACE *abstract,
-                               const RPC_IFACE *transfer,
+                               const struct ndr_syntax_id *abstract,
+                               const struct ndr_syntax_id *transfer,
                                enum pipe_auth_type auth_type,
                                enum pipe_auth_level auth_level)
 {
@@ -1903,6 +1972,12 @@ static uint32 calculate_data_len_tosend(struct rpc_pipe_client *cli,
 {
        uint32 data_space, data_len;
 
+#ifdef DEVELOPER
+       if ((data_left > 0) && (sys_random() % 2)) {
+               data_left = MAX(data_left/2, 1);
+       }
+#endif
+
        switch (cli->auth->auth_level) {
                case PIPE_AUTH_LEVEL_NONE:
                case PIPE_AUTH_LEVEL_CONNECT:
@@ -1933,6 +2008,7 @@ static uint32 calculate_data_len_tosend(struct rpc_pipe_client *cli,
                                                RPC_HDR_AUTH_LEN - *p_auth_len;
 
                        data_len = MIN(data_space, data_left);
+                       *p_ss_padding = 0;
                        if (data_len % 8) {
                                *p_ss_padding = 8 - (data_len % 8);
                        }
@@ -1955,170 +2031,276 @@ static uint32 calculate_data_len_tosend(struct rpc_pipe_client *cli,
  and deals with signing/sealing details.
  ********************************************************************/
 
-NTSTATUS rpc_api_pipe_req(struct rpc_pipe_client *cli,
-                       uint8 op_num,
-                       prs_struct *in_data,
-                       prs_struct *out_data)
+struct rpc_api_pipe_req_state {
+       struct event_context *ev;
+       struct rpc_pipe_client *cli;
+       uint8_t op_num;
+       uint32_t call_id;
+       prs_struct *req_data;
+       uint32_t req_data_sent;
+       prs_struct outgoing_frag;
+       prs_struct reply_pdu;
+};
+
+static int rpc_api_pipe_req_state_destructor(struct rpc_api_pipe_req_state *s)
 {
-       NTSTATUS ret;
-       uint32 data_left = prs_offset(in_data);
-       uint32 alloc_hint = prs_offset(in_data);
-       uint32 data_sent_thistime = 0;
-       uint32 current_data_offset = 0;
-       uint32 call_id = get_rpc_call_id();
-       char pad[8];
-       prs_struct outgoing_pdu;
+       prs_mem_free(&s->outgoing_frag);
+       prs_mem_free(&s->reply_pdu);
+       return 0;
+}
+
+static void rpc_api_pipe_req_write_done(struct tevent_req *subreq);
+static void rpc_api_pipe_req_done(struct tevent_req *subreq);
+static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
+                                 bool *is_last_frag);
 
-       memset(pad, '\0', 8);
+struct tevent_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,
+                                        struct event_context *ev,
+                                        struct rpc_pipe_client *cli,
+                                        uint8_t op_num,
+                                        prs_struct *req_data)
+{
+       struct tevent_req *req, *subreq;
+       struct rpc_api_pipe_req_state *state;
+       NTSTATUS status;
+       bool is_last_frag;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct rpc_api_pipe_req_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->cli = cli;
+       state->op_num = op_num;
+       state->req_data = req_data;
+       state->req_data_sent = 0;
+       state->call_id = get_rpc_call_id();
 
-       if (cli->max_xmit_frag < RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_MAX_SIGN_SIZE) {
+       if (cli->max_xmit_frag
+           < RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_MAX_SIGN_SIZE) {
                /* Server is screwed up ! */
-               return NT_STATUS_INVALID_PARAMETER;
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto post_status;
        }
 
-       if (!prs_init(&outgoing_pdu, cli->max_xmit_frag, prs_get_mem_context(in_data), MARSHALL))
-               return NT_STATUS_NO_MEMORY;
+       prs_init_empty(&state->reply_pdu, state, UNMARSHALL);
 
-       while (1) {
-               RPC_HDR hdr;
-               RPC_HDR_REQ hdr_req;
-               uint16 auth_len = 0;
-               uint16 frag_len = 0;
-               uint8 flags = 0;
-               uint32 ss_padding = 0;
-               ssize_t num_written;
+       if (!prs_init(&state->outgoing_frag, cli->max_xmit_frag,
+                     state, MARSHALL)) {
+               goto fail;
+       }
 
-               data_sent_thistime = calculate_data_len_tosend(cli, data_left,
-                                               &frag_len, &auth_len, &ss_padding);
+       talloc_set_destructor(state, rpc_api_pipe_req_state_destructor);
 
-               if (current_data_offset == 0) {
-                       flags = RPC_FLG_FIRST;
-               }
+       status = prepare_next_frag(state, &is_last_frag);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto post_status;
+       }
 
-               if (data_sent_thistime == data_left) {
-                       flags |= RPC_FLG_LAST;
+       if (is_last_frag) {
+               subreq = rpc_api_pipe_send(state, ev, state->cli,
+                                          &state->outgoing_frag,
+                                          RPC_RESPONSE);
+               if (subreq == NULL) {
+                       goto fail;
                }
+               tevent_req_set_callback(subreq, rpc_api_pipe_req_done, req);
+       } else {
+               subreq = rpc_write_send(
+                       state, ev, cli->transport,
+                       (uint8_t *)prs_data_p(&state->outgoing_frag),
+                       prs_offset(&state->outgoing_frag));
+               if (subreq == NULL) {
+                       goto fail;
+               }
+               tevent_req_set_callback(subreq, rpc_api_pipe_req_write_done,
+                                       req);
+       }
+       return req;
 
-               /* Create and marshall the header and request header. */
-               init_rpc_hdr(&hdr, RPC_REQUEST, flags, call_id, frag_len, auth_len);
+ post_status:
+       tevent_req_nterror(req, status);
+       return tevent_req_post(req, ev);
+ fail:
+       TALLOC_FREE(req);
+       return NULL;
+}
 
-               if(!smb_io_rpc_hdr("hdr    ", &hdr, &outgoing_pdu, 0)) {
-                       prs_mem_free(&outgoing_pdu);
-                       return NT_STATUS_NO_MEMORY;
-               }
+static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
+                                 bool *is_last_frag)
+{
+       RPC_HDR hdr;
+       RPC_HDR_REQ hdr_req;
+       uint32_t data_sent_thistime;
+       uint16_t auth_len;
+       uint16_t frag_len;
+       uint8_t flags = 0;
+       uint32_t ss_padding;
+       uint32_t data_left;
+       char pad[8] = { 0, };
+       NTSTATUS status;
 
-               /* Create the rpc request RPC_HDR_REQ */
-               init_rpc_hdr_req(&hdr_req, alloc_hint, op_num);
+       data_left = prs_offset(state->req_data) - state->req_data_sent;
 
-               if(!smb_io_rpc_hdr_req("hdr_req", &hdr_req, &outgoing_pdu, 0)) {
-                       prs_mem_free(&outgoing_pdu);
-                       return NT_STATUS_NO_MEMORY;
-               }
+       data_sent_thistime = calculate_data_len_tosend(
+               state->cli, data_left, &frag_len, &auth_len, &ss_padding);
 
-               /* Copy in the data, plus any ss padding. */
-               if (!prs_append_some_prs_data(&outgoing_pdu, in_data, current_data_offset, data_sent_thistime)) {
-                       prs_mem_free(&outgoing_pdu);
-                       return NT_STATUS_NO_MEMORY;
-               }
+       if (state->req_data_sent == 0) {
+               flags = RPC_FLG_FIRST;
+       }
 
-               /* Copy the sign/seal padding data. */
-               if (ss_padding) {
-                       if (!prs_copy_data_in(&outgoing_pdu, pad, ss_padding)) {
-                               prs_mem_free(&outgoing_pdu);
-                               return NT_STATUS_NO_MEMORY;
-                       }
-               }
+       if (data_sent_thistime == data_left) {
+               flags |= RPC_FLG_LAST;
+       }
 
-               /* Generate any auth sign/seal and add the auth footer. */
-               if (auth_len) {
-                       switch (cli->auth->auth_type) {
-                               case PIPE_AUTH_TYPE_NONE:
-                                       break;
-                               case PIPE_AUTH_TYPE_NTLMSSP:
-                               case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
-                                       ret = add_ntlmssp_auth_footer(cli, &hdr, ss_padding, &outgoing_pdu);
-                                       if (!NT_STATUS_IS_OK(ret)) {
-                                               prs_mem_free(&outgoing_pdu);
-                                               return ret;
-                                       }
-                                       break;
-                               case PIPE_AUTH_TYPE_SCHANNEL:
-                                       ret = add_schannel_auth_footer(cli, &hdr, ss_padding, &outgoing_pdu);
-                                       if (!NT_STATUS_IS_OK(ret)) {
-                                               prs_mem_free(&outgoing_pdu);
-                                               return ret;
-                                       }
-                                       break;
-                               default:
-                                       smb_panic("bad auth type");
-                                       break; /* notreached */
-                       }
-               }
+       if (!prs_set_offset(&state->outgoing_frag, 0)) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-               /* Actually send the packet. */
-               if (flags & RPC_FLG_LAST) {
-                       /* Last packet - send the data, get the reply and return. */
-                       ret = rpc_api_pipe(cli, &outgoing_pdu, out_data, RPC_RESPONSE);
-                       prs_mem_free(&outgoing_pdu);
-
-                       if ((DEBUGLEVEL >= 50)
-                           && (cli->transport_type == NCACN_NP)) {
-                               char *dump_name = NULL;
-                               /* Also capture received data */
-                               if (asprintf(&dump_name, "%s/reply_%s_%d",
-                                            get_dyn_LOGFILEBASE(),
-                                            cli->trans.np.pipe_name, op_num) > 0) {
-                                       prs_dump(dump_name, op_num, out_data);
-                                       SAFE_FREE(dump_name);
-                               }
-                       }
+       /* Create and marshall the header and request header. */
+       init_rpc_hdr(&hdr, RPC_REQUEST, flags, state->call_id, frag_len,
+                    auth_len);
 
-                       return ret;
-               }
+       if (!smb_io_rpc_hdr("hdr    ", &hdr, &state->outgoing_frag, 0)) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-               switch (cli->transport_type) {
-               case NCACN_NP:
-                       num_written = cli_write(cli->trans.np.cli,
-                                               cli->trans.np.fnum,
-                                               8, /* 8 means message mode. */
-                                               prs_data_p(&outgoing_pdu),
-                                               (off_t)0,
-                                               (size_t)hdr.frag_len);
-
-                       if (num_written != hdr.frag_len) {
-                               prs_mem_free(&outgoing_pdu);
-                               return cli_get_nt_error(cli->trans.np.cli);
-                       }
-                       break;
-               case NCACN_IP_TCP:
-               case NCACN_UNIX_STREAM:
-                       num_written = write_data(
-                               cli->trans.sock.fd,
-                               prs_data_p(&outgoing_pdu),
-                               (size_t)hdr.frag_len);
-                       if (num_written != hdr.frag_len) {
-                               NTSTATUS status;
-                               status = map_nt_error_from_unix(errno);
-                               prs_mem_free(&outgoing_pdu);
-                               return status;
-                       }
-                       break;
-               default:
-                       DEBUG(0, ("unknown transport type %d\n",
-                                 cli->transport_type));
-                       return NT_STATUS_INTERNAL_ERROR;
-               }
+       /* Create the rpc request RPC_HDR_REQ */
+       init_rpc_hdr_req(&hdr_req, prs_offset(state->req_data),
+                        state->op_num);
 
-               current_data_offset += data_sent_thistime;
-               data_left -= data_sent_thistime;
+       if (!smb_io_rpc_hdr_req("hdr_req", &hdr_req,
+                               &state->outgoing_frag, 0)) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-               /* Reset the marshalling position back to zero. */
-               if (!prs_set_offset(&outgoing_pdu, 0)) {
-                       prs_mem_free(&outgoing_pdu);
-                       return NT_STATUS_NO_MEMORY;
+       /* Copy in the data, plus any ss padding. */
+       if (!prs_append_some_prs_data(&state->outgoing_frag,
+                                     state->req_data, state->req_data_sent,
+                                     data_sent_thistime)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* Copy the sign/seal padding data. */
+       if (!prs_copy_data_in(&state->outgoing_frag, pad, ss_padding)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* Generate any auth sign/seal and add the auth footer. */
+       switch (state->cli->auth->auth_type) {
+       case PIPE_AUTH_TYPE_NONE:
+               status = NT_STATUS_OK;
+               break;
+       case PIPE_AUTH_TYPE_NTLMSSP:
+       case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
+               status = add_ntlmssp_auth_footer(state->cli, &hdr, ss_padding,
+                                                &state->outgoing_frag);
+               break;
+       case PIPE_AUTH_TYPE_SCHANNEL:
+               status = add_schannel_auth_footer(state->cli, &hdr, ss_padding,
+                                                 &state->outgoing_frag);
+               break;
+       default:
+               status = NT_STATUS_INVALID_PARAMETER;
+               break;
+       }
+
+       state->req_data_sent += data_sent_thistime;
+       *is_last_frag = ((flags & RPC_FLG_LAST) != 0);
+
+       return status;
+}
+
+static void rpc_api_pipe_req_write_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct rpc_api_pipe_req_state *state = tevent_req_data(
+               req, struct rpc_api_pipe_req_state);
+       NTSTATUS status;
+       bool is_last_frag;
+
+       status = rpc_write_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       status = prepare_next_frag(state, &is_last_frag);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       if (is_last_frag) {
+               subreq = rpc_api_pipe_send(state, state->ev, state->cli,
+                                          &state->outgoing_frag,
+                                          RPC_RESPONSE);
+               if (tevent_req_nomem(subreq, req)) {
+                       return;
+               }
+               tevent_req_set_callback(subreq, rpc_api_pipe_req_done, req);
+       } else {
+               subreq = rpc_write_send(
+                       state, state->ev,
+                       state->cli->transport,
+                       (uint8_t *)prs_data_p(&state->outgoing_frag),
+                       prs_offset(&state->outgoing_frag));
+               if (tevent_req_nomem(subreq, req)) {
+                       return;
                }
+               tevent_req_set_callback(subreq, rpc_api_pipe_req_write_done,
+                                       req);
+       }
+}
+
+static void rpc_api_pipe_req_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct rpc_api_pipe_req_state *state = tevent_req_data(
+               req, struct rpc_api_pipe_req_state);
+       NTSTATUS status;
+
+       status = rpc_api_pipe_recv(subreq, state, &state->reply_pdu);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
        }
+       tevent_req_done(req);
 }
+
+NTSTATUS rpc_api_pipe_req_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                              prs_struct *reply_pdu)
+{
+       struct rpc_api_pipe_req_state *state = tevent_req_data(
+               req, struct rpc_api_pipe_req_state);
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               /*
+                * We always have to initialize to reply pdu, even if there is
+                * none. The rpccli_* caller routines expect this.
+                */
+               prs_init_empty(reply_pdu, mem_ctx, UNMARSHALL);
+               return status;
+       }
+
+       *reply_pdu = state->reply_pdu;
+       reply_pdu->mem_ctx = mem_ctx;
+
+       /*
+        * Prevent state->req_pdu from being freed in
+        * rpc_api_pipe_req_state_destructor()
+        */
+       prs_init_empty(&state->reply_pdu, state, UNMARSHALL);
+
+       return NT_STATUS_OK;
+}
+
 #if 0
 /****************************************************************************
  Set the handle state.
@@ -2170,7 +2352,8 @@ static bool rpc_pipe_set_hnd_state(struct rpc_pipe_client *cli,
  Check the rpc bind acknowledge response.
 ****************************************************************************/
 
-static bool check_bind_response(RPC_HDR_BA *hdr_ba, const RPC_IFACE *transfer)
+static bool check_bind_response(RPC_HDR_BA *hdr_ba,
+                               const struct ndr_syntax_id *transfer)
 {
        if ( hdr_ba->addr.len == 0) {
                DEBUG(4,("Ignoring length check -- ASU bug (server didn't fill in the pipe name correctly)"));
@@ -2254,188 +2437,340 @@ static NTSTATUS create_rpc_bind_auth3(struct rpc_pipe_client *cli,
        return NT_STATUS_OK;
 }
 
-/****************************************************************************
- Create and send the third packet in an RPC auth.
-****************************************************************************/
+/*******************************************************************
+ Creates a DCE/RPC bind alter context authentication request which
+ may contain a spnego auth blobl
+ ********************************************************************/
 
-static NTSTATUS rpc_finish_auth3_bind(struct rpc_pipe_client *cli,
-                               RPC_HDR *phdr,
-                               prs_struct *rbuf,
-                               uint32 rpc_call_id,
-                               enum pipe_auth_type auth_type,
-                               enum pipe_auth_level auth_level)
+static NTSTATUS create_rpc_alter_context(uint32 rpc_call_id,
+                                       const struct ndr_syntax_id *abstract,
+                                       const struct ndr_syntax_id *transfer,
+                                       enum pipe_auth_level auth_level,
+                                       const DATA_BLOB *pauth_blob, /* spnego auth blob already created. */
+                                       prs_struct *rpc_out)
 {
-       DATA_BLOB server_response = data_blob_null;
-       DATA_BLOB client_reply = data_blob_null;
        RPC_HDR_AUTH hdr_auth;
-       NTSTATUS nt_status;
-       prs_struct rpc_out;
-       ssize_t ret;
+       prs_struct auth_info;
+       NTSTATUS ret = NT_STATUS_OK;
 
-       if (!phdr->auth_len || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       ZERO_STRUCT(hdr_auth);
+       if (!prs_init(&auth_info, RPC_HDR_AUTH_LEN, prs_get_mem_context(rpc_out), MARSHALL))
+               return NT_STATUS_NO_MEMORY;
+
+       /* We may change the pad length before marshalling. */
+       init_rpc_hdr_auth(&hdr_auth, RPC_SPNEGO_AUTH_TYPE, (int)auth_level, 0, 1);
+
+       if (pauth_blob->length) {
+               if (!prs_copy_data_in(&auth_info, (const char *)pauth_blob->data, pauth_blob->length)) {
+                       prs_mem_free(&auth_info);
+                       return NT_STATUS_NO_MEMORY;
+               }
        }
 
-       /* Process the returned NTLMSSP blob first. */
-       if (!prs_set_offset(rbuf, phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       ret = create_bind_or_alt_ctx_internal(RPC_ALTCONT,
+                                               rpc_out, 
+                                               rpc_call_id,
+                                               abstract,
+                                               transfer,
+                                               &hdr_auth,
+                                               &auth_info);
+       prs_mem_free(&auth_info);
+       return ret;
+}
+
+/****************************************************************************
+ Do an rpc bind.
+****************************************************************************/
+
+struct rpc_pipe_bind_state {
+       struct event_context *ev;
+       struct rpc_pipe_client *cli;
+       prs_struct rpc_out;
+       uint32_t rpc_call_id;
+};
+
+static int rpc_pipe_bind_state_destructor(struct rpc_pipe_bind_state *state)
+{
+       prs_mem_free(&state->rpc_out);
+       return 0;
+}
+
+static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq);
+static NTSTATUS rpc_finish_auth3_bind_send(struct tevent_req *req,
+                                          struct rpc_pipe_bind_state *state,
+                                          struct rpc_hdr_info *phdr,
+                                          prs_struct *reply_pdu);
+static void rpc_bind_auth3_write_done(struct tevent_req *subreq);
+static NTSTATUS rpc_finish_spnego_ntlmssp_bind_send(struct tevent_req *req,
+                                                   struct rpc_pipe_bind_state *state,
+                                                   struct rpc_hdr_info *phdr,
+                                                   prs_struct *reply_pdu);
+static void rpc_bind_ntlmssp_api_done(struct tevent_req *subreq);
+
+struct tevent_req *rpc_pipe_bind_send(TALLOC_CTX *mem_ctx,
+                                     struct event_context *ev,
+                                     struct rpc_pipe_client *cli,
+                                     struct cli_pipe_auth_data *auth)
+{
+       struct tevent_req *req, *subreq;
+       struct rpc_pipe_bind_state *state;
+       NTSTATUS status;
+
+       req = tevent_req_create(mem_ctx, &state, struct rpc_pipe_bind_state);
+       if (req == NULL) {
+               return NULL;
        }
 
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, rbuf, 0)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       DEBUG(5,("Bind RPC Pipe: %s auth_type %u, auth_level %u\n",
+               rpccli_pipe_txt(debug_ctx(), cli),
+               (unsigned int)auth->auth_type,
+               (unsigned int)auth->auth_level ));
+
+       state->ev = ev;
+       state->cli = cli;
+       state->rpc_call_id = get_rpc_call_id();
+
+       prs_init_empty(&state->rpc_out, state, MARSHALL);
+       talloc_set_destructor(state, rpc_pipe_bind_state_destructor);
+
+       cli->auth = talloc_move(cli, &auth);
+
+       /* Marshall the outgoing data. */
+       status = create_rpc_bind_req(cli, &state->rpc_out,
+                                    state->rpc_call_id,
+                                    &cli->abstract_syntax,
+                                    &cli->transfer_syntax,
+                                    cli->auth->auth_type,
+                                    cli->auth->auth_level);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               goto post_status;
        }
 
-       /* TODO - check auth_type/auth_level match. */
+       subreq = rpc_api_pipe_send(state, ev, cli, &state->rpc_out,
+                                  RPC_BINDACK);
+       if (subreq == NULL) {
+               goto fail;
+       }
+       tevent_req_set_callback(subreq, rpc_pipe_bind_step_one_done, req);
+       return req;
 
-       server_response = data_blob(NULL, phdr->auth_len);
-       prs_copy_data_out((char *)server_response.data, rbuf, phdr->auth_len);
+ post_status:
+       tevent_req_nterror(req, status);
+       return tevent_req_post(req, ev);
+ fail:
+       TALLOC_FREE(req);
+       return NULL;
+}
 
-       nt_status = ntlmssp_update(cli->auth->a_u.ntlmssp_state,
-                                  server_response,
-                                  &client_reply);
+static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct rpc_pipe_bind_state *state = tevent_req_data(
+               req, struct rpc_pipe_bind_state);
+       prs_struct reply_pdu;
+       struct rpc_hdr_info hdr;
+       struct rpc_hdr_ba_info hdr_ba;
+       NTSTATUS status;
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               DEBUG(0,("rpc_finish_auth3_bind: NTLMSSP update using server blob failed.\n"));
-               data_blob_free(&server_response);
-               return nt_status;
+       status = rpc_api_pipe_recv(subreq, talloc_tos(), &reply_pdu);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(3, ("rpc_pipe_bind: %s bind request returned %s\n",
+                         rpccli_pipe_txt(debug_ctx(), state->cli),
+                         nt_errstr(status)));
+               tevent_req_nterror(req, status);
+               return;
        }
 
-       prs_init_empty(&rpc_out, prs_get_mem_context(rbuf), MARSHALL);
+       /* Unmarshall the RPC header */
+       if (!smb_io_rpc_hdr("hdr", &hdr, &reply_pdu, 0)) {
+               DEBUG(0, ("rpc_pipe_bind: failed to unmarshall RPC_HDR.\n"));
+               prs_mem_free(&reply_pdu);
+               tevent_req_nterror(req, NT_STATUS_BUFFER_TOO_SMALL);
+               return;
+       }
 
-       nt_status = create_rpc_bind_auth3(cli, rpc_call_id,
-                               auth_type, auth_level,
-                               &client_reply, &rpc_out);
+       if (!smb_io_rpc_hdr_ba("", &hdr_ba, &reply_pdu, 0)) {
+               DEBUG(0, ("rpc_pipe_bind: Failed to unmarshall "
+                         "RPC_HDR_BA.\n"));
+               prs_mem_free(&reply_pdu);
+               tevent_req_nterror(req, NT_STATUS_BUFFER_TOO_SMALL);
+               return;
+       }
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               prs_mem_free(&rpc_out);
-               data_blob_free(&client_reply);
-               data_blob_free(&server_response);
-               return nt_status;
+       if (!check_bind_response(&hdr_ba, &state->cli->transfer_syntax)) {
+               DEBUG(2, ("rpc_pipe_bind: check_bind_response failed.\n"));
+               prs_mem_free(&reply_pdu);
+               tevent_req_nterror(req, NT_STATUS_BUFFER_TOO_SMALL);
+               return;
        }
 
-       switch (cli->transport_type) {
-       case NCACN_NP:
-               /* 8 here is named pipe message mode. */
-               ret = cli_write(cli->trans.np.cli, cli->trans.np.fnum,
-                               0x8, prs_data_p(&rpc_out), 0,
-                               (size_t)prs_offset(&rpc_out));
+       state->cli->max_xmit_frag = hdr_ba.bba.max_tsize;
+       state->cli->max_recv_frag = hdr_ba.bba.max_rsize;
+
+       /*
+        * For authenticated binds we may need to do 3 or 4 leg binds.
+        */
+
+       switch(state->cli->auth->auth_type) {
+
+       case PIPE_AUTH_TYPE_NONE:
+       case PIPE_AUTH_TYPE_SCHANNEL:
+               /* Bind complete. */
+               prs_mem_free(&reply_pdu);
+               tevent_req_done(req);
                break;
 
-               if (ret != (ssize_t)prs_offset(&rpc_out)) {
-                       nt_status = cli_get_nt_error(cli->trans.np.cli);
+       case PIPE_AUTH_TYPE_NTLMSSP:
+               /* Need to send AUTH3 packet - no reply. */
+               status = rpc_finish_auth3_bind_send(req, state, &hdr,
+                                                   &reply_pdu);
+               prs_mem_free(&reply_pdu);
+               if (!NT_STATUS_IS_OK(status)) {
+                       tevent_req_nterror(req, status);
                }
-       case NCACN_IP_TCP:
-       case NCACN_UNIX_STREAM:
-               ret = write_data(cli->trans.sock.fd, prs_data_p(&rpc_out),
-                                (size_t)prs_offset(&rpc_out));
-               if (ret != (ssize_t)prs_offset(&rpc_out)) {
-                       nt_status = map_nt_error_from_unix(errno);
+               break;
+
+       case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
+               /* Need to send alter context request and reply. */
+               status = rpc_finish_spnego_ntlmssp_bind_send(req, state, &hdr,
+                                                            &reply_pdu);
+               prs_mem_free(&reply_pdu);
+               if (!NT_STATUS_IS_OK(status)) {
+                       tevent_req_nterror(req, status);
                }
                break;
+
+       case PIPE_AUTH_TYPE_KRB5:
+               /* */
+
        default:
-               DEBUG(0, ("unknown transport type %d\n", cli->transport_type));
-               return NT_STATUS_INTERNAL_ERROR;
+               DEBUG(0,("cli_finish_bind_auth: unknown auth type %u\n",
+                        (unsigned int)state->cli->auth->auth_type));
+               prs_mem_free(&reply_pdu);
+               tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
        }
+}
 
-       if (ret != (ssize_t)prs_offset(&rpc_out)) {
-               DEBUG(0,("rpc_send_auth_auth3: write failed. Return was %s\n",
-                        nt_errstr(nt_status)));
-               prs_mem_free(&rpc_out);
-               data_blob_free(&client_reply);
-               data_blob_free(&server_response);
-               return nt_status;
+static NTSTATUS rpc_finish_auth3_bind_send(struct tevent_req *req,
+                                          struct rpc_pipe_bind_state *state,
+                                          struct rpc_hdr_info *phdr,
+                                          prs_struct *reply_pdu)
+{
+       DATA_BLOB server_response = data_blob_null;
+       DATA_BLOB client_reply = data_blob_null;
+       struct rpc_hdr_auth_info hdr_auth;
+       struct tevent_req *subreq;
+       NTSTATUS status;
+
+       if ((phdr->auth_len == 0)
+           || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (!prs_set_offset(
+                   reply_pdu,
+                   phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, reply_pdu, 0)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       /* TODO - check auth_type/auth_level match. */
+
+       server_response = data_blob_talloc(talloc_tos(), NULL, phdr->auth_len);
+       prs_copy_data_out((char *)server_response.data, reply_pdu,
+                         phdr->auth_len);
+
+       status = ntlmssp_update(state->cli->auth->a_u.ntlmssp_state,
+                               server_response, &client_reply);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("rpc_finish_auth3_bind: NTLMSSP update using server "
+                         "blob failed: %s.\n", nt_errstr(status)));
+               return status;
+       }
+
+       prs_init_empty(&state->rpc_out, talloc_tos(), MARSHALL);
+
+       status = create_rpc_bind_auth3(state->cli, state->rpc_call_id,
+                                      state->cli->auth->auth_type,
+                                      state->cli->auth->auth_level,
+                                      &client_reply, &state->rpc_out);
+       data_blob_free(&client_reply);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       DEBUG(5,("rpc_send_auth_auth3: %s sent auth3 response ok.\n",
-                rpccli_pipe_txt(debug_ctx(), cli)));
-
-       prs_mem_free(&rpc_out);
-       data_blob_free(&client_reply);
-       data_blob_free(&server_response);
+       subreq = rpc_write_send(state, state->ev, state->cli->transport,
+                               (uint8_t *)prs_data_p(&state->rpc_out),
+                               prs_offset(&state->rpc_out));
+       if (subreq == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       tevent_req_set_callback(subreq, rpc_bind_auth3_write_done, req);
        return NT_STATUS_OK;
 }
 
-/*******************************************************************
- Creates a DCE/RPC bind alter context authentication request which
- may contain a spnego auth blobl
- ********************************************************************/
-
-static NTSTATUS create_rpc_alter_context(uint32 rpc_call_id,
-                                       const RPC_IFACE *abstract,
-                                       const RPC_IFACE *transfer,
-                                       enum pipe_auth_level auth_level,
-                                       const DATA_BLOB *pauth_blob, /* spnego auth blob already created. */
-                                       prs_struct *rpc_out)
+static void rpc_bind_auth3_write_done(struct tevent_req *subreq)
 {
-       RPC_HDR_AUTH hdr_auth;
-       prs_struct auth_info;
-       NTSTATUS ret = NT_STATUS_OK;
-
-       ZERO_STRUCT(hdr_auth);
-       if (!prs_init(&auth_info, RPC_HDR_AUTH_LEN, prs_get_mem_context(rpc_out), MARSHALL))
-               return NT_STATUS_NO_MEMORY;
-
-       /* We may change the pad length before marshalling. */
-       init_rpc_hdr_auth(&hdr_auth, RPC_SPNEGO_AUTH_TYPE, (int)auth_level, 0, 1);
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       NTSTATUS status;
 
-       if (pauth_blob->length) {
-               if (!prs_copy_data_in(&auth_info, (const char *)pauth_blob->data, pauth_blob->length)) {
-                       prs_mem_free(&auth_info);
-                       return NT_STATUS_NO_MEMORY;
-               }
+       status = rpc_write_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
        }
-
-       ret = create_bind_or_alt_ctx_internal(RPC_ALTCONT,
-                                               rpc_out, 
-                                               rpc_call_id,
-                                               abstract,
-                                               transfer,
-                                               &hdr_auth,
-                                               &auth_info);
-       prs_mem_free(&auth_info);
-       return ret;
+       tevent_req_done(req);
 }
 
-/*******************************************************************
- Third leg of the SPNEGO bind mechanism - sends alter context PDU
- and gets a response.
- ********************************************************************/
-
-static NTSTATUS rpc_finish_spnego_ntlmssp_bind(struct rpc_pipe_client *cli,
-                                RPC_HDR *phdr,
-                                prs_struct *rbuf,
-                                uint32 rpc_call_id,
-                               const RPC_IFACE *abstract,
-                               const RPC_IFACE *transfer,
-                                enum pipe_auth_type auth_type,
-                                enum pipe_auth_level auth_level)
+static NTSTATUS rpc_finish_spnego_ntlmssp_bind_send(struct tevent_req *req,
+                                                   struct rpc_pipe_bind_state *state,
+                                                   struct rpc_hdr_info *phdr,
+                                                   prs_struct *reply_pdu)
 {
        DATA_BLOB server_spnego_response = data_blob_null;
        DATA_BLOB server_ntlm_response = data_blob_null;
        DATA_BLOB client_reply = data_blob_null;
        DATA_BLOB tmp_blob = data_blob_null;
        RPC_HDR_AUTH hdr_auth;
-       NTSTATUS nt_status;
-       prs_struct rpc_out;
+       struct tevent_req *subreq;
+       NTSTATUS status;
 
-       if (!phdr->auth_len || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
+       if ((phdr->auth_len == 0)
+           || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
        /* Process the returned NTLMSSP blob first. */
-       if (!prs_set_offset(rbuf, phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
+       if (!prs_set_offset(
+                   reply_pdu,
+                   phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, rbuf, 0)) {
+       if (!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, reply_pdu, 0)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
        server_spnego_response = data_blob(NULL, phdr->auth_len);
-       prs_copy_data_out((char *)server_spnego_response.data, rbuf, phdr->auth_len);
+       prs_copy_data_out((char *)server_spnego_response.data,
+                         reply_pdu, phdr->auth_len);
 
-       /* The server might give us back two challenges - tmp_blob is for the second. */
-       if (!spnego_parse_challenge(server_spnego_response, &server_ntlm_response, &tmp_blob)) {
+       /*
+        * The server might give us back two challenges - tmp_blob is for the
+        * second.
+        */
+       if (!spnego_parse_challenge(server_spnego_response,
+                                   &server_ntlm_response, &tmp_blob)) {
                data_blob_free(&server_spnego_response);
                data_blob_free(&server_ntlm_response);
                data_blob_free(&tmp_blob);
@@ -2446,272 +2781,173 @@ static NTSTATUS rpc_finish_spnego_ntlmssp_bind(struct rpc_pipe_client *cli,
        data_blob_free(&server_spnego_response);
        data_blob_free(&tmp_blob);
 
-       nt_status = ntlmssp_update(cli->auth->a_u.ntlmssp_state,
-                                  server_ntlm_response,
-                                  &client_reply);
+       status = ntlmssp_update(state->cli->auth->a_u.ntlmssp_state,
+                               server_ntlm_response, &client_reply);
 
        /* Finished with the server_ntlm response */
        data_blob_free(&server_ntlm_response);
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               DEBUG(0,("rpc_finish_spnego_ntlmssp_bind: NTLMSSP update using server blob failed.\n"));
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("rpc_finish_spnego_ntlmssp_bind: NTLMSSP update "
+                         "using server blob failed.\n"));
                data_blob_free(&client_reply);
-               return nt_status;
+               return status;
        }
 
        /* SPNEGO wrap the client reply. */
        tmp_blob = spnego_gen_auth(client_reply);
        data_blob_free(&client_reply);
        client_reply = tmp_blob;
-       tmp_blob = data_blob_null; /* Ensure it's safe to free this just in case. */
+       tmp_blob = data_blob_null;
 
        /* Now prepare the alter context pdu. */
-       prs_init_empty(&rpc_out, prs_get_mem_context(rbuf), MARSHALL);
-
-       nt_status = create_rpc_alter_context(rpc_call_id,
-                                               abstract,
-                                               transfer,
-                                               auth_level,
-                                               &client_reply,
-                                               &rpc_out);
-
+       prs_init_empty(&state->rpc_out, state, MARSHALL);
+
+       status = create_rpc_alter_context(state->rpc_call_id,
+                                         &state->cli->abstract_syntax,
+                                         &state->cli->transfer_syntax,
+                                         state->cli->auth->auth_level,
+                                         &client_reply,
+                                         &state->rpc_out);
        data_blob_free(&client_reply);
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               prs_mem_free(&rpc_out);
-               return nt_status;
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       subreq = rpc_api_pipe_send(state, state->ev, state->cli,
+                                  &state->rpc_out, RPC_ALTCONTRESP);
+       if (subreq == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
+       tevent_req_set_callback(subreq, rpc_bind_ntlmssp_api_done, req);
+       return NT_STATUS_OK;
+}
 
-       /* Initialize the returning data struct. */
-       prs_mem_free(rbuf);
-       prs_init_empty(rbuf, talloc_tos(), UNMARSHALL);
+static void rpc_bind_ntlmssp_api_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct rpc_pipe_bind_state *state = tevent_req_data(
+               req, struct rpc_pipe_bind_state);
+       DATA_BLOB server_spnego_response = data_blob_null;
+       DATA_BLOB tmp_blob = data_blob_null;
+       prs_struct reply_pdu;
+       struct rpc_hdr_info hdr;
+       struct rpc_hdr_auth_info hdr_auth;
+       NTSTATUS status;
 
-       nt_status = rpc_api_pipe(cli, &rpc_out, rbuf, RPC_ALTCONTRESP);
-       prs_mem_free(&rpc_out);
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               return nt_status;
+       status = rpc_api_pipe_recv(subreq, talloc_tos(), &reply_pdu);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
        }
 
        /* Get the auth blob from the reply. */
-       if(!smb_io_rpc_hdr("rpc_hdr   ", phdr, rbuf, 0)) {
-               DEBUG(0,("rpc_finish_spnego_ntlmssp_bind: Failed to unmarshall RPC_HDR.\n"));
-               return NT_STATUS_BUFFER_TOO_SMALL;
+       if (!smb_io_rpc_hdr("rpc_hdr   ", &hdr, &reply_pdu, 0)) {
+               DEBUG(0, ("rpc_finish_spnego_ntlmssp_bind: Failed to "
+                         "unmarshall RPC_HDR.\n"));
+               tevent_req_nterror(req, NT_STATUS_BUFFER_TOO_SMALL);
+               return;
        }
 
-       if (!prs_set_offset(rbuf, phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       if (!prs_set_offset(
+                   &reply_pdu,
+                   hdr.frag_len - hdr.auth_len - RPC_HDR_AUTH_LEN)) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return;
        }
 
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, rbuf, 0)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       if (!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, &reply_pdu, 0)) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return;
        }
 
-       server_spnego_response = data_blob(NULL, phdr->auth_len);
-       prs_copy_data_out((char *)server_spnego_response.data, rbuf, phdr->auth_len);
+       server_spnego_response = data_blob(NULL, hdr.auth_len);
+       prs_copy_data_out((char *)server_spnego_response.data, &reply_pdu,
+                         hdr.auth_len);
 
        /* Check we got a valid auth response. */
-       if (!spnego_parse_auth_response(server_spnego_response, NT_STATUS_OK, OID_NTLMSSP, &tmp_blob)) {
+       if (!spnego_parse_auth_response(server_spnego_response, NT_STATUS_OK,
+                                       OID_NTLMSSP, &tmp_blob)) {
                data_blob_free(&server_spnego_response);
                data_blob_free(&tmp_blob);
-               return NT_STATUS_INVALID_PARAMETER;
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return;
        }
 
        data_blob_free(&server_spnego_response);
        data_blob_free(&tmp_blob);
 
        DEBUG(5,("rpc_finish_spnego_ntlmssp_bind: alter context request to "
-                "%s.\n", rpccli_pipe_txt(debug_ctx(), cli)));
-
-       return NT_STATUS_OK;
+                "%s.\n", rpccli_pipe_txt(debug_ctx(), state->cli)));
+       tevent_req_done(req);
 }
 
-/****************************************************************************
- Do an rpc bind.
-****************************************************************************/
+NTSTATUS rpc_pipe_bind_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
 
 NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli,
                       struct cli_pipe_auth_data *auth)
 {
-       RPC_HDR hdr;
-       RPC_HDR_BA hdr_ba;
-       prs_struct rpc_out;
-       prs_struct rbuf;
-       uint32 rpc_call_id;
-       NTSTATUS status;
-
-       DEBUG(5,("Bind RPC Pipe: %s auth_type %u, auth_level %u\n",
-               rpccli_pipe_txt(debug_ctx(), cli),
-               (unsigned int)auth->auth_type,
-               (unsigned int)auth->auth_level ));
-
-       cli->auth = talloc_move(cli, &auth);
-
-       prs_init_empty(&rpc_out, talloc_tos(), MARSHALL);
-
-       rpc_call_id = get_rpc_call_id();
-
-       /* Marshall the outgoing data. */
-       status = create_rpc_bind_req(cli, &rpc_out, rpc_call_id,
-                               &cli->abstract_syntax,
-                               &cli->transfer_syntax,
-                               cli->auth->auth_type,
-                               cli->auth->auth_level);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               prs_mem_free(&rpc_out);
-               return status;
-       }
-
-       /* Initialize the incoming data struct. */
-       prs_init_empty(&rbuf, talloc_tos(), UNMARSHALL);
-
-       /* send data on \PIPE\.  receive a response */
-       status = rpc_api_pipe(cli, &rpc_out, &rbuf, RPC_BINDACK);
-       prs_mem_free(&rpc_out);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-
-       DEBUG(3,("rpc_pipe_bind: %s bind request returned ok.\n",
-                rpccli_pipe_txt(debug_ctx(), cli)));
-
-       /* Unmarshall the RPC header */
-       if(!smb_io_rpc_hdr("hdr"   , &hdr, &rbuf, 0)) {
-               DEBUG(0,("rpc_pipe_bind: failed to unmarshall RPC_HDR.\n"));
-               prs_mem_free(&rbuf);
-               return NT_STATUS_BUFFER_TOO_SMALL;
-       }
-
-       if(!smb_io_rpc_hdr_ba("", &hdr_ba, &rbuf, 0)) {
-               DEBUG(0,("rpc_pipe_bind: Failed to unmarshall RPC_HDR_BA.\n"));
-               prs_mem_free(&rbuf);
-               return NT_STATUS_BUFFER_TOO_SMALL;
-       }
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct event_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_OK;
 
-       if(!check_bind_response(&hdr_ba, &cli->transfer_syntax)) {
-               DEBUG(2,("rpc_pipe_bind: check_bind_response failed.\n"));
-               prs_mem_free(&rbuf);
-               return NT_STATUS_BUFFER_TOO_SMALL;
+       ev = event_context_init(frame);
+       if (ev == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
        }
 
-       cli->max_xmit_frag = hdr_ba.bba.max_tsize;
-       cli->max_recv_frag = hdr_ba.bba.max_rsize;
-
-       /* For authenticated binds we may need to do 3 or 4 leg binds. */
-       switch(cli->auth->auth_type) {
-
-               case PIPE_AUTH_TYPE_NONE:
-               case PIPE_AUTH_TYPE_SCHANNEL:
-                       /* Bind complete. */
-                       break;
-
-               case PIPE_AUTH_TYPE_NTLMSSP:
-                       /* Need to send AUTH3 packet - no reply. */
-                       status = rpc_finish_auth3_bind(
-                               cli, &hdr, &rbuf, rpc_call_id,
-                               cli->auth->auth_type,
-                               cli->auth->auth_level);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               prs_mem_free(&rbuf);
-                               return status;
-                       }
-                       break;
-
-               case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
-                       /* Need to send alter context request and reply. */
-                       status = rpc_finish_spnego_ntlmssp_bind(
-                               cli, &hdr, &rbuf, rpc_call_id,
-                               &cli->abstract_syntax, &cli->transfer_syntax,
-                               cli->auth->auth_type, cli->auth->auth_level);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               prs_mem_free(&rbuf);
-                               return status;
-                       }
-                       break;
-
-               case PIPE_AUTH_TYPE_KRB5:
-                       /* */
-
-               default:
-                       DEBUG(0,("cli_finish_bind_auth: unknown auth type "
-                                "%u\n", (unsigned int)cli->auth->auth_type));
-                       prs_mem_free(&rbuf);
-                       return NT_STATUS_INVALID_INFO_CLASS;
+       req = rpc_pipe_bind_send(frame, ev, cli, auth);
+       if (req == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
        }
 
-       /* For NTLMSSP ensure the server gave us the auth_level we wanted. */
-       if (cli->auth->auth_type == PIPE_AUTH_TYPE_NTLMSSP
-           || cli->auth->auth_type == PIPE_AUTH_TYPE_SPNEGO_NTLMSSP) {
-               if (cli->auth->auth_level == PIPE_AUTH_LEVEL_INTEGRITY) {
-                       if (!(cli->auth->a_u.ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
-                               DEBUG(0,("cli_finish_bind_auth: requested NTLMSSSP signing and server refused.\n"));
-                               prs_mem_free(&rbuf);
-                               return NT_STATUS_INVALID_PARAMETER;
-                       }
-               }
-               if (cli->auth->auth_level == PIPE_AUTH_LEVEL_INTEGRITY) {
-                       if (!(cli->auth->a_u.ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
-                               DEBUG(0,("cli_finish_bind_auth: requested NTLMSSSP sealing and server refused.\n"));
-                               prs_mem_free(&rbuf);
-                               return NT_STATUS_INVALID_PARAMETER;
-                       }
-               }
+       if (!tevent_req_poll(req, ev)) {
+               status = map_nt_error_from_unix(errno);
+               goto fail;
        }
 
-       prs_mem_free(&rbuf);
-       return NT_STATUS_OK;
+       status = rpc_pipe_bind_recv(req);
+ fail:
+       TALLOC_FREE(frame);
+       return status;
 }
 
-unsigned int rpccli_set_timeout(struct rpc_pipe_client *cli,
+unsigned int rpccli_set_timeout(struct rpc_pipe_client *rpc_cli,
                                unsigned int timeout)
 {
-       return cli_set_timeout(cli->trans.np.cli, timeout);
-}
-
-bool rpccli_get_pwd_hash(struct rpc_pipe_client *cli, uint8_t nt_hash[16])
-{
-       if ((cli->auth->auth_type == PIPE_AUTH_TYPE_NTLMSSP)
-           || (cli->auth->auth_type == PIPE_AUTH_TYPE_SPNEGO_NTLMSSP)) {
-               memcpy(nt_hash, cli->auth->a_u.ntlmssp_state->nt_hash, 16);
-               return true;
-       }
-
-       if (cli->transport_type == NCACN_NP) {
-               E_md4hash(cli->trans.np.cli->pwd.password, nt_hash);
-               return true;
-       }
-
-       return false;
-}
+       struct cli_state *cli = rpc_pipe_np_smb_conn(rpc_cli);
 
-struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p)
-{
-       if (p->transport_type == NCACN_NP) {
-               return p->trans.np.cli;
+       if (cli == NULL) {
+               return 0;
        }
-       return NULL;
+       return cli_set_timeout(cli, timeout);
 }
 
-static int rpc_pipe_destructor(struct rpc_pipe_client *p)
+bool rpccli_get_pwd_hash(struct rpc_pipe_client *rpc_cli, uint8_t nt_hash[16])
 {
-       if (p->transport_type == NCACN_NP) {
-               bool ret;
-               ret = cli_close(p->trans.np.cli, p->trans.np.fnum);
-               if (!ret) {
-                       DEBUG(1, ("rpc_pipe_destructor: cli_close failed on "
-                                 "pipe %s. Error was %s\n",
-                                 rpccli_pipe_txt(debug_ctx(), p),
-                                 cli_errstr(p->trans.np.cli)));
-               }
+       struct cli_state *cli;
 
-               DEBUG(10, ("rpc_pipe_destructor: closed %s\n",
-                          rpccli_pipe_txt(debug_ctx(), p)));
-
-               DLIST_REMOVE(p->trans.np.cli->pipe_list, p);
-               return ret ? -1 : 0;
+       if ((rpc_cli->auth->auth_type == PIPE_AUTH_TYPE_NTLMSSP)
+           || (rpc_cli->auth->auth_type == PIPE_AUTH_TYPE_SPNEGO_NTLMSSP)) {
+               memcpy(nt_hash, rpc_cli->auth->a_u.ntlmssp_state->nt_hash, 16);
+               return true;
        }
 
-       return -1;
+       cli = rpc_pipe_np_smb_conn(rpc_cli);
+       if (cli == NULL) {
+               return false;
+       }
+       E_md4hash(cli->password ? cli->password : "", nt_hash);
+       return true;
 }
 
 NTSTATUS rpccli_anon_bind_data(TALLOC_CTX *mem_ctx,
@@ -2919,12 +3155,6 @@ NTSTATUS rpccli_kerberos_bind_data(TALLOC_CTX *mem_ctx,
 #endif
 }
 
-static int rpc_pipe_sock_destructor(struct rpc_pipe_client *p)
-{
-       close(p->trans.sock.fd);
-       return 0;
-}
-
 /**
  * Create an rpc pipe client struct, connecting to a tcp port.
  */
@@ -2936,16 +3166,18 @@ static NTSTATUS rpc_pipe_open_tcp_port(TALLOC_CTX *mem_ctx, const char *host,
        struct rpc_pipe_client *result;
        struct sockaddr_storage addr;
        NTSTATUS status;
+       int fd;
 
        result = TALLOC_ZERO_P(mem_ctx, struct rpc_pipe_client);
        if (result == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       result->transport_type = NCACN_IP_TCP;
-
        result->abstract_syntax = *abstract_syntax;
        result->transfer_syntax = ndr_transfer_syntax;
+       result->dispatch = cli_do_rpc_ndr;
+       result->dispatch_send = cli_do_rpc_ndr_send;
+       result->dispatch_recv = cli_do_rpc_ndr_recv;
 
        result->desthost = talloc_strdup(result, host);
        result->srv_name_slash = talloc_asprintf_strupper_m(
@@ -2958,17 +3190,22 @@ static NTSTATUS rpc_pipe_open_tcp_port(TALLOC_CTX *mem_ctx, const char *host,
        result->max_xmit_frag = RPC_MAX_PDU_FRAG_LEN;
        result->max_recv_frag = RPC_MAX_PDU_FRAG_LEN;
 
-       if (!resolve_name(host, &addr, 0)) {
+       if (!resolve_name(host, &addr, 0, false)) {
                status = NT_STATUS_NOT_FOUND;
                goto fail;
        }
 
-       status = open_socket_out(&addr, port, 60, &result->trans.sock.fd);
+       status = open_socket_out(&addr, port, 60, &fd);
        if (!NT_STATUS_IS_OK(status)) {
                goto fail;
        }
+       set_socket_options(fd, lp_socket_options());
 
-       talloc_set_destructor(result, rpc_pipe_sock_destructor);
+       status = rpc_transport_sock_init(result, fd, &result->transport);
+       if (!NT_STATUS_IS_OK(status)) {
+               close(fd);
+               goto fail;
+       }
 
        *presult = result;
        return NT_STATUS_OK;
@@ -3143,18 +3380,20 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
        struct rpc_pipe_client *result;
        struct sockaddr_un addr;
        NTSTATUS status;
+       int fd;
 
        result = talloc_zero(mem_ctx, struct rpc_pipe_client);
        if (result == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       result->transport_type = NCACN_UNIX_STREAM;
-
        result->abstract_syntax = *abstract_syntax;
        result->transfer_syntax = ndr_transfer_syntax;
+       result->dispatch = cli_do_rpc_ndr;
+       result->dispatch_send = cli_do_rpc_ndr_send;
+       result->dispatch_recv = cli_do_rpc_ndr_recv;
 
-       result->desthost = talloc_get_myname(result);
+       result->desthost = get_myname(result);
        result->srv_name_slash = talloc_asprintf_strupper_m(
                result, "\\\\%s", result->desthost);
        if ((result->desthost == NULL) || (result->srv_name_slash == NULL)) {
@@ -3165,26 +3404,29 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
        result->max_xmit_frag = RPC_MAX_PDU_FRAG_LEN;
        result->max_recv_frag = RPC_MAX_PDU_FRAG_LEN;
 
-       result->trans.sock.fd = socket(AF_UNIX, SOCK_STREAM, 0);
-       if (result->trans.sock.fd == -1) {
+       fd = socket(AF_UNIX, SOCK_STREAM, 0);
+       if (fd == -1) {
                status = map_nt_error_from_unix(errno);
                goto fail;
        }
 
-       talloc_set_destructor(result, rpc_pipe_sock_destructor);
-
        ZERO_STRUCT(addr);
        addr.sun_family = AF_UNIX;
        strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path));
 
-       if (sys_connect(result->trans.sock.fd,
-                       (struct sockaddr *)&addr) == -1) {
+       if (sys_connect(fd, (struct sockaddr *)(void *)&addr) == -1) {
                DEBUG(0, ("connect(%s) failed: %s\n", socket_path,
                          strerror(errno)));
-               close(result->trans.sock.fd);
+               close(fd);
                return map_nt_error_from_unix(errno);
        }
 
+       status = rpc_transport_sock_init(result, fd, &result->transport);
+       if (!NT_STATUS_IS_OK(status)) {
+               close(fd);
+               goto fail;
+       }
+
        *presult = result;
        return NT_STATUS_OK;
 
@@ -3193,6 +3435,16 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
        return status;
 }
 
+static int rpc_pipe_client_np_destructor(struct rpc_pipe_client *p)
+{
+       struct cli_state *cli;
+
+       cli = rpc_pipe_np_smb_conn(p);
+       if (cli != NULL) {
+               DLIST_REMOVE(cli->pipe_list, p);
+       }
+       return 0;
+}
 
 /****************************************************************************
  Open a named pipe over SMB to a remote server.
@@ -3212,7 +3464,7 @@ static NTSTATUS rpc_pipe_open_np(struct cli_state *cli,
                                 struct rpc_pipe_client **presult)
 {
        struct rpc_pipe_client *result;
-       int fnum;
+       NTSTATUS status;
 
        /* sanity check to protect against crashes */
 
@@ -3225,19 +3477,11 @@ static NTSTATUS rpc_pipe_open_np(struct cli_state *cli,
                return NT_STATUS_NO_MEMORY;
        }
 
-       result->transport_type = NCACN_NP;
-
-       result->trans.np.pipe_name = cli_get_pipe_name_from_iface(
-               result, cli, abstract_syntax);
-       if (result->trans.np.pipe_name == NULL) {
-               DEBUG(1, ("Could not find pipe for interface\n"));
-               TALLOC_FREE(result);
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       result->trans.np.cli = cli;
        result->abstract_syntax = *abstract_syntax;
        result->transfer_syntax = ndr_transfer_syntax;
+       result->dispatch = cli_do_rpc_ndr;
+       result->dispatch_send = cli_do_rpc_ndr_send;
+       result->dispatch_recv = cli_do_rpc_ndr_recv;
        result->desthost = talloc_strdup(result, cli->desthost);
        result->srv_name_slash = talloc_asprintf_strupper_m(
                result, "\\\\%s", result->desthost);
@@ -3250,21 +3494,72 @@ static NTSTATUS rpc_pipe_open_np(struct cli_state *cli,
                return NT_STATUS_NO_MEMORY;
        }
 
-       fnum = cli_nt_create(cli, result->trans.np.pipe_name,
-                            DESIRED_ACCESS_PIPE);
-       if (fnum == -1) {
-               DEBUG(3,("rpc_pipe_open_np: cli_nt_create failed on pipe %s "
-                        "to machine %s.  Error was %s\n",
-                        result->trans.np.pipe_name, cli->desthost,
-                        cli_errstr(cli)));
+       status = rpc_transport_np_init(result, cli, abstract_syntax,
+                                      &result->transport);
+       if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(result);
-               return cli_get_nt_error(cli);
+               return status;
        }
 
-       result->trans.np.fnum = fnum;
-
        DLIST_ADD(cli->pipe_list, result);
-       talloc_set_destructor(result, rpc_pipe_destructor);
+       talloc_set_destructor(result, rpc_pipe_client_np_destructor);
+
+       *presult = result;
+       return NT_STATUS_OK;
+}
+
+NTSTATUS rpc_pipe_open_local(TALLOC_CTX *mem_ctx,
+                            struct rpc_cli_smbd_conn *conn,
+                            const struct ndr_syntax_id *syntax,
+                            struct rpc_pipe_client **presult)
+{
+       struct rpc_pipe_client *result;
+       struct cli_pipe_auth_data *auth;
+       NTSTATUS status;
+
+       result = talloc(mem_ctx, struct rpc_pipe_client);
+       if (result == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       result->abstract_syntax = *syntax;
+       result->transfer_syntax = ndr_transfer_syntax;
+       result->dispatch = cli_do_rpc_ndr;
+       result->dispatch_send = cli_do_rpc_ndr_send;
+       result->dispatch_recv = cli_do_rpc_ndr_recv;
+       result->max_xmit_frag = RPC_MAX_PDU_FRAG_LEN;
+       result->max_recv_frag = RPC_MAX_PDU_FRAG_LEN;
+
+       result->desthost = talloc_strdup(result, global_myname());
+       result->srv_name_slash = talloc_asprintf_strupper_m(
+               result, "\\\\%s", global_myname());
+       if ((result->desthost == NULL) || (result->srv_name_slash == NULL)) {
+               TALLOC_FREE(result);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = rpc_transport_smbd_init(result, conn, syntax,
+                                        &result->transport);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("rpc_transport_smbd_init failed: %s\n",
+                         nt_errstr(status)));
+               TALLOC_FREE(result);
+               return status;
+       }
+
+       status = rpccli_anon_bind_data(result, &auth);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("rpccli_anon_bind_data failed: %s\n",
+                         nt_errstr(status)));
+               TALLOC_FREE(result);
+               return status;
+       }
+
+       status = rpc_pipe_bind(result, auth);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("rpc_pipe_bind failed: %s\n", nt_errstr(status)));
+               TALLOC_FREE(result);
+               return status;
+       }
 
        *presult = result;
        return NT_STATUS_OK;
@@ -3346,16 +3641,15 @@ NTSTATUS cli_rpc_pipe_open_noauth(struct cli_state *cli,
                }
                DEBUG(lvl, ("cli_rpc_pipe_open_noauth: rpc_pipe_bind for pipe "
                            "%s failed with error %s\n",
-                           cli_get_pipe_name_from_iface(debug_ctx(), cli,
-                                                        interface),
+                           get_pipe_name_from_iface(interface),
                            nt_errstr(status) ));
                TALLOC_FREE(result);
                return status;
        }
 
        DEBUG(10,("cli_rpc_pipe_open_noauth: opened pipe %s to machine "
-                 "%s and bound anonymously.\n", result->trans.np.pipe_name,
-                 cli->desthost ));
+                 "%s and bound anonymously.\n",
+                 get_pipe_name_from_iface(interface), cli->desthost));
 
        *presult = result;
        return NT_STATUS_OK;
@@ -3385,7 +3679,7 @@ static NTSTATUS cli_rpc_pipe_open_ntlmssp_internal(struct cli_state *cli,
 
        status = rpccli_ntlmssp_bind_data(
                result, auth_type, auth_level, domain, username,
-               cli->pwd.null_pwd ? NULL : password, &auth);
+               password, &auth);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("rpccli_ntlmssp_bind_data returned %s\n",
                          nt_errstr(status)));
@@ -3401,8 +3695,8 @@ static NTSTATUS cli_rpc_pipe_open_ntlmssp_internal(struct cli_state *cli,
 
        DEBUG(10,("cli_rpc_pipe_open_ntlmssp_internal: opened pipe %s to "
                "machine %s and bound NTLMSSP as user %s\\%s.\n",
-               result->trans.np.pipe_name, cli->desthost,
-               domain, username ));
+                 get_pipe_name_from_iface(interface), cli->desthost, domain,
+                 username ));
 
        *presult = result;
        return NT_STATUS_OK;
@@ -3544,13 +3838,15 @@ NTSTATUS get_schannel_session_key(struct cli_state *cli,
  External interface.
  Open a named pipe to an SMB server and bind using schannel (bind type 68)
  using session_key. sign and seal.
+
+ The *pdc will be stolen onto this new pipe
  ****************************************************************************/
 
 NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli,
                                             const struct ndr_syntax_id *interface,
                                             enum pipe_auth_level auth_level,
                                             const char *domain,
-                                            const struct dcinfo *pdc,
+                                            struct netlogon_creds_CredentialState **pdc,
                                             struct rpc_pipe_client **presult)
 {
        struct rpc_pipe_client *result;
@@ -3563,7 +3859,7 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli,
        }
 
        status = rpccli_schannel_bind_data(result, domain, auth_level,
-                                          pdc->sess_key, &auth);
+                                          (*pdc)->session_key, &auth);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("rpccli_schannel_bind_data returned %s\n",
                          nt_errstr(status)));
@@ -3582,19 +3878,19 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli,
 
        /*
         * The credentials on a new netlogon pipe are the ones we are passed
-        * in - copy them over.
+        * in - reference them in
         */
-       result->dc = (struct dcinfo *)talloc_memdup(result, pdc, sizeof(*pdc));
+       result->dc = talloc_move(result, pdc);
        if (result->dc == NULL) {
-               DEBUG(0, ("talloc failed\n"));
+               DEBUG(0, ("talloc reference failed\n"));
                TALLOC_FREE(result);
                return NT_STATUS_NO_MEMORY;
        }
 
        DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to machine %s "
-               "for domain %s "
-               "and bound using schannel.\n",
-               result->trans.np.pipe_name, cli->desthost, domain ));
+                 "for domain %s and bound using schannel.\n",
+                 get_pipe_name_from_iface(interface),
+                 cli->desthost, domain ));
 
        *presult = result;
        return NT_STATUS_OK;
@@ -3663,7 +3959,7 @@ NTSTATUS cli_rpc_pipe_open_ntlmssp_auth_schannel(struct cli_state *cli,
        }
 
        status = cli_rpc_pipe_open_schannel_with_key(
-               cli, interface, auth_level, domain, netlogon_pipe->dc,
+               cli, interface, auth_level, domain, &netlogon_pipe->dc,
                &result);
 
        /* Now we've bound using the session key we can close the netlog pipe. */
@@ -3701,7 +3997,7 @@ NTSTATUS cli_rpc_pipe_open_schannel(struct cli_state *cli,
        }
 
        status = cli_rpc_pipe_open_schannel_with_key(
-               cli, interface, auth_level, domain, netlogon_pipe->dc,
+               cli, interface, auth_level, domain, &netlogon_pipe->dc,
                &result);
 
        /* Now we've bound using the session key we can close the netlog pipe. */