r24780: More work allowing libutil to be used by external users.
[kai/samba.git] / source4 / librpc / rpc / dcerpc.c
index a29e7f7b6b9886b990139148d9e42ee82238cbbb..984cc20fbc7dd80f4c4be34540854732959856d2 100644 (file)
@@ -4,11 +4,11 @@
 
    Copyright (C) Tim Potter 2003
    Copyright (C) Andrew Tridgell 2003-2005
-   Copyright (C) Jelmer Vernooij 2004
+   Copyright (C) Jelmer Vernooij 2004-2005
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "dlinklist.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
-
-static struct dcerpc_interface_list *dcerpc_pipes = NULL;
-
-/*
-  register a dcerpc client interface
-*/
-NTSTATUS librpc_register_interface(const struct dcerpc_interface_table *interface)
+#include "lib/util/dlinklist.h"
+#include "lib/events/events.h"
+#include "librpc/rpc/dcerpc.h"
+#include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "libcli/composite/composite.h"
+#include "auth/gensec/gensec.h"
+
+NTSTATUS dcerpc_init(void)
 {
-       struct dcerpc_interface_list *l = talloc_p(talloc_autofree_context(),
-                                                  struct dcerpc_interface_list);
-               
-       if (idl_iface_by_name (interface->name) != NULL) {
-               DEBUG(0, ("Attempt to register interface %s twice\n", interface->name));
-               return NT_STATUS_OBJECT_NAME_COLLISION;
-       }
-       l->table = interface;
+       gensec_init();
 
-       DLIST_ADD(dcerpc_pipes, l);
-       
-       return NT_STATUS_OK;
+       return NT_STATUS_OK;
 }
 
-/*
-  return the list of registered dcerpc_pipes
-*/
-const struct dcerpc_interface_list *librpc_dcerpc_pipes(void)
-{
-       return dcerpc_pipes;
-}
+static void dcerpc_connection_dead(struct dcerpc_connection *conn, NTSTATUS status);
+static void dcerpc_ship_next_request(struct dcerpc_connection *c);
 
 /* destroy a dcerpc connection */
-static int dcerpc_connection_destructor(void *ptr)
+static int dcerpc_connection_destructor(struct dcerpc_connection *conn)
 {
-       struct dcerpc_connection *c = ptr;
-       if (c->transport.shutdown_pipe) {
-               c->transport.shutdown_pipe(c);
+       if (conn->dead) {
+               conn->free_skipped = True;
+               return -1;
        }
+       dcerpc_connection_dead(conn, NT_STATUS_LOCAL_DISCONNECT);
        return 0;
 }
 
 
-/* initialise a dcerpc connection. */
-struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx)
+/* initialise a dcerpc connection. 
+   the event context is optional
+*/
+static struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx, 
+                                                struct event_context *ev)
 {
        struct dcerpc_connection *c;
 
@@ -75,6 +64,20 @@ struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx)
                return NULL;
        }
 
+       if (ev == NULL) {
+               ev = event_context_init(c);
+               if (ev == NULL) {
+                       talloc_free(c);
+                       return NULL;
+               }
+       }
+
+       c->event_ctx = ev;
+       
+       if (!talloc_reference(c, ev)) {
+               talloc_free(c);
+               return NULL;
+       }
        c->call_id = 1;
        c->security_state.auth_info = NULL;
        c->security_state.session_key = dcerpc_generic_session_key;
@@ -91,16 +94,16 @@ struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx)
 }
 
 /* initialise a dcerpc pipe. */
-struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx)
+struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct event_context *ev)
 {
        struct dcerpc_pipe *p;
 
-       p = talloc_p(mem_ctx, struct dcerpc_pipe);
+       p = talloc(mem_ctx, struct dcerpc_pipe);
        if (!p) {
                return NULL;
        }
 
-       p->conn = dcerpc_connection_init(p);
+       p->conn = dcerpc_connection_init(p, ev);
        if (p->conn == NULL) {
                talloc_free(p);
                return NULL;
@@ -108,6 +111,8 @@ struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx)
 
        p->last_fault_code = 0;
        p->context_id = 0;
+       p->request_timeout = DCERPC_REQUEST_TIMEOUT;
+       p->binding = NULL;
 
        ZERO_STRUCT(p->syntax);
        ZERO_STRUCT(p->transfer_syntax);
@@ -128,12 +133,6 @@ static uint32_t next_call_id(struct dcerpc_connection *c)
        return c->call_id;
 }
 
-/* close down a dcerpc over SMB pipe */
-void dcerpc_pipe_close(struct dcerpc_pipe *p)
-{
-       talloc_free(p);
-}
-
 /* we need to be able to get/set the fragment length without doing a full
    decode */
 void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v)
@@ -186,11 +185,11 @@ static struct ndr_pull *ndr_pull_init_flags(struct dcerpc_connection *c,
 }
 
 /* 
-   parse a data blob into a dcerpc_packet structure. This handles both
+   parse a data blob into a ncacn_packet structure. This handles both
    input and output packets
 */
-static NTSTATUS dcerpc_pull(struct dcerpc_connection *c, DATA_BLOB *blob, TALLOC_CTX *mem_ctx, 
-                           struct dcerpc_packet *pkt)
+static NTSTATUS ncacn_pull(struct dcerpc_connection *c, DATA_BLOB *blob, TALLOC_CTX *mem_ctx, 
+                           struct ncacn_packet *pkt)
 {
        struct ndr_pull *ndr;
 
@@ -203,7 +202,7 @@ static NTSTATUS dcerpc_pull(struct dcerpc_connection *c, DATA_BLOB *blob, TALLOC
                ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
 
-       return ndr_pull_dcerpc_packet(ndr, NDR_SCALARS|NDR_BUFFERS, pkt);
+       return ndr_pull_ncacn_packet(ndr, NDR_SCALARS|NDR_BUFFERS, pkt);
 }
 
 /*
@@ -233,42 +232,17 @@ static NTSTATUS dcerpc_check_connect_verifier(DATA_BLOB *blob)
 }
 
 /* 
-   parse a possibly signed blob into a dcerpc request packet structure
+   parse the authentication information on a dcerpc response packet
 */
-static NTSTATUS dcerpc_pull_request_sign(struct dcerpc_connection *c
-                                        DATA_BLOB *blob, TALLOC_CTX *mem_ctx, 
-                                        struct dcerpc_packet *pkt)
+static NTSTATUS ncacn_pull_request_auth(struct dcerpc_connection *c, TALLOC_CTX *mem_ctx
+                                       DATA_BLOB *raw_packet,
+                                       struct ncacn_packet *pkt)
 {
        struct ndr_pull *ndr;
        NTSTATUS status;
        struct dcerpc_auth auth;
        DATA_BLOB auth_blob;
 
-       /* non-signed packets are simpler */
-       if (!c->security_state.auth_info || 
-           !c->security_state.generic_state) {
-               return dcerpc_pull(c, blob, mem_ctx, pkt);
-       }
-
-       ndr = ndr_pull_init_flags(c, blob, mem_ctx);
-       if (!ndr) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (! (CVAL(blob->data, DCERPC_DREP_OFFSET) & DCERPC_DREP_LE)) {
-               ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
-       }
-
-       /* pull the basic packet */
-       status = ndr_pull_dcerpc_packet(ndr, NDR_SCALARS|NDR_BUFFERS, pkt);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-
-       if (pkt->ptype != DCERPC_PKT_RESPONSE) {
-               return status;
-       }
-
        if (pkt->auth_length == 0 &&
            c->security_state.auth_info->auth_level == DCERPC_AUTH_LEVEL_CONNECT) {
                return NT_STATUS_OK;
@@ -292,7 +266,7 @@ static NTSTATUS dcerpc_pull_request_sign(struct dcerpc_connection *c,
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (! (CVAL(blob->data, DCERPC_DREP_OFFSET) & DCERPC_DREP_LE)) {
+       if (!(pkt->drep[0] & DCERPC_DREP_LE)) {
                ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
 
@@ -301,19 +275,18 @@ static NTSTATUS dcerpc_pull_request_sign(struct dcerpc_connection *c,
                return status;
        }
        
-       
        /* check signature or unseal the packet */
        switch (c->security_state.auth_info->auth_level) {
        case DCERPC_AUTH_LEVEL_PRIVACY:
                status = gensec_unseal_packet(c->security_state.generic_state, 
                                              mem_ctx, 
-                                             blob->data + DCERPC_REQUEST_LENGTH,
+                                             raw_packet->data + DCERPC_REQUEST_LENGTH,
                                              pkt->u.response.stub_and_verifier.length, 
-                                             blob->data,
-                                             blob->length - auth.credentials.length,
+                                             raw_packet->data,
+                                             raw_packet->length - auth.credentials.length,
                                              &auth.credentials);
                memcpy(pkt->u.response.stub_and_verifier.data,
-                      blob->data + DCERPC_REQUEST_LENGTH,
+                      raw_packet->data + DCERPC_REQUEST_LENGTH,
                       pkt->u.response.stub_and_verifier.length);
                break;
                
@@ -322,8 +295,8 @@ static NTSTATUS dcerpc_pull_request_sign(struct dcerpc_connection *c,
                                             mem_ctx, 
                                             pkt->u.response.stub_and_verifier.data, 
                                             pkt->u.response.stub_and_verifier.length, 
-                                            blob->data,
-                                            blob->length - auth.credentials.length,
+                                            raw_packet->data,
+                                            raw_packet->length - auth.credentials.length,
                                             &auth.credentials);
                break;
 
@@ -352,18 +325,19 @@ static NTSTATUS dcerpc_pull_request_sign(struct dcerpc_connection *c,
 /* 
    push a dcerpc request packet into a blob, possibly signing it.
 */
-static NTSTATUS dcerpc_push_request_sign(struct dcerpc_connection *c, 
+static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c, 
                                         DATA_BLOB *blob, TALLOC_CTX *mem_ctx, 
-                                        struct dcerpc_packet *pkt)
+                                        struct ncacn_packet *pkt)
 {
        NTSTATUS status;
        struct ndr_push *ndr;
        DATA_BLOB creds2;
+       size_t payload_length;
 
        /* non-signed packets are simpler */
        if (!c->security_state.auth_info || 
            !c->security_state.generic_state) {
-               return dcerpc_push_auth(blob, mem_ctx, pkt, c->security_state.auth_info);
+               return ncacn_push_auth(blob, mem_ctx, pkt, c->security_state.auth_info);
        }
 
        ndr = ndr_push_init_ctx(mem_ctx);
@@ -375,11 +349,11 @@ static NTSTATUS dcerpc_push_request_sign(struct dcerpc_connection *c,
                ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
 
-       if (pkt->pfc_flags & DCERPC_PFC_FLAG_ORPC) {
+       if (pkt->pfc_flags & DCERPC_PFC_FLAG_OBJECT_UUID) {
                ndr->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
        }
 
-       status = ndr_push_dcerpc_packet(ndr, NDR_SCALARS|NDR_BUFFERS, pkt);
+       status = ndr_push_ncacn_packet(ndr, NDR_SCALARS|NDR_BUFFERS, pkt);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -390,12 +364,19 @@ static NTSTATUS dcerpc_push_request_sign(struct dcerpc_connection *c,
                (16 - (pkt->u.request.stub_and_verifier.length & 15)) & 15;
        ndr_push_zero(ndr, c->security_state.auth_info->auth_pad_length);
 
+       payload_length = pkt->u.request.stub_and_verifier.length + 
+               c->security_state.auth_info->auth_pad_length;
+
        /* sign or seal the packet */
        switch (c->security_state.auth_info->auth_level) {
        case DCERPC_AUTH_LEVEL_PRIVACY:
        case DCERPC_AUTH_LEVEL_INTEGRITY:
+               /* We hope this length is accruate.  If must be if the
+                * GENSEC mech does AEAD signing of the packet
+                * headers */
                c->security_state.auth_info->credentials
-                       = data_blob_talloc(mem_ctx, NULL, gensec_sig_size(c->security_state.generic_state));
+                       = data_blob_talloc(mem_ctx, NULL, gensec_sig_size(c->security_state.generic_state, 
+                                                                         payload_length));
                data_blob_clear(&c->security_state.auth_info->credentials);
                break;
 
@@ -429,6 +410,8 @@ static NTSTATUS dcerpc_push_request_sign(struct dcerpc_connection *c,
           in these earlier as we don't know the signature length (it
           could be variable length) */
        dcerpc_set_frag_length(blob, blob->length);
+       /* We hope this value is accruate.  If must be if the GENSEC
+        * mech does AEAD signing of the packet headers */
        dcerpc_set_auth_length(blob, c->security_state.auth_info->credentials.length);
 
        /* sign or seal the packet */
@@ -437,8 +420,7 @@ static NTSTATUS dcerpc_push_request_sign(struct dcerpc_connection *c,
                status = gensec_seal_packet(c->security_state.generic_state, 
                                            mem_ctx, 
                                            blob->data + DCERPC_REQUEST_LENGTH, 
-                                           pkt->u.request.stub_and_verifier.length + 
-                                           c->security_state.auth_info->auth_pad_length,
+                                           payload_length,
                                            blob->data,
                                            blob->length - 
                                            c->security_state.auth_info->credentials.length,
@@ -446,15 +428,26 @@ static NTSTATUS dcerpc_push_request_sign(struct dcerpc_connection *c,
                if (!NT_STATUS_IS_OK(status)) {
                        return status;
                }
-               memcpy(blob->data + blob->length - creds2.length, creds2.data, creds2.length);
+               blob->length -= c->security_state.auth_info->credentials.length;
+               if (!data_blob_append(mem_ctx, blob,
+                                         creds2.data, creds2.length)) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               dcerpc_set_auth_length(blob, creds2.length);
+               if (c->security_state.auth_info->credentials.length == 0) {
+                       /* this is needed for krb5 only, to correct the total packet
+                          length */
+                       dcerpc_set_frag_length(blob, 
+                                              dcerpc_get_frag_length(blob)
+                                              +creds2.length);
+               }
                break;
 
        case DCERPC_AUTH_LEVEL_INTEGRITY:
                status = gensec_sign_packet(c->security_state.generic_state, 
                                            mem_ctx, 
                                            blob->data + DCERPC_REQUEST_LENGTH, 
-                                           pkt->u.request.stub_and_verifier.length + 
-                                           c->security_state.auth_info->auth_pad_length,
+                                           payload_length, 
                                            blob->data,
                                            blob->length - 
                                            c->security_state.auth_info->credentials.length,
@@ -462,7 +455,19 @@ static NTSTATUS dcerpc_push_request_sign(struct dcerpc_connection *c,
                if (!NT_STATUS_IS_OK(status)) {
                        return status;
                }
-               memcpy(blob->data + blob->length - creds2.length, creds2.data, creds2.length);
+               blob->length -= c->security_state.auth_info->credentials.length;
+               if (!data_blob_append(mem_ctx, blob,
+                                         creds2.data, creds2.length)) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               dcerpc_set_auth_length(blob, creds2.length);
+               if (c->security_state.auth_info->credentials.length == 0) {
+                       /* this is needed for krb5 only, to correct the total packet
+                          length */
+                       dcerpc_set_frag_length(blob, 
+                                              dcerpc_get_frag_length(blob)
+                                              +creds2.length);
+               }
                break;
 
        case DCERPC_AUTH_LEVEL_CONNECT:
@@ -486,7 +491,7 @@ static NTSTATUS dcerpc_push_request_sign(struct dcerpc_connection *c,
 /* 
    fill in the fixed values in a dcerpc header 
 */
-static void init_dcerpc_hdr(struct dcerpc_connection *c, struct dcerpc_packet *pkt)
+static void init_ncacn_hdr(struct dcerpc_connection *c, struct ncacn_packet *pkt)
 {
        pkt->rpc_vers = 5;
        pkt->rpc_vers_minor = 0;
@@ -501,100 +506,222 @@ static void init_dcerpc_hdr(struct dcerpc_connection *c, struct dcerpc_packet *p
 }
 
 /*
-  hold the state of pending full requests
+  map a bind nak reason to a NTSTATUS
 */
-struct full_request_state {
-       DATA_BLOB *reply_blob;
-       NTSTATUS status;
-};
+static NTSTATUS dcerpc_map_reason(uint16_t reason)
+{
+       switch (reason) {
+       case DCERPC_BIND_REASON_ASYNTAX:
+               return NT_STATUS_RPC_UNSUPPORTED_NAME_SYNTAX;
+       case DCERPC_BIND_REASON_INVALID_AUTH_TYPE:
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+       return NT_STATUS_UNSUCCESSFUL;
+}
+
+/*
+  a bind or alter context has failed
+*/
+static void dcerpc_composite_fail(struct rpc_request *req)
+{
+       struct composite_context *c = talloc_get_type(req->async.private_data, 
+                                                     struct composite_context);
+       composite_error(c, req->status);
+}
 
 /*
-  receive a reply to a full request
+  remove requests from the pending or queued queues
  */
-static void full_request_recv(struct dcerpc_connection *c, DATA_BLOB *blob, 
-                             NTSTATUS status)
+static int dcerpc_req_dequeue(struct rpc_request *req)
+{
+       switch (req->state) {
+       case RPC_REQUEST_QUEUED:
+               DLIST_REMOVE(req->p->conn->request_queue, req);
+               break;
+       case RPC_REQUEST_PENDING:
+               DLIST_REMOVE(req->p->conn->pending, req);
+               break;
+       case RPC_REQUEST_DONE:
+               break;
+       }
+       return 0;
+}
+
+
+/*
+  mark the dcerpc connection dead. All outstanding requests get an error
+*/
+static void dcerpc_connection_dead(struct dcerpc_connection *conn, NTSTATUS status)
 {
-       struct full_request_state *state = c->full_request_private;
+       if (conn->dead) return;
+
+       conn->dead = true;
 
+       if (conn->transport.shutdown_pipe) {
+               conn->transport.shutdown_pipe(conn, status);
+       }
+
+       /* all pending requests get the error */
+       while (conn->pending) {
+               struct rpc_request *req = conn->pending;
+               dcerpc_req_dequeue(req);
+               req->state = RPC_REQUEST_DONE;
+               req->status = status;
+               if (req->async.callback) {
+                       req->async.callback(req);
+               }
+       }       
+
+       talloc_set_destructor(conn, NULL);
+       if (conn->free_skipped) {
+               talloc_free(conn);
+       }
+}
+
+/*
+  forward declarations of the recv_data handlers for the types of
+  packets we need to handle
+*/
+static void dcerpc_request_recv_data(struct dcerpc_connection *c, 
+                                    DATA_BLOB *raw_packet, struct ncacn_packet *pkt);
+
+/*
+  receive a dcerpc reply from the transport. Here we work out what
+  type of reply it is (normal request, bind or alter context) and
+  dispatch to the appropriate handler
+*/
+static void dcerpc_recv_data(struct dcerpc_connection *conn, DATA_BLOB *blob, NTSTATUS status)
+{
+       struct ncacn_packet pkt;
+
+       if (NT_STATUS_IS_OK(status) && blob->length == 0) {
+               status = NT_STATUS_UNEXPECTED_NETWORK_ERROR;
+       }
+
+       /* the transport may be telling us of a severe error, such as
+          a dropped socket */
        if (!NT_STATUS_IS_OK(status)) {
-               state->status = status;
+               data_blob_free(blob);
+               dcerpc_connection_dead(conn, status);
                return;
        }
-       state->reply_blob[0] = data_blob_talloc(state, blob->data, blob->length);
-       state->reply_blob = NULL;
+
+       /* parse the basic packet to work out what type of response this is */
+       status = ncacn_pull(conn, blob, blob->data, &pkt);
+       if (!NT_STATUS_IS_OK(status)) {
+               data_blob_free(blob);
+               dcerpc_connection_dead(conn, status);
+       }
+
+       dcerpc_request_recv_data(conn, blob, &pkt);
 }
 
+
 /*
-  perform a single pdu synchronous request - used for the bind code
-  this cannot be mixed with normal async requests
+  Receive a bind reply from the transport
 */
-static NTSTATUS full_request(struct dcerpc_connection *c, 
-                            TALLOC_CTX *mem_ctx,
-                            DATA_BLOB *request_blob,
-                            DATA_BLOB *reply_blob)
+static void dcerpc_bind_recv_handler(struct rpc_request *req, 
+                                    DATA_BLOB *raw_packet, struct ncacn_packet *pkt)
 {
-       struct full_request_state *state = talloc_p(mem_ctx, struct full_request_state);
-       NTSTATUS status;
+       struct composite_context *c;
+       struct dcerpc_connection *conn;
 
-       if (state == NULL) {
-               return NT_STATUS_NO_MEMORY;
+       c = talloc_get_type(req->async.private_data, struct composite_context);
+
+       if (pkt->ptype == DCERPC_PKT_BIND_NAK) {
+               DEBUG(2,("dcerpc: bind_nak reason %d\n",
+                        pkt->u.bind_nak.reject_reason));
+               composite_error(c, dcerpc_map_reason(pkt->u.bind_nak.
+                                                    reject_reason));
+               return;
        }
 
-       state->reply_blob = reply_blob;
-       state->status = NT_STATUS_OK;
+       if ((pkt->ptype != DCERPC_PKT_BIND_ACK) ||
+           (pkt->u.bind_ack.num_results == 0) ||
+           (pkt->u.bind_ack.ctx_list[0].result != 0)) {
+               composite_error(c, NT_STATUS_NET_WRITE_FAULT);
+               return;
+       }
 
-       c->transport.recv_data = full_request_recv;
-       c->full_request_private = state;
+       conn = req->p->conn;
 
-       status = c->transport.send_request(c, request_blob, True);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       conn->srv_max_xmit_frag = pkt->u.bind_ack.max_xmit_frag;
+       conn->srv_max_recv_frag = pkt->u.bind_ack.max_recv_frag;
 
-       while (NT_STATUS_IS_OK(state->status) && state->reply_blob) {
-               struct event_context *ctx = c->transport.event_context(c);
-               if (event_loop_once(ctx) != 0) {
-                       return NT_STATUS_CONNECTION_DISCONNECTED;
-               }
+       /* the bind_ack might contain a reply set of credentials */
+       if (conn->security_state.auth_info &&
+           pkt->u.bind_ack.auth_info.length) {
+               c->status = ndr_pull_struct_blob(
+                       &pkt->u.bind_ack.auth_info, conn,
+                       conn->security_state.auth_info,
+                       (ndr_pull_flags_fn_t)ndr_pull_dcerpc_auth);
+               if (!composite_is_ok(c)) return;
        }
 
-       return state->status;
+       req->p->assoc_group_id = pkt->u.bind_ack.assoc_group_id;
+
+       composite_done(c);
 }
 
+/*
+  handle timeouts of individual dcerpc requests
+*/
+static void dcerpc_timeout_handler(struct event_context *ev, struct timed_event *te, 
+                                  struct timeval t, void *private)
+{
+       struct rpc_request *req = talloc_get_type(private, struct rpc_request);
 
-/* 
-   perform a bind using the given syntax 
+       if (req->ignore_timeout) {
+               dcerpc_req_dequeue(req);
+               req->state = RPC_REQUEST_DONE;
+               req->status = NT_STATUS_IO_TIMEOUT;
+               if (req->async.callback) {
+                       req->async.callback(req);
+               }
+               return;
+       }
 
-   the auth_info structure is updated with the reply authentication info
-   on success
+       dcerpc_connection_dead(req->p->conn, NT_STATUS_IO_TIMEOUT);
+}
+
+/*
+  send a async dcerpc bind request
 */
-NTSTATUS dcerpc_bind(struct dcerpc_pipe *p, 
-                    TALLOC_CTX *mem_ctx,
-                    const struct dcerpc_syntax_id *syntax,
-                    const struct dcerpc_syntax_id *transfer_syntax)
+struct composite_context *dcerpc_bind_send(struct dcerpc_pipe *p,
+                                          TALLOC_CTX *mem_ctx,
+                                          const struct ndr_syntax_id *syntax,
+                                          const struct ndr_syntax_id *transfer_syntax)
 {
-       struct dcerpc_packet pkt;
-       NTSTATUS status;
+       struct composite_context *c;
+       struct ncacn_packet pkt;
        DATA_BLOB blob;
+       struct rpc_request *req;
+
+       c = composite_create(mem_ctx,p->conn->event_ctx);
+       if (c == NULL) return NULL;
+
+       c->private_data = p;
 
        p->syntax = *syntax;
        p->transfer_syntax = *transfer_syntax;
 
-       init_dcerpc_hdr(p->conn, &pkt);
+       init_ncacn_hdr(p->conn, &pkt);
 
        pkt.ptype = DCERPC_PKT_BIND;
        pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
        pkt.call_id = p->conn->call_id;
        pkt.auth_length = 0;
 
+       if (p->binding->flags & DCERPC_CONCURRENT_MULTIPLEX) {
+               pkt.pfc_flags |= DCERPC_PFC_FLAG_CONC_MPX;
+       }
+
        pkt.u.bind.max_xmit_frag = 5840;
        pkt.u.bind.max_recv_frag = 5840;
-       pkt.u.bind.assoc_group_id = 0;
+       pkt.u.bind.assoc_group_id = p->binding->assoc_group_id;
        pkt.u.bind.num_contexts = 1;
        pkt.u.bind.ctx_list = talloc_array(mem_ctx, struct dcerpc_ctx_list, 1);
-       if (!pkt.u.bind.ctx_list) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       if (composite_nomem(pkt.u.bind.ctx_list, c)) return c;
        pkt.u.bind.ctx_list[0].context_id = p->context_id;
        pkt.u.bind.ctx_list[0].num_transfer_syntaxes = 1;
        pkt.u.bind.ctx_list[0].abstract_syntax = p->syntax;
@@ -602,50 +729,48 @@ NTSTATUS dcerpc_bind(struct dcerpc_pipe *p,
        pkt.u.bind.auth_info = data_blob(NULL, 0);
 
        /* construct the NDR form of the packet */
-       status = dcerpc_push_auth(&blob, mem_ctx, &pkt, p->conn->security_state.auth_info);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       c->status = ncacn_push_auth(&blob, c, &pkt,
+                                   p->conn->security_state.auth_info);
+       if (!composite_is_ok(c)) return c;
 
-       /* send it on its way */
-       status = full_request(p->conn, mem_ctx, &blob, &blob);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       p->conn->transport.recv_data = dcerpc_recv_data;
 
-       /* unmarshall the NDR */
-       status = dcerpc_pull(p->conn, &blob, mem_ctx, &pkt);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       /*
+        * we allocate a dcerpc_request so we can be in the same
+        * request queue as normal requests
+        */
+       req = talloc_zero(c, struct rpc_request);
+       if (composite_nomem(req, c)) return c;
 
-       if (pkt.ptype == DCERPC_PKT_BIND_NAK) {
-               DEBUG(2,("dcerpc: bind_nak reason %d\n", pkt.u.bind_nak.reject_reason));
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       if ((pkt.ptype != DCERPC_PKT_BIND_ACK) ||
-           pkt.u.bind_ack.num_results == 0 ||
-           pkt.u.bind_ack.ctx_list[0].result != 0) {
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       req->state = RPC_REQUEST_PENDING;
+       req->call_id = pkt.call_id;
+       req->async.private_data = c;
+       req->async.callback = dcerpc_composite_fail;
+       req->p = p;
+       req->recv_handler = dcerpc_bind_recv_handler;
+       DLIST_ADD_END(p->conn->pending, req, struct rpc_request *);
+       talloc_set_destructor(req, dcerpc_req_dequeue);
 
-       if (pkt.ptype == DCERPC_PKT_BIND_ACK) {
-               p->conn->srv_max_xmit_frag = pkt.u.bind_ack.max_xmit_frag;
-               p->conn->srv_max_recv_frag = pkt.u.bind_ack.max_recv_frag;
-       }
+       c->status = p->conn->transport.send_request(p->conn, &blob,
+                                                   True);
+       if (!composite_is_ok(c)) return c;
 
-       /* the bind_ack might contain a reply set of credentials */
-       if (p->conn->security_state.auth_info && pkt.u.bind_ack.auth_info.length) {
-               status = ndr_pull_struct_blob(&pkt.u.bind_ack.auth_info,
-                                             mem_ctx,
-                                             p->conn->security_state.auth_info,
-                                             (ndr_pull_flags_fn_t)ndr_pull_dcerpc_auth);
-       }
+       event_add_timed(c->event_ctx, req,
+                       timeval_current_ofs(DCERPC_REQUEST_TIMEOUT, 0),
+                       dcerpc_timeout_handler, req);
 
-       return status;  
+       return c;
 }
 
+/*
+  recv side of async dcerpc bind request
+*/
+NTSTATUS dcerpc_bind_recv(struct composite_context *ctx)
+{
+       NTSTATUS result = composite_wait(ctx);
+       talloc_free(ctx);
+       return result;
+}
 
 /* 
    perform a continued bind (and auth3)
@@ -653,11 +778,11 @@ NTSTATUS dcerpc_bind(struct dcerpc_pipe *p,
 NTSTATUS dcerpc_auth3(struct dcerpc_connection *c, 
                      TALLOC_CTX *mem_ctx)
 {
-       struct dcerpc_packet pkt;
+       struct ncacn_packet pkt;
        NTSTATUS status;
        DATA_BLOB blob;
 
-       init_dcerpc_hdr(c, &pkt);
+       init_ncacn_hdr(c, &pkt);
 
        pkt.ptype = DCERPC_PKT_AUTH3;
        pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
@@ -667,7 +792,7 @@ NTSTATUS dcerpc_auth3(struct dcerpc_connection *c,
        pkt.u.auth3.auth_info = data_blob(NULL, 0);
 
        /* construct the NDR form of the packet */
-       status = dcerpc_push_auth(&blob, mem_ctx, &pkt, c->security_state.auth_info);
+       status = ncacn_push_auth(&blob, mem_ctx, &pkt, c->security_state.auth_info);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -682,109 +807,83 @@ NTSTATUS dcerpc_auth3(struct dcerpc_connection *c,
 }
 
 
-/* perform a dcerpc bind, using the uuid as the key */
-NTSTATUS dcerpc_bind_byuuid(struct dcerpc_pipe *p, 
-                           TALLOC_CTX *mem_ctx,
-                           const char *uuid, uint_t version)
-{
-       struct dcerpc_syntax_id syntax;
-       struct dcerpc_syntax_id transfer_syntax;
-       NTSTATUS status;
-
-       status = GUID_from_string(uuid, &syntax.uuid);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(2,("Invalid uuid string in dcerpc_bind_byuuid\n"));
-               return status;
-       }
-       syntax.if_version = version;
-
-       status = GUID_from_string(NDR_GUID, &transfer_syntax.uuid);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-       transfer_syntax.if_version = NDR_GUID_VERSION;
-
-       return dcerpc_bind(p, mem_ctx, &syntax, &transfer_syntax);
-}
-
 /*
   process a fragment received from the transport layer during a
   request
+
+  This function frees the data 
 */
 static void dcerpc_request_recv_data(struct dcerpc_connection *c, 
-                                    DATA_BLOB *data,
-                                    NTSTATUS status)
+                                    DATA_BLOB *raw_packet, struct ncacn_packet *pkt)
 {
-       struct dcerpc_packet pkt;
        struct rpc_request *req;
        uint_t length;
-       
-       if (!NT_STATUS_IS_OK(status)) {
-               /* all pending requests get the error */
-               while (c->pending) {
-                       req = c->pending;
-                       req->state = RPC_REQUEST_DONE;
-                       req->status = status;
-                       DLIST_REMOVE(c->pending, req);
-                       if (req->async.callback) {
-                               req->async.callback(req);
-                       }
-               }
-               return;
+       NTSTATUS status = NT_STATUS_OK;
+
+       /*
+         if this is an authenticated connection then parse and check
+         the auth info. We have to do this before finding the
+         matching packet, as the request structure might have been
+         removed due to a timeout, but if it has been we still need
+         to run the auth routines so that we don't get the sign/seal
+         info out of step with the server
+       */
+       if (c->security_state.auth_info && c->security_state.generic_state &&
+           pkt->ptype == DCERPC_PKT_RESPONSE) {
+               status = ncacn_pull_request_auth(c, raw_packet->data, raw_packet, pkt);
+       }
+
+       /* find the matching request */
+       for (req=c->pending;req;req=req->next) {
+               if (pkt->call_id == req->call_id) break;
        }
 
-       pkt.call_id = 0;
-
-       status = dcerpc_pull_request_sign(c, data, (TALLOC_CTX *)data->data, &pkt);
-
-       /* find the matching request. Notice we match before we check
-          the status.  this is ok as a pending call_id can never be
-          zero */
-       for (req=c->pending;req;req=req->next) {
-               if (pkt.call_id == req->call_id) break;
+#if 0
+       /* useful for testing certain vendors RPC servers */
+       if (req == NULL && c->pending && pkt->call_id == 0) {
+               DEBUG(0,("HACK FOR INCORRECT CALL ID\n"));
+               req = c->pending;
        }
+#endif
 
        if (req == NULL) {
-               DEBUG(2,("dcerpc_request: unmatched call_id %u in response packet\n", pkt.call_id));
+               DEBUG(2,("dcerpc_request: unmatched call_id %u in response packet\n", pkt->call_id));
+               data_blob_free(raw_packet);
                return;
        }
 
-       if (!NT_STATUS_IS_OK(status)) {
-               req->status = status;
+       talloc_steal(req, raw_packet->data);
+
+       if (req->recv_handler != NULL) {
+               dcerpc_req_dequeue(req);
                req->state = RPC_REQUEST_DONE;
-               DLIST_REMOVE(c->pending, req);
-               if (req->async.callback) {
-                       req->async.callback(req);
-               }
+               req->recv_handler(req, raw_packet, pkt);
                return;
        }
 
-       if (pkt.ptype == DCERPC_PKT_FAULT) {
-               DEBUG(5,("rpc fault: %s\n", dcerpc_errstr(c, pkt.u.fault.status)));
-               req->fault_code = pkt.u.fault.status;
+       if (pkt->ptype == DCERPC_PKT_FAULT) {
+               DEBUG(5,("rpc fault: %s\n", dcerpc_errstr(c, pkt->u.fault.status)));
+               req->fault_code = pkt->u.fault.status;
                req->status = NT_STATUS_NET_WRITE_FAULT;
-               req->state = RPC_REQUEST_DONE;
-               DLIST_REMOVE(c->pending, req);
-               if (req->async.callback) {
-                       req->async.callback(req);
-               }
-               return;
+               goto req_done;
        }
 
-       if (pkt.ptype != DCERPC_PKT_RESPONSE) {
+       if (pkt->ptype != DCERPC_PKT_RESPONSE) {
                DEBUG(2,("Unexpected packet type %d in dcerpc response\n",
-                        (int)pkt.ptype)); 
+                        (int)pkt->ptype)); 
                req->fault_code = DCERPC_FAULT_OTHER;
                req->status = NT_STATUS_NET_WRITE_FAULT;
-               req->state = RPC_REQUEST_DONE;
-               DLIST_REMOVE(c->pending, req);
-               if (req->async.callback) {
-                       req->async.callback(req);
-               }
-               return;
+               goto req_done;
+       }
+
+       /* now check the status from the auth routines, and if it failed then fail
+          this request accordingly */
+       if (!NT_STATUS_IS_OK(status)) {
+               req->status = status;
+               goto req_done;
        }
 
-       length = pkt.u.response.stub_and_verifier.length;
+       length = pkt->u.response.stub_and_verifier.length;
 
        if (length > 0) {
                req->payload.data = talloc_realloc(req, 
@@ -793,31 +892,34 @@ static void dcerpc_request_recv_data(struct dcerpc_connection *c,
                                                   req->payload.length + length);
                if (!req->payload.data) {
                        req->status = NT_STATUS_NO_MEMORY;
-                       req->state = RPC_REQUEST_DONE;
-                       DLIST_REMOVE(c->pending, req);
-                       if (req->async.callback) {
-                               req->async.callback(req);
-                       }
-                       return;
+                       goto req_done;
                }
                memcpy(req->payload.data+req->payload.length, 
-                      pkt.u.response.stub_and_verifier.data, length);
+                      pkt->u.response.stub_and_verifier.data, length);
                req->payload.length += length;
        }
 
-       if (!(pkt.pfc_flags & DCERPC_PFC_FLAG_LAST)) {
+       if (!(pkt->pfc_flags & DCERPC_PFC_FLAG_LAST)) {
                c->transport.send_read(c);
                return;
        }
 
+       if (!(pkt->drep[0] & DCERPC_DREP_LE)) {
+               req->flags |= DCERPC_PULL_BIGENDIAN;
+       } else {
+               req->flags &= ~DCERPC_PULL_BIGENDIAN;
+       }
+
+
+req_done:
        /* we've got the full payload */
        req->state = RPC_REQUEST_DONE;
        DLIST_REMOVE(c->pending, req);
 
-       if (!(pkt.drep[0] & DCERPC_DREP_LE)) {
-               req->flags |= DCERPC_PULL_BIGENDIAN;
-       } else {
-               req->flags &= ~DCERPC_PULL_BIGENDIAN;
+       if (c->request_queue != NULL) {
+               /* We have to look at shipping further requests before calling
+                * the async function, that one might close the pipe */
+               dcerpc_ship_next_request(c);
        }
 
        if (req->async.callback) {
@@ -825,35 +927,20 @@ static void dcerpc_request_recv_data(struct dcerpc_connection *c,
        }
 }
 
-
-/*
-  make sure requests are cleaned up 
- */
-static int dcerpc_req_destructor(void *ptr)
-{
-       struct rpc_request *req = ptr;
-       DLIST_REMOVE(req->p->conn->pending, req);
-       return 0;
-}
-
 /*
   perform the send side of a async dcerpc request
 */
-struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p, 
-                                       const struct GUID *object,
-                                       uint16_t opnum,
-                                       TALLOC_CTX *mem_ctx,
-                                       DATA_BLOB *stub_data)
+static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p, 
+                                              const struct GUID *object,
+                                              uint16_t opnum,
+                                              BOOL async,
+                                              DATA_BLOB *stub_data)
 {
        struct rpc_request *req;
-       struct dcerpc_packet pkt;
-       DATA_BLOB blob;
-       uint32_t remaining, chunk_size;
-       BOOL first_packet = True;
 
-       p->conn->transport.recv_data = dcerpc_request_recv_data;
+       p->conn->transport.recv_data = dcerpc_recv_data;
 
-       req = talloc_p(mem_ctx, struct rpc_request);
+       req = talloc(p, struct rpc_request);
        if (req == NULL) {
                return NULL;
        }
@@ -861,13 +948,78 @@ struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
        req->p = p;
        req->call_id = next_call_id(p->conn);
        req->status = NT_STATUS_OK;
-       req->state = RPC_REQUEST_PENDING;
+       req->state = RPC_REQUEST_QUEUED;
        req->payload = data_blob(NULL, 0);
        req->flags = 0;
        req->fault_code = 0;
+       req->async_call = async;
+       req->ignore_timeout = False;
        req->async.callback = NULL;
+       req->async.private_data = NULL;
+       req->recv_handler = NULL;
+
+       if (object != NULL) {
+               req->object = talloc_memdup(req, object, sizeof(*object));
+               if (req->object == NULL) {
+                       talloc_free(req);
+                       return NULL;
+               }
+       } else {
+               req->object = NULL;
+       }
+
+       req->opnum = opnum;
+       req->request_data.length = stub_data->length;
+       req->request_data.data = talloc_reference(req, stub_data->data);
+       if (req->request_data.length && req->request_data.data == NULL) {
+               return NULL;
+       }
+
+       DLIST_ADD_END(p->conn->request_queue, req, struct rpc_request *);
+       talloc_set_destructor(req, dcerpc_req_dequeue);
+
+       dcerpc_ship_next_request(p->conn);
+
+       if (p->request_timeout) {
+               event_add_timed(dcerpc_event_context(p), req, 
+                               timeval_current_ofs(p->request_timeout, 0), 
+                               dcerpc_timeout_handler, req);
+       }
+
+       return req;
+}
+
+/*
+  Send a request using the transport
+*/
+
+static void dcerpc_ship_next_request(struct dcerpc_connection *c)
+{
+       struct rpc_request *req;
+       struct dcerpc_pipe *p;
+       DATA_BLOB *stub_data;
+       struct ncacn_packet pkt;
+       DATA_BLOB blob;
+       uint32_t remaining, chunk_size;
+       BOOL first_packet = True;
 
-       init_dcerpc_hdr(p->conn, &pkt);
+       req = c->request_queue;
+       if (req == NULL) {
+               return;
+       }
+
+       p = req->p;
+       stub_data = &req->request_data;
+
+       if (!req->async_call && (c->pending != NULL)) {
+               return;
+       }
+
+       DLIST_REMOVE(c->request_queue, req);
+       DLIST_ADD(c->pending, req);
+       req->state = RPC_REQUEST_PENDING;
+
+       init_ncacn_hdr(p->conn, &pkt);
 
        remaining = stub_data->length;
 
@@ -881,16 +1033,14 @@ struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
        pkt.pfc_flags = 0;
        pkt.u.request.alloc_hint = remaining;
        pkt.u.request.context_id = p->context_id;
-       pkt.u.request.opnum = opnum;
+       pkt.u.request.opnum = req->opnum;
 
-       if (object) {
-               pkt.u.request.object.object = *object;
-               pkt.pfc_flags |= DCERPC_PFC_FLAG_ORPC;
-               chunk_size -= ndr_size_GUID(object,0);
+       if (req->object) {
+               pkt.u.request.object.object = *req->object;
+               pkt.pfc_flags |= DCERPC_PFC_FLAG_OBJECT_UUID;
+               chunk_size -= ndr_size_GUID(req->object,0);
        }
 
-       DLIST_ADD(p->conn->pending, req);
-
        /* we send a series of pdus without waiting for a reply */
        while (remaining > 0 || first_packet) {
                uint32_t chunk = MIN(chunk_size, remaining);
@@ -911,26 +1061,22 @@ struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
                        (stub_data->length - remaining);
                pkt.u.request.stub_and_verifier.length = chunk;
 
-               req->status = dcerpc_push_request_sign(p->conn, &blob, mem_ctx, &pkt);
+               req->status = ncacn_push_request_sign(p->conn, &blob, req, &pkt);
                if (!NT_STATUS_IS_OK(req->status)) {
                        req->state = RPC_REQUEST_DONE;
                        DLIST_REMOVE(p->conn->pending, req);
-                       return req;
+                       return;
                }
                
                req->status = p->conn->transport.send_request(p->conn, &blob, last_frag);
                if (!NT_STATUS_IS_OK(req->status)) {
                        req->state = RPC_REQUEST_DONE;
                        DLIST_REMOVE(p->conn->pending, req);
-                       return req;
+                       return;
                }               
 
                remaining -= chunk;
        }
-
-       talloc_set_destructor(req, dcerpc_req_destructor);
-
-       return req;
 }
 
 /*
@@ -939,7 +1085,7 @@ struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
 */
 struct event_context *dcerpc_event_context(struct dcerpc_pipe *p)
 {
-       return p->conn->transport.event_context(p->conn);
+       return p->conn->event_ctx;
 }
 
 
@@ -953,7 +1099,7 @@ NTSTATUS dcerpc_request_recv(struct rpc_request *req,
 {
        NTSTATUS status;
 
-       while (req->state == RPC_REQUEST_PENDING) {
+       while (req->state != RPC_REQUEST_DONE) {
                struct event_context *ctx = dcerpc_event_context(req->p);
                if (event_loop_once(ctx) != 0) {
                        return NT_STATUS_CONNECTION_DISCONNECTED;
@@ -977,13 +1123,14 @@ NTSTATUS dcerpc_request_recv(struct rpc_request *req,
 NTSTATUS dcerpc_request(struct dcerpc_pipe *p, 
                        struct GUID *object,
                        uint16_t opnum,
+                       BOOL async,
                        TALLOC_CTX *mem_ctx,
                        DATA_BLOB *stub_data_in,
                        DATA_BLOB *stub_data_out)
 {
        struct rpc_request *req;
 
-       req = dcerpc_request_send(p, object, opnum, mem_ctx, stub_data_in);
+       req = dcerpc_request_send(p, object, opnum, async, stub_data_in);
        if (req == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1002,8 +1149,8 @@ static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_connection *c,
                                       TALLOC_CTX *mem_ctx,
                                       DATA_BLOB blob,
                                       size_t struct_size,
-                                      NTSTATUS (*ndr_push)(struct ndr_push *, int, void *),
-                                      NTSTATUS (*ndr_pull)(struct ndr_pull *, int, void *))
+                                      ndr_push_flags_fn_t ndr_push,
+                                      ndr_pull_flags_fn_t ndr_pull)
 {
        void *st;
        struct ndr_pull *pull;
@@ -1020,6 +1167,7 @@ static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_connection *c,
        if (!pull) {
                return NT_STATUS_NO_MEMORY;
        }
+       pull->flags |= LIBNDR_FLAG_REF_ALLOC;
 
        status = ndr_pull(pull, NDR_IN, st);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1042,7 +1190,7 @@ static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_connection *c,
 
        blob2 = ndr_push_blob(push);
 
-       if (!data_blob_equal(&blob, &blob2)) {
+       if (data_blob_cmp(&blob, &blob2) != 0) {
                DEBUG(3,("original:\n"));
                dump_data(3, blob.data, blob.length);
                DEBUG(3,("secondary:\n"));
@@ -1063,17 +1211,20 @@ static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_connection *c,
   bug in either the pull or push side of our code
 */
 static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
-                                       TALLOC_CTX *mem_ctx,
+                                       struct ndr_pull *pull_in,
                                        void *struct_ptr,
                                        size_t struct_size,
-                                       NTSTATUS (*ndr_push)(struct ndr_push *, int, void *),
-                                       NTSTATUS (*ndr_pull)(struct ndr_pull *, int, void *))
+                                       ndr_push_flags_fn_t ndr_push,
+                                       ndr_pull_flags_fn_t ndr_pull,
+                                       ndr_print_function_t ndr_print)
 {
        void *st;
        struct ndr_pull *pull;
        struct ndr_push *push;
        NTSTATUS status;
        DATA_BLOB blob, blob2;
+       TALLOC_CTX *mem_ctx = pull_in;
+       char *s1, *s2;
 
        st = talloc_size(mem_ctx, struct_size);
        if (!st) {
@@ -1122,7 +1273,7 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
 
        blob2 = ndr_push_blob(push);
 
-       if (!data_blob_equal(&blob, &blob2)) {
+       if (data_blob_cmp(&blob, &blob2) != 0) {
                DEBUG(3,("original:\n"));
                dump_data(3, blob.data, blob.length);
                DEBUG(3,("secondary:\n"));
@@ -1132,6 +1283,24 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
                                      nt_errstr(status));
        }
 
+       /* this checks the printed forms of the two structures, which effectively
+          tests all of the value() attributes */
+       s1 = ndr_print_function_string(mem_ctx, ndr_print, "VALIDATE", 
+                                      NDR_OUT, struct_ptr);
+       s2 = ndr_print_function_string(mem_ctx, ndr_print, "VALIDATE", 
+                                      NDR_OUT, st);
+       if (strcmp(s1, s2) != 0) {
+#if 1
+               printf("VALIDATE ERROR:\nWIRE:\n%s\n GEN:\n%s\n", s1, s2);
+#else
+               /* this is sometimes useful */
+               printf("VALIDATE ERROR\n");
+               file_save("wire.dat", s1, strlen(s1));
+               file_save("gen.dat", s2, strlen(s2));
+               system("diff -u wire.dat gen.dat");
+#endif
+       }
+
        return NT_STATUS_OK;
 }
 
@@ -1141,12 +1310,12 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
  */
 struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
                                                const struct GUID *object,
-                                               const struct dcerpc_interface_table *table,
+                                               const struct ndr_interface_table *table,
                                                uint32_t opnum, 
                                                TALLOC_CTX *mem_ctx, 
                                                void *r)
 {
-       const struct dcerpc_interface_call *call;
+       const struct ndr_interface_call *call;
        struct ndr_push *push;
        NTSTATUS status;
        DATA_BLOB request;
@@ -1155,7 +1324,7 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
        call = &table->calls[opnum];
 
        /* setup for a ndr_push_* call */
-       push = ndr_push_init();
+       push = ndr_push_init_ctx(mem_ctx);
        if (!push) {
                return NULL;
        }
@@ -1169,7 +1338,7 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(2,("Unable to ndr_push structure in dcerpc_ndr_request_send - %s\n",
                         nt_errstr(status)));
-               ndr_push_free(push);
+               talloc_free(push);
                return NULL;
        }
 
@@ -1177,12 +1346,12 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
        request = ndr_push_blob(push);
 
        if (p->conn->flags & DCERPC_DEBUG_VALIDATE_IN) {
-               status = dcerpc_ndr_validate_in(p->conn, mem_ctx, request, call->struct_size, 
+               status = dcerpc_ndr_validate_in(p->conn, push, request, call->struct_size, 
                                                call->ndr_push, call->ndr_pull);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(2,("Validation failed in dcerpc_ndr_request_send - %s\n",
                                 nt_errstr(status)));
-                       ndr_push_free(push);
+                       talloc_free(push);
                        return NULL;
                }
        }
@@ -1191,7 +1360,8 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
        dump_data(10, request.data, request.length);
 
        /* make the actual dcerpc request */
-       req = dcerpc_request_send(p, object, opnum, mem_ctx, &request);
+       req = dcerpc_request_send(p, object, opnum, table->calls[opnum].async,
+                                 &request);
 
        if (req != NULL) {
                req->ndr.table = table;
@@ -1200,15 +1370,15 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
                req->ndr.mem_ctx = mem_ctx;
        }
 
-       ndr_push_free(push);
-       
+       talloc_free(push);
+
        return req;
 }
 
 /*
   receive the answer from a dcerpc_ndr_request_send()
 */
-NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
+_PUBLIC_ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
 {
        struct dcerpc_pipe *p = req->p;
        NTSTATUS status;
@@ -1218,27 +1388,35 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
        TALLOC_CTX *mem_ctx = req->ndr.mem_ctx;
        void *r = req->ndr.struct_ptr;
        uint32_t opnum = req->ndr.opnum;
-       const struct dcerpc_interface_table *table = req->ndr.table;
-       const struct dcerpc_interface_call *call = &table->calls[opnum];
+       const struct ndr_interface_table *table = req->ndr.table;
+       const struct ndr_interface_call *call = &table->calls[opnum];
 
        /* make sure the recv code doesn't free the request, as we
           need to grab the flags element before it is freed */
-       talloc_increase_ref_count(req);
+       if (talloc_reference(p, req) == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        status = dcerpc_request_recv(req, mem_ctx, &response);
        if (!NT_STATUS_IS_OK(status)) {
+               talloc_unlink(p, req);
                return status;
        }
 
        flags = req->flags;
-       talloc_free(req);
 
        /* prepare for ndr_pull_* */
        pull = ndr_pull_init_flags(p->conn, &response, mem_ctx);
        if (!pull) {
+               talloc_unlink(p, req);
                return NT_STATUS_NO_MEMORY;
        }
 
+       if (pull->data) {
+               pull->data = talloc_steal(pull, pull->data);
+       }
+       talloc_unlink(p, req);
+
        if (flags & DCERPC_PULL_BIGENDIAN) {
                pull->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
@@ -1255,8 +1433,9 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
        }
 
        if (p->conn->flags & DCERPC_DEBUG_VALIDATE_OUT) {
-               status = dcerpc_ndr_validate_out(p->conn, mem_ctx, r, call->struct_size, 
-                                                call->ndr_push, call->ndr_pull);
+               status = dcerpc_ndr_validate_out(p->conn, pull, r, call->struct_size, 
+                                                call->ndr_push, call->ndr_pull, 
+                                                call->ndr_print);
                if (!NT_STATUS_IS_OK(status)) {
                        dcerpc_log_packet(table, opnum, NDR_OUT, 
                                  &response);
@@ -1267,13 +1446,15 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
        if (pull->offset != pull->data_size) {
                DEBUG(0,("Warning! ignoring %d unread bytes in rpc packet!\n", 
                         pull->data_size - pull->offset));
-               /* we used return NT_STATUS_INFO_LENGTH_MISMATCH here,
+               /* we used to return NT_STATUS_INFO_LENGTH_MISMATCH here,
                   but it turns out that early versions of NT
                   (specifically NT3.1) add junk onto the end of rpc
                   packets, so if we want to interoperate at all with
                   those versions then we need to ignore this error */
        }
 
+       /* TODO: make pull context independent from the output mem_ctx and free the pull context */
+
        return NT_STATUS_OK;
 }
 
@@ -1286,7 +1467,7 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
 */
 NTSTATUS dcerpc_ndr_request(struct dcerpc_pipe *p,
                            const struct GUID *object,
-                           const struct dcerpc_interface_table *table,
+                           const struct ndr_interface_table *table,
                            uint32_t opnum, 
                            TALLOC_CTX *mem_ctx, 
                            void *r)
@@ -1317,7 +1498,7 @@ const char *dcerpc_server_name(struct dcerpc_pipe *p)
 /*
   get the dcerpc auth_level for a open connection
 */
-uint32 dcerpc_auth_level(struct dcerpc_connection *c) 
+uint32_t dcerpc_auth_level(struct dcerpc_connection *c) 
 {
        uint8_t auth_level;
 
@@ -1332,3 +1513,141 @@ uint32 dcerpc_auth_level(struct dcerpc_connection *c)
        }
        return auth_level;
 }
+
+/*
+  Receive an alter reply from the transport
+*/
+static void dcerpc_alter_recv_handler(struct rpc_request *req,
+                                     DATA_BLOB *raw_packet, struct ncacn_packet *pkt)
+{
+       struct composite_context *c;
+       struct dcerpc_pipe *recv_pipe;
+
+       c = talloc_get_type(req->async.private_data, struct composite_context);
+       recv_pipe = talloc_get_type(c->private_data, struct dcerpc_pipe);
+
+       if (pkt->ptype == DCERPC_PKT_ALTER_RESP &&
+           pkt->u.alter_resp.num_results == 1 &&
+           pkt->u.alter_resp.ctx_list[0].result != 0) {
+               DEBUG(2,("dcerpc: alter_resp failed - reason %d\n", 
+                        pkt->u.alter_resp.ctx_list[0].reason));
+               composite_error(c, dcerpc_map_reason(pkt->u.alter_resp.ctx_list[0].reason));
+               return;
+       }
+
+       if (pkt->ptype != DCERPC_PKT_ALTER_RESP ||
+           pkt->u.alter_resp.num_results == 0 ||
+           pkt->u.alter_resp.ctx_list[0].result != 0) {
+               composite_error(c, NT_STATUS_NET_WRITE_FAULT);
+               return;
+       }
+
+       /* the alter_resp might contain a reply set of credentials */
+       if (recv_pipe->conn->security_state.auth_info &&
+           pkt->u.alter_resp.auth_info.length) {
+               c->status = ndr_pull_struct_blob(
+                       &pkt->u.alter_resp.auth_info, recv_pipe,
+                       recv_pipe->conn->security_state.auth_info,
+                       (ndr_pull_flags_fn_t)ndr_pull_dcerpc_auth);
+               if (!composite_is_ok(c)) return;
+       }
+
+       composite_done(c);
+}
+
+/* 
+   send a dcerpc alter_context request
+*/
+struct composite_context *dcerpc_alter_context_send(struct dcerpc_pipe *p, 
+                                                   TALLOC_CTX *mem_ctx,
+                                                   const struct ndr_syntax_id *syntax,
+                                                   const struct ndr_syntax_id *transfer_syntax)
+{
+       struct composite_context *c;
+       struct ncacn_packet pkt;
+       DATA_BLOB blob;
+       struct rpc_request *req;
+
+       c = composite_create(mem_ctx, p->conn->event_ctx);
+       if (c == NULL) return NULL;
+
+       c->private_data = p;
+
+       p->syntax = *syntax;
+       p->transfer_syntax = *transfer_syntax;
+
+       init_ncacn_hdr(p->conn, &pkt);
+
+       pkt.ptype = DCERPC_PKT_ALTER;
+       pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
+       pkt.call_id = p->conn->call_id;
+       pkt.auth_length = 0;
+
+       if (p->binding->flags & DCERPC_CONCURRENT_MULTIPLEX) {
+               pkt.pfc_flags |= DCERPC_PFC_FLAG_CONC_MPX;
+       }
+
+       pkt.u.alter.max_xmit_frag = 5840;
+       pkt.u.alter.max_recv_frag = 5840;
+       pkt.u.alter.assoc_group_id = p->binding->assoc_group_id;
+       pkt.u.alter.num_contexts = 1;
+       pkt.u.alter.ctx_list = talloc_array(c, struct dcerpc_ctx_list, 1);
+       if (composite_nomem(pkt.u.alter.ctx_list, c)) return c;
+       pkt.u.alter.ctx_list[0].context_id = p->context_id;
+       pkt.u.alter.ctx_list[0].num_transfer_syntaxes = 1;
+       pkt.u.alter.ctx_list[0].abstract_syntax = p->syntax;
+       pkt.u.alter.ctx_list[0].transfer_syntaxes = &p->transfer_syntax;
+       pkt.u.alter.auth_info = data_blob(NULL, 0);
+
+       /* construct the NDR form of the packet */
+       c->status = ncacn_push_auth(&blob, mem_ctx, &pkt,
+                                   p->conn->security_state.auth_info);
+       if (!composite_is_ok(c)) return c;
+
+       p->conn->transport.recv_data = dcerpc_recv_data;
+
+       /*
+        * we allocate a dcerpc_request so we can be in the same
+        * request queue as normal requests
+        */
+       req = talloc_zero(c, struct rpc_request);
+       if (composite_nomem(req, c)) return c;
+
+       req->state = RPC_REQUEST_PENDING;
+       req->call_id = pkt.call_id;
+       req->async.private_data = c;
+       req->async.callback = dcerpc_composite_fail;
+       req->p = p;
+       req->recv_handler = dcerpc_alter_recv_handler;
+       DLIST_ADD_END(p->conn->pending, req, struct rpc_request *);
+       talloc_set_destructor(req, dcerpc_req_dequeue);
+
+       c->status = p->conn->transport.send_request(p->conn, &blob, True);
+       if (!composite_is_ok(c)) return c;
+
+       event_add_timed(c->event_ctx, req,
+                       timeval_current_ofs(DCERPC_REQUEST_TIMEOUT, 0),
+                       dcerpc_timeout_handler, req);
+
+       return c;
+}
+
+NTSTATUS dcerpc_alter_context_recv(struct composite_context *ctx)
+{
+       NTSTATUS result = composite_wait(ctx);
+       talloc_free(ctx);
+       return result;
+}
+
+/* 
+   send a dcerpc alter_context request
+*/
+NTSTATUS dcerpc_alter_context(struct dcerpc_pipe *p, 
+                             TALLOC_CTX *mem_ctx,
+                             const struct ndr_syntax_id *syntax,
+                             const struct ndr_syntax_id *transfer_syntax)
+{
+       struct composite_context *creq;
+       creq = dcerpc_alter_context_send(p, mem_ctx, syntax, transfer_syntax);
+       return dcerpc_alter_context_recv(creq);
+}