s3-dcerpc: Use DATA_BLOB for pipes_struct input data
[kamenim/samba.git] / source3 / rpc_server / srv_pipe.c
index 5610e0bf71f9437c7a880e66886d7407689990e2..eae8a7dbf222ce8ee70a9f4efbfa52115f4c8583 100644 (file)
@@ -1,7 +1,7 @@
 /* 
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
- *  Almost completely rewritten by (C) Jeremy Allison 2005.
+ *  Almost completely rewritten by (C) Jeremy Allison 2005 - 2010
  *  
  *  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
  */
 
 #include "includes.h"
-
-extern struct current_user current_user;
+#include "srv_pipe_internal.h"
+#include "../librpc/gen_ndr/ndr_schannel.h"
+#include "../libcli/auth/schannel.h"
+#include "../libcli/auth/spnego.h"
+#include "../libcli/auth/ntlmssp.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
 static void free_pipe_ntlmssp_auth_data(struct pipe_auth_data *auth)
 {
-       AUTH_NTLMSSP_STATE *a = auth->a_u.auth_ntlmssp_state;
+       struct auth_ntlmssp_state *a = auth->a_u.auth_ntlmssp_state;
 
        if (a) {
                auth_ntlmssp_end(&a);
@@ -50,550 +53,350 @@ static DATA_BLOB generic_session_key(void)
 }
 
 /*******************************************************************
- Generate the next PDU to be returned from the data in p->rdata. 
  Handle NTLMSSP.
  ********************************************************************/
 
-static bool create_next_pdu_ntlmssp(pipes_struct *p)
+static bool add_ntlmssp_auth(pipes_struct *p)
 {
-       RPC_HDR_RESP hdr_resp;
-       uint32 ss_padding_len = 0;
-       uint32 data_space_available;
-       uint32 data_len_left;
-       uint32 data_len;
-       prs_struct outgoing_pdu;
+       enum dcerpc_AuthLevel auth_level = p->auth.auth_level;
+       DATA_BLOB auth_blob = data_blob_null;
        NTSTATUS status;
-       DATA_BLOB auth_blob;
-       RPC_HDR_AUTH auth_info;
-       uint8 auth_type, auth_level;
-       AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
-
-       /*
-        * If we're in the fault state, keep returning fault PDU's until
-        * the pipe gets closed. JRA.
-        */
-
-       if(p->fault_state) {
-               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
-               return True;
-       }
-
-       memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
-
-       /* Change the incoming request header to a response. */
-       p->hdr.pkt_type = RPC_RESPONSE;
-
-       /* Set up rpc header flags. */
-       if (p->out_data.data_sent_length == 0) {
-               p->hdr.flags = RPC_FLG_FIRST;
-       } else {
-               p->hdr.flags = 0;
-       }
-
-       /*
-        * Work out how much we can fit in a single PDU.
-        */
-
-       data_len_left = prs_offset(&p->out_data.rdata) - p->out_data.data_sent_length;
-
-       /*
-        * Ensure there really is data left to send.
-        */
-
-       if(!data_len_left) {
-               DEBUG(0,("create_next_pdu_ntlmssp: no data left to send !\n"));
-               return False;
-       }
 
-       data_space_available = sizeof(p->out_data.current_pdu) - RPC_HEADER_LEN - RPC_HDR_RESP_LEN -
-                                       RPC_HDR_AUTH_LEN - NTLMSSP_SIG_SIZE;
-
-       /*
-        * The amount we send is the minimum of the available
-        * space and the amount left to send.
-        */
-
-       data_len = MIN(data_len_left, data_space_available);
-
-       /*
-        * Set up the alloc hint. This should be the data left to
-        * send.
-        */
-
-       hdr_resp.alloc_hint = data_len_left;
-
-       /*
-        * Work out if this PDU will be the last.
-        */
-
-       if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata)) {
-               p->hdr.flags |= RPC_FLG_LAST;
-               if (data_len_left % 8) {
-                       ss_padding_len = 8 - (data_len_left % 8);
-                       DEBUG(10,("create_next_pdu_ntlmssp: adding sign/seal padding of %u\n",
-                               ss_padding_len ));
-               }
-       }
-
-       /*
-        * Set up the header lengths.
-        */
-
-       p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN +
-                       data_len + ss_padding_len +
-                       RPC_HDR_AUTH_LEN + NTLMSSP_SIG_SIZE;
-       p->hdr.auth_len = NTLMSSP_SIG_SIZE;
-
-
-       /*
-        * Init the parse struct to point at the outgoing
-        * data.
-        */
-
-       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
-       prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
-
-       /* Store the header in the data stream. */
-       if(!smb_io_rpc_hdr("hdr", &p->hdr, &outgoing_pdu, 0)) {
-               DEBUG(0,("create_next_pdu_ntlmssp: failed to marshall RPC_HDR.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
+       /* FIXME: Is this right ?
+        * Keeping only to avoid changing semantics during refactoring
+        * --simo
+        */
+       if (auth_level != DCERPC_AUTH_LEVEL_PRIVACY) {
+               auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+       }
+
+       /* Generate the auth blob. */
+       switch (auth_level) {
+       case DCERPC_AUTH_LEVEL_PRIVACY:
+               /* Data portion is encrypted. */
+               status = auth_ntlmssp_seal_packet(
+                               p->auth.a_u.auth_ntlmssp_state,
+                               (TALLOC_CTX *)p->out_data.frag.data,
+                               &p->out_data.frag.data[DCERPC_RESPONSE_LENGTH],
+                               p->out_data.frag.length
+                                       - DCERPC_RESPONSE_LENGTH
+                                       - DCERPC_AUTH_TRAILER_LENGTH,
+                               p->out_data.frag.data,
+                               p->out_data.frag.length,
+                               &auth_blob);
+               break;
+
+       case DCERPC_AUTH_LEVEL_INTEGRITY:
+               /* Data is signed. */
+               status = auth_ntlmssp_sign_packet(
+                               p->auth.a_u.auth_ntlmssp_state,
+                               (TALLOC_CTX *)p->out_data.frag.data,
+                               &p->out_data.frag.data[DCERPC_RESPONSE_LENGTH],
+                               p->out_data.frag.length
+                                       - DCERPC_RESPONSE_LENGTH
+                                       - DCERPC_AUTH_TRAILER_LENGTH,
+                               p->out_data.frag.data,
+                               p->out_data.frag.length,
+                               &auth_blob);
+               break;
+
+       default:
+               status = NT_STATUS_INTERNAL_ERROR;
+               return false;
        }
 
-       if(!smb_io_rpc_hdr_resp("resp", &hdr_resp, &outgoing_pdu, 0)) {
-               DEBUG(0,("create_next_pdu_ntlmssp: failed to marshall RPC_HDR_RESP.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed to add NTLMSSP auth blob: %s\n",
+                       nt_errstr(status)));
+               data_blob_free(&p->out_data.frag);
+               return false;
        }
 
-       /* Copy the data into the PDU. */
-
-       if(!prs_append_some_prs_data(&outgoing_pdu, &p->out_data.rdata, p->out_data.data_sent_length, data_len)) {
-               DEBUG(0,("create_next_pdu_ntlmssp: failed to copy %u bytes of data.\n", (unsigned int)data_len));
-               prs_mem_free(&outgoing_pdu);
+       /* Finally append the auth blob. */
+       if (!data_blob_append(p->mem_ctx, &p->out_data.frag,
+                               auth_blob.data, auth_blob.length)) {
+               DEBUG(0, ("Failed to add %u bytes auth blob.\n",
+                         (unsigned int)auth_blob.length));
+               data_blob_free(&p->out_data.frag);
                return False;
        }
+       data_blob_free(&auth_blob);
 
-       /* Copy the sign/seal padding data. */
-       if (ss_padding_len) {
-               char pad[8];
+       return true;
+}
 
-               memset(pad, '\0', 8);
-               if (!prs_copy_data_in(&outgoing_pdu, pad, ss_padding_len)) {
-                       DEBUG(0,("create_next_pdu_ntlmssp: failed to add %u bytes of pad data.\n",
-                                       (unsigned int)ss_padding_len));
-                       prs_mem_free(&outgoing_pdu);
-                       return False;
-               }
-       }
+/*******************************************************************
+ Append a schannel authenticated fragment.
+ ********************************************************************/
 
+static bool add_schannel_auth(pipes_struct *p)
+{
+       DATA_BLOB auth_blob = data_blob_null;
+       NTSTATUS status;
 
-       /* Now write out the auth header and null blob. */
-       if (p->auth.auth_type == PIPE_AUTH_TYPE_NTLMSSP) {
-               auth_type = RPC_NTLMSSP_AUTH_TYPE;
-       } else {
-               auth_type = RPC_SPNEGO_AUTH_TYPE;
-       }
-       if (p->auth.auth_level == PIPE_AUTH_LEVEL_PRIVACY) {
-               auth_level = RPC_AUTH_LEVEL_PRIVACY;
-       } else {
-               auth_level = RPC_AUTH_LEVEL_INTEGRITY;
+       /* Schannel processing. */
+       switch (p->auth.auth_level) {
+       case DCERPC_AUTH_LEVEL_PRIVACY:
+               status = netsec_outgoing_packet(
+                               p->auth.a_u.schannel_auth,
+                               (TALLOC_CTX *)p->out_data.frag.data,
+                               true,
+                               &p->out_data.frag.data[DCERPC_RESPONSE_LENGTH],
+                               p->out_data.frag.length
+                                       - DCERPC_RESPONSE_LENGTH
+                                       - DCERPC_AUTH_TRAILER_LENGTH,
+                               &auth_blob);
+               break;
+
+       case DCERPC_AUTH_LEVEL_INTEGRITY:
+               status = netsec_outgoing_packet(
+                               p->auth.a_u.schannel_auth,
+                               (TALLOC_CTX *)p->out_data.frag.data,
+                               false,
+                               &p->out_data.frag.data[DCERPC_RESPONSE_LENGTH],
+                               p->out_data.frag.length
+                                       - DCERPC_RESPONSE_LENGTH
+                                       - DCERPC_AUTH_TRAILER_LENGTH,
+                               &auth_blob);
+               break;
+
+       default:
+               status = NT_STATUS_INTERNAL_ERROR;
+               break;
        }
 
-       init_rpc_hdr_auth(&auth_info, auth_type, auth_level, ss_padding_len, 1 /* context id. */);
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, &outgoing_pdu, 0)) {
-               DEBUG(0,("create_next_pdu_ntlmssp: failed to marshall RPC_HDR_AUTH.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed to add SCHANNEL auth blob: %s\n",
+                       nt_errstr(status)));
+               data_blob_free(&p->out_data.frag);
+               return false;
        }
 
-       /* Generate the sign blob. */
-
-       switch (p->auth.auth_level) {
-               case PIPE_AUTH_LEVEL_PRIVACY:
-                       /* Data portion is encrypted. */
-                       status = ntlmssp_seal_packet(a->ntlmssp_state,
-                                                       (unsigned char *)prs_data_p(&outgoing_pdu) + RPC_HEADER_LEN + RPC_HDR_RESP_LEN,
-                                                       data_len + ss_padding_len,
-                                                       (unsigned char *)prs_data_p(&outgoing_pdu),
-                                                       (size_t)prs_offset(&outgoing_pdu),
-                                                       &auth_blob);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               data_blob_free(&auth_blob);
-                               prs_mem_free(&outgoing_pdu);
-                               return False;
-                       }
-                       break;
-               case PIPE_AUTH_LEVEL_INTEGRITY:
-                       /* Data is signed. */
-                       status = ntlmssp_sign_packet(a->ntlmssp_state,
-                                                       (unsigned char *)prs_data_p(&outgoing_pdu) + RPC_HEADER_LEN + RPC_HDR_RESP_LEN,
-                                                       data_len + ss_padding_len,
-                                                       (unsigned char *)prs_data_p(&outgoing_pdu),
-                                                       (size_t)prs_offset(&outgoing_pdu),
-                                                       &auth_blob);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               data_blob_free(&auth_blob);
-                               prs_mem_free(&outgoing_pdu);
-                               return False;
-                       }
-                       break;
-               default:
-                       prs_mem_free(&outgoing_pdu);
-                       return False;
+       if (DEBUGLEVEL >= 10) {
+               dump_NL_AUTH_SIGNATURE(talloc_tos(), &auth_blob);
        }
 
-       /* Append the auth blob. */
-       if (!prs_copy_data_in(&outgoing_pdu, (char *)auth_blob.data, NTLMSSP_SIG_SIZE)) {
-               DEBUG(0,("create_next_pdu_ntlmssp: failed to add %u bytes auth blob.\n",
-                               (unsigned int)NTLMSSP_SIG_SIZE));
-               data_blob_free(&auth_blob);
-               prs_mem_free(&outgoing_pdu);
-               return False;
+       if (!data_blob_append(p->mem_ctx, &p->out_data.frag,
+                               auth_blob.data, auth_blob.length)) {
+               DEBUG(0, ("Failed to add %u bytes auth blob.\n",
+                         (unsigned int)auth_blob.length));
+               data_blob_free(&p->out_data.frag);
+               return false;
        }
-
        data_blob_free(&auth_blob);
 
-       /*
-        * Setup the counts for this PDU.
-        */
-
-       p->out_data.data_sent_length += data_len;
-       p->out_data.current_pdu_len = p->hdr.frag_len;
-       p->out_data.current_pdu_sent = 0;
-
-       prs_mem_free(&outgoing_pdu);
-       return True;
+       return true;
 }
 
 /*******************************************************************
- Generate the next PDU to be returned from the data in p->rdata. 
- Return an schannel authenticated fragment.
- ********************************************************************/
+ Generate the next PDU to be returned from the data.
+********************************************************************/
 
-static bool create_next_pdu_schannel(pipes_struct *p)
+static bool create_next_packet(pipes_struct *p,
+                               enum dcerpc_AuthType auth_type,
+                               enum dcerpc_AuthLevel auth_level,
+                               size_t auth_length)
 {
-       RPC_HDR_RESP hdr_resp;
-       uint32 ss_padding_len = 0;
-       uint32 data_len;
-       uint32 data_space_available;
-       uint32 data_len_left;
-       prs_struct outgoing_pdu;
-       uint32 data_pos;
-
-       /*
-        * If we're in the fault state, keep returning fault PDU's until
-        * the pipe gets closed. JRA.
-        */
-
-       if(p->fault_state) {
-               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
-               return True;
-       }
-
-       memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
+       union dcerpc_payload u;
+       uint8_t pfc_flags;
+       size_t data_len_left;
+       size_t data_len;
+       size_t max_len;
+       size_t pad_len = 0;
+       NTSTATUS status;
 
-       /* Change the incoming request header to a response. */
-       p->hdr.pkt_type = RPC_RESPONSE;
+       ZERO_STRUCT(u.response);
 
-       /* Set up rpc header flags. */
+       /* Set up rpc packet pfc flags. */
        if (p->out_data.data_sent_length == 0) {
-               p->hdr.flags = RPC_FLG_FIRST;
+               pfc_flags = DCERPC_PFC_FLAG_FIRST;
        } else {
-               p->hdr.flags = 0;
+               pfc_flags = 0;
        }
 
-       /*
-        * Work out how much we can fit in a single PDU.
-        */
-
-       data_len_left = prs_offset(&p->out_data.rdata) - p->out_data.data_sent_length;
-
-       /*
-        * Ensure there really is data left to send.
-        */
+       /* Work out how much we can fit in a single PDU. */
+       data_len_left = p->out_data.rdata.length -
+                               p->out_data.data_sent_length;
 
-       if(!data_len_left) {
-               DEBUG(0,("create_next_pdu_schannel: no data left to send !\n"));
-               return False;
+       /* Ensure there really is data left to send. */
+       if (!data_len_left) {
+               DEBUG(0, ("No data left to send !\n"));
+               return false;
        }
 
-       data_space_available = sizeof(p->out_data.current_pdu) - RPC_HEADER_LEN - RPC_HDR_RESP_LEN -
-                                       RPC_HDR_AUTH_LEN - RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN;
-
-       /*
-        * The amount we send is the minimum of the available
-        * space and the amount left to send.
-        */
-
-       data_len = MIN(data_len_left, data_space_available);
-
-       /*
-        * Set up the alloc hint. This should be the data left to
-        * send.
-        */
-
-       hdr_resp.alloc_hint = data_len_left;
+       /* Max space available - not including padding. */
+       if (auth_length) {
+               max_len = RPC_MAX_PDU_FRAG_LEN
+                               - DCERPC_RESPONSE_LENGTH
+                               - DCERPC_AUTH_TRAILER_LENGTH
+                               - auth_length;
+       } else {
+               max_len = RPC_MAX_PDU_FRAG_LEN - DCERPC_RESPONSE_LENGTH;
+       }
 
        /*
-        * Work out if this PDU will be the last.
+        * The amount we send is the minimum of the max_len
+        * and the amount left to send.
         */
+       data_len = MIN(data_len_left, max_len);
 
-       if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata)) {
-               p->hdr.flags |= RPC_FLG_LAST;
-               if (data_len_left % 8) {
-                       ss_padding_len = 8 - (data_len_left % 8);
-                       DEBUG(10,("create_next_pdu_schannel: adding sign/seal padding of %u\n",
-                               ss_padding_len ));
+       if (auth_length) {
+               /* Work out any padding alignment requirements. */
+               pad_len = (DCERPC_RESPONSE_LENGTH + data_len) %
+                                               SERVER_NDR_PADDING_SIZE;
+               if (pad_len) {
+                       pad_len = SERVER_NDR_PADDING_SIZE - pad_len;
+                       DEBUG(10, ("Padding size is: %d\n", (int)pad_len));
+                       /* If we're over filling the packet, we need to make
+                        * space for the padding at the end of the data. */
+                       if (data_len + pad_len > max_len) {
+                               data_len -= SERVER_NDR_PADDING_SIZE;
+                       }
                }
        }
 
-       p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len + ss_padding_len +
-                               RPC_HDR_AUTH_LEN + RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN;
-       p->hdr.auth_len = RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN;
-
-       /*
-        * Init the parse struct to point at the outgoing
-        * data.
-        */
+       /* Set up the alloc hint. This should be the data left to send. */
+       u.response.alloc_hint = data_len_left;
 
-       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
-       prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
-
-       /* Store the header in the data stream. */
-       if(!smb_io_rpc_hdr("hdr", &p->hdr, &outgoing_pdu, 0)) {
-               DEBUG(0,("create_next_pdu_schannel: failed to marshall RPC_HDR.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
+       /* Work out if this PDU will be the last. */
+       if (p->out_data.data_sent_length
+                               + data_len >= p->out_data.rdata.length) {
+               pfc_flags |= DCERPC_PFC_FLAG_LAST;
        }
 
-       if(!smb_io_rpc_hdr_resp("resp", &hdr_resp, &outgoing_pdu, 0)) {
-               DEBUG(0,("create_next_pdu_schannel: failed to marshall RPC_HDR_RESP.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
+       /* Prepare data to be NDR encoded. */
+       u.response.stub_and_verifier =
+               data_blob_const(p->out_data.rdata.data +
+                               p->out_data.data_sent_length, data_len);
+
+       /* Store the packet in the data stream. */
+       status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                         DCERPC_PKT_RESPONSE,
+                                         pfc_flags,
+                                         auth_length,
+                                         p->call_id,
+                                         &u,
+                                         &p->out_data.frag);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed to marshall RPC Packet.\n"));
+               return false;
        }
 
-       /* Store the current offset. */
-       data_pos = prs_offset(&outgoing_pdu);
+       if (auth_length) {
+               DATA_BLOB empty = data_blob_null;
+               DATA_BLOB auth_hdr;
 
-       /* Copy the data into the PDU. */
+               /* Set the proper length on the pdu, including padding.
+                * Only needed if an auth trailer will be appended. */
+               dcerpc_set_frag_length(&p->out_data.frag,
+                                       p->out_data.frag.length
+                                               + pad_len
+                                               + DCERPC_AUTH_TRAILER_LENGTH
+                                               + auth_length);
 
-       if(!prs_append_some_prs_data(&outgoing_pdu, &p->out_data.rdata, p->out_data.data_sent_length, data_len)) {
-               DEBUG(0,("create_next_pdu_schannel: failed to copy %u bytes of data.\n", (unsigned int)data_len));
-               prs_mem_free(&outgoing_pdu);
-               return False;
-       }
+               if (pad_len) {
+                       size_t offset = p->out_data.frag.length;
 
-       /* Copy the sign/seal padding data. */
-       if (ss_padding_len) {
-               char pad[8];
-               memset(pad, '\0', 8);
-               if (!prs_copy_data_in(&outgoing_pdu, pad, ss_padding_len)) {
-                       DEBUG(0,("create_next_pdu_schannel: failed to add %u bytes of pad data.\n", (unsigned int)ss_padding_len));
-                       prs_mem_free(&outgoing_pdu);
-                       return False;
+                       if (!data_blob_realloc(p->mem_ctx,
+                                               &p->out_data.frag,
+                                               offset + pad_len)) {
+                               DEBUG(0, ("Failed to add padding!\n"));
+                               data_blob_free(&p->out_data.frag);
+                               return false;
+                       }
+                       memset(&p->out_data.frag.data[offset], '\0', pad_len);
                }
-       }
 
-       {
-               /*
-                * Schannel processing.
-                */
-               char *data;
-               RPC_HDR_AUTH auth_info;
-               RPC_AUTH_SCHANNEL_CHK verf;
-
-               data = prs_data_p(&outgoing_pdu) + data_pos;
-               /* Check it's the type of reply we were expecting to decode */
-
-               init_rpc_hdr_auth(&auth_info,
-                               RPC_SCHANNEL_AUTH_TYPE,
-                               p->auth.auth_level == PIPE_AUTH_LEVEL_PRIVACY ?
-                                       RPC_AUTH_LEVEL_PRIVACY : RPC_AUTH_LEVEL_INTEGRITY,
-                               ss_padding_len, 1);
-
-               if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, &outgoing_pdu, 0)) {
-                       DEBUG(0,("create_next_pdu_schannel: failed to marshall RPC_HDR_AUTH.\n"));
-                       prs_mem_free(&outgoing_pdu);
-                       return False;
+               /* auth blob is intentionally empty,
+                * it will be appended later */
+               status = dcerpc_push_dcerpc_auth(p->out_data.frag.data,
+                                                auth_type,
+                                                auth_level,
+                                                pad_len,
+                                                1, /* context id. */
+                                                &empty,
+                                                &auth_hdr);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("Failed to marshall RPC Auth.\n"));
+                       return false;
                }
 
-               schannel_encode(p->auth.a_u.schannel_auth, 
-                             p->auth.auth_level,
-                             SENDER_IS_ACCEPTOR,
-                             &verf, data, data_len + ss_padding_len);
-
-               if (!smb_io_rpc_auth_schannel_chk("", RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN, 
-                               &verf, &outgoing_pdu, 0)) {
-                       prs_mem_free(&outgoing_pdu);
-                       return False;
+               /* Store auth header in the data stream. */
+               if (!data_blob_append(p->mem_ctx, &p->out_data.frag,
+                                       auth_hdr.data, auth_hdr.length)) {
+                       DEBUG(0, ("Out of memory.\n"));
+                       data_blob_free(&p->out_data.frag);
+                       return false;
                }
-
-               p->auth.a_u.schannel_auth->seq_num++;
+               data_blob_free(&auth_hdr);
        }
 
-       /*
-        * Setup the counts for this PDU.
-        */
-
+       /* Setup the counts for this PDU. */
        p->out_data.data_sent_length += data_len;
-       p->out_data.current_pdu_len = p->hdr.frag_len;
        p->out_data.current_pdu_sent = 0;
-
-       prs_mem_free(&outgoing_pdu);
-       return True;
+       return true;
 }
 
 /*******************************************************************
  Generate the next PDU to be returned from the data in p->rdata. 
- No authentication done.
 ********************************************************************/
 
-static bool create_next_pdu_noauth(pipes_struct *p)
+bool create_next_pdu(pipes_struct *p)
 {
-       RPC_HDR_RESP hdr_resp;
-       uint32 data_len;
-       uint32 data_space_available;
-       uint32 data_len_left;
-       prs_struct outgoing_pdu;
+       enum dcerpc_AuthType auth_type =
+               map_pipe_auth_type_to_rpc_auth_type(p->auth.auth_type);
 
        /*
         * If we're in the fault state, keep returning fault PDU's until
         * the pipe gets closed. JRA.
         */
-
-       if(p->fault_state) {
+       if (p->fault_state) {
                setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
-               return True;
-       }
-
-       memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
-
-       /* Change the incoming request header to a response. */
-       p->hdr.pkt_type = RPC_RESPONSE;
-
-       /* Set up rpc header flags. */
-       if (p->out_data.data_sent_length == 0) {
-               p->hdr.flags = RPC_FLG_FIRST;
-       } else {
-               p->hdr.flags = 0;
+               return true;
        }
 
-       /*
-        * Work out how much we can fit in a single PDU.
-        */
-
-       data_len_left = prs_offset(&p->out_data.rdata) - p->out_data.data_sent_length;
-
-       /*
-        * Ensure there really is data left to send.
-        */
-
-       if(!data_len_left) {
-               DEBUG(0,("create_next_pdu_noath: no data left to send !\n"));
-               return False;
-       }
-
-       data_space_available = sizeof(p->out_data.current_pdu) - RPC_HEADER_LEN - RPC_HDR_RESP_LEN;
-
-       /*
-        * The amount we send is the minimum of the available
-        * space and the amount left to send.
-        */
-
-       data_len = MIN(data_len_left, data_space_available);
-
-       /*
-        * Set up the alloc hint. This should be the data left to
-        * send.
-        */
-
-       hdr_resp.alloc_hint = data_len_left;
-
-       /*
-        * Work out if this PDU will be the last.
-        */
-
-       if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata)) {
-               p->hdr.flags |= RPC_FLG_LAST;
-       }
-
-       /*
-        * Set up the header lengths.
-        */
-
-       p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len;
-       p->hdr.auth_len = 0;
-
-       /*
-        * Init the parse struct to point at the outgoing
-        * data.
-        */
-
-       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
-       prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
-
-       /* Store the header in the data stream. */
-       if(!smb_io_rpc_hdr("hdr", &p->hdr, &outgoing_pdu, 0)) {
-               DEBUG(0,("create_next_pdu_noath: failed to marshall RPC_HDR.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
-       }
-
-       if(!smb_io_rpc_hdr_resp("resp", &hdr_resp, &outgoing_pdu, 0)) {
-               DEBUG(0,("create_next_pdu_noath: failed to marshall RPC_HDR_RESP.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
-       }
-
-       /* Copy the data into the PDU. */
-
-       if(!prs_append_some_prs_data(&outgoing_pdu, &p->out_data.rdata, p->out_data.data_sent_length, data_len)) {
-               DEBUG(0,("create_next_pdu_noauth: failed to copy %u bytes of data.\n", (unsigned int)data_len));
-               prs_mem_free(&outgoing_pdu);
-               return False;
-       }
-
-       /*
-        * Setup the counts for this PDU.
-        */
-
-       p->out_data.data_sent_length += data_len;
-       p->out_data.current_pdu_len = p->hdr.frag_len;
-       p->out_data.current_pdu_sent = 0;
-
-       prs_mem_free(&outgoing_pdu);
-       return True;
-}
-
-/*******************************************************************
- Generate the next PDU to be returned from the data in p->rdata. 
-********************************************************************/
+       switch (p->auth.auth_level) {
+       case DCERPC_AUTH_LEVEL_NONE:
+       case DCERPC_AUTH_LEVEL_CONNECT:
+               /* This is incorrect for auth level connect. Fixme. JRA */
+
+               /* No authentication done. */
+               return create_next_packet(p, auth_type,
+                                         p->auth.auth_level, 0);
+
+       case DCERPC_AUTH_LEVEL_CALL:
+       case DCERPC_AUTH_LEVEL_PACKET:
+       case DCERPC_AUTH_LEVEL_INTEGRITY:
+       case DCERPC_AUTH_LEVEL_PRIVACY:
+
+               switch(p->auth.auth_type) {
+               case PIPE_AUTH_TYPE_NTLMSSP:
+               case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
+                       if (!create_next_packet(p, auth_type,
+                                               p->auth.auth_level,
+                                               NTLMSSP_SIG_SIZE)) {
+                               return false;
+                       }
+                       return add_ntlmssp_auth(p);
 
-bool create_next_pdu(pipes_struct *p)
-{
-       switch(p->auth.auth_level) {
-               case PIPE_AUTH_LEVEL_NONE:
-               case PIPE_AUTH_LEVEL_CONNECT:
-                       /* This is incorrect for auth level connect. Fixme. JRA */
-                       return create_next_pdu_noauth(p);
-               
-               default:
-                       switch(p->auth.auth_type) {
-                               case PIPE_AUTH_TYPE_NTLMSSP:
-                               case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
-                                       return create_next_pdu_ntlmssp(p);
-                               case PIPE_AUTH_TYPE_SCHANNEL:
-                                       return create_next_pdu_schannel(p);
-                               default:
-                                       break;
+               case PIPE_AUTH_TYPE_SCHANNEL:
+                       if (!create_next_packet(p, auth_type,
+                                               p->auth.auth_level,
+                                               SCHANNEL_SIG_SIZE)) {
+                               return false;
                        }
+                       return add_schannel_auth(p);
+               default:
+                       break;
+               }
+       default:
+               break;
        }
 
-       DEBUG(0,("create_next_pdu: invalid internal auth level %u / type %u",
-                       (unsigned int)p->auth.auth_level,
-                       (unsigned int)p->auth.auth_type));
-       return False;
+       DEBUG(0, ("Invalid internal auth level %u / type %u\n",
+                 (unsigned int)p->auth.auth_level,
+                 (unsigned int)p->auth.auth_type));
+       return false;
 }
 
 /*******************************************************************
@@ -607,10 +410,11 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
 {
        DATA_BLOB session_key, reply;
        NTSTATUS status;
-       AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
+       struct auth_ntlmssp_state *a = p->auth.a_u.auth_ntlmssp_state;
        bool ret;
 
-       DEBUG(5,("pipe_ntlmssp_verify_final: pipe %s checking user details\n", p->name));
+       DEBUG(5,("pipe_ntlmssp_verify_final: pipe %s checking user details\n",
+                get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
 
        ZERO_STRUCT(reply);
 
@@ -630,40 +434,45 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
           ensure the underlying NTLMSSP flags are also set. If not we should
           refuse the bind. */
 
-       if (p->auth.auth_level == PIPE_AUTH_LEVEL_INTEGRITY) {
-               if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
+       if (p->auth.auth_level == DCERPC_AUTH_LEVEL_INTEGRITY) {
+               if (!auth_ntlmssp_negotiated_sign(a)) {
                        DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet integrity requested "
                                "but client declined signing.\n",
-                                       p->name ));
+                                get_pipe_name_from_syntax(talloc_tos(),
+                                                          &p->syntax)));
                        return False;
                }
        }
-       if (p->auth.auth_level == PIPE_AUTH_LEVEL_PRIVACY) {
-               if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
+       if (p->auth.auth_level == DCERPC_AUTH_LEVEL_PRIVACY) {
+               if (!auth_ntlmssp_negotiated_seal(a)) {
                        DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet privacy requested "
                                "but client declined sealing.\n",
-                                       p->name ));
+                                get_pipe_name_from_syntax(talloc_tos(),
+                                                          &p->syntax)));
                        return False;
                }
        }
 
        DEBUG(5, ("pipe_ntlmssp_verify_final: OK: user: %s domain: %s "
-                 "workstation: %s\n", a->ntlmssp_state->user,
-                 a->ntlmssp_state->domain, a->ntlmssp_state->workstation));
-
-       if (a->server_info->ptok == NULL) {
-               DEBUG(1,("Error: Authmodule failed to provide nt_user_token\n"));
-               return False;
-       }
+                 "workstation: %s\n",
+                 auth_ntlmssp_get_username(a),
+                 auth_ntlmssp_get_domain(a),
+                 auth_ntlmssp_get_client(a)));
 
        TALLOC_FREE(p->server_info);
 
-       p->server_info = copy_serverinfo(p, a->server_info);
-       if (p->server_info == NULL) {
-               DEBUG(0, ("copy_serverinfo failed\n"));
+       status = auth_ntlmssp_server_info(p, a, &p->server_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("auth_ntlmssp_server_info failed to obtain the server info for authenticated user: %s\n",
+                         nt_errstr(status)));
                return false;
        }
 
+       if (p->server_info->ptok == NULL) {
+               DEBUG(1,("Error: Authmodule failed to provide nt_user_token\n"));
+               return False;
+       }
+
        /*
         * We're an authenticated bind over smb, so the session key needs to
         * be set to "SystemLibraryDTC". Weird, but this is what Windows
@@ -682,45 +491,29 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
        return True;
 }
 
-/*******************************************************************
- The switch table for the pipe names and the functions to handle them.
-*******************************************************************/
-
-struct rpc_table {
-       struct {
-               const char *clnt;
-               const char *srv;
-       } pipe;
-       struct ndr_syntax_id rpc_interface;
-       const struct api_struct *cmds;
-       int n_cmds;
-};
-
-static struct rpc_table *rpc_lookup;
-static int rpc_lookup_size;
-
 /*******************************************************************
  This is the "stage3" NTLMSSP response after a bind request and reply.
 *******************************************************************/
 
-bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
+bool api_pipe_bind_auth3(pipes_struct *p, struct ncacn_packet *pkt)
 {
-       RPC_HDR_AUTH auth_info;
-       uint32 pad;
-       DATA_BLOB blob;
-
-       ZERO_STRUCT(blob);
+       struct dcerpc_auth auth_info;
+       NTSTATUS status;
 
-       DEBUG(5,("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
+       DEBUG(5, ("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
 
-       if (p->hdr.auth_len == 0) {
-               DEBUG(0,("api_pipe_bind_auth3: No auth field sent !\n"));
+       if (pkt->auth_length == 0) {
+               DEBUG(0, ("No auth field sent for bind request!\n"));
                goto err;
        }
 
-       /* 4 bytes padding. */
-       if (!prs_uint32("pad", rpc_in_p, 0, &pad)) {
-               DEBUG(0,("api_pipe_bind_auth3: unmarshall of 4 byte pad failed.\n"));
+       /* Ensure there's enough data for an authenticated request. */
+       if (pkt->frag_length < RPC_HEADER_LEN
+                               + DCERPC_AUTH_TRAILER_LENGTH
+                               + pkt->auth_length) {
+                       DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_len "
+                               "%u is too large.\n",
+                        (unsigned int)pkt->auth_length));
                goto err;
        }
 
@@ -728,43 +521,40 @@ bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
         * Decode the authentication verifier response.
         */
 
-       if(!smb_io_rpc_hdr_auth("", &auth_info, rpc_in_p, 0)) {
-               DEBUG(0,("api_pipe_bind_auth3: unmarshall of RPC_HDR_AUTH failed.\n"));
+       status = dcerpc_pull_dcerpc_auth(pkt,
+                                        &pkt->u.auth3.auth_info,
+                                        &auth_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed to unmarshall dcerpc_auth.\n"));
                goto err;
        }
 
-       if (auth_info.auth_type != RPC_NTLMSSP_AUTH_TYPE) {
+       /* We must NEVER look at auth_info->auth_pad_len here,
+        * as old Samba client code gets it wrong and sends it
+        * as zero. JRA.
+        */
+
+       if (auth_info.auth_type != DCERPC_AUTH_TYPE_NTLMSSP) {
                DEBUG(0,("api_pipe_bind_auth3: incorrect auth type (%u).\n",
                        (unsigned int)auth_info.auth_type ));
                return False;
        }
 
-       blob = data_blob(NULL,p->hdr.auth_len);
-
-       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
-               DEBUG(0,("api_pipe_bind_auth3: Failed to pull %u bytes - the response blob.\n",
-                       (unsigned int)p->hdr.auth_len ));
-               goto err;
-       }
-
        /*
         * The following call actually checks the challenge/response data.
         * for correctness against the given DOMAIN\user name.
         */
-       
-       if (!pipe_ntlmssp_verify_final(p, &blob)) {
+
+       if (!pipe_ntlmssp_verify_final(p, &auth_info.credentials)) {
                goto err;
        }
 
-       data_blob_free(&blob);
-
        p->pipe_bound = True;
 
        return True;
 
  err:
 
-       data_blob_free(&blob);
        free_pipe_ntlmssp_auth_data(&p->auth);
        p->auth.a_u.auth_ntlmssp_state = NULL;
 
@@ -775,58 +565,47 @@ bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
  Marshall a bind_nak pdu.
 *******************************************************************/
 
-static bool setup_bind_nak(pipes_struct *p)
+static bool setup_bind_nak(pipes_struct *p, struct ncacn_packet *pkt)
 {
-       prs_struct outgoing_rpc;
-       RPC_HDR nak_hdr;
-       uint16 zero = 0;
+       NTSTATUS status;
+       union dcerpc_payload u;
 
        /* Free any memory in the current return data buffer. */
-       prs_mem_free(&p->out_data.rdata);
-
-       /*
-        * Marshall directly into the outgoing PDU space. We
-        * must do this as we need to set to the bind response
-        * header and are never sending more than one PDU here.
-        */
-
-       prs_init_empty( &outgoing_rpc, p->mem_ctx, MARSHALL);
-       prs_give_memory( &outgoing_rpc, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
+       data_blob_free(&p->out_data.rdata);
 
        /*
         * Initialize a bind_nak header.
         */
 
-       init_rpc_hdr(&nak_hdr, RPC_BINDNACK, RPC_FLG_FIRST | RPC_FLG_LAST,
-               p->hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
+       ZERO_STRUCT(u);
 
-       /*
-        * Marshall the header into the outgoing PDU.
-        */
-
-       if(!smb_io_rpc_hdr("", &nak_hdr, &outgoing_rpc, 0)) {
-               DEBUG(0,("setup_bind_nak: marshalling of RPC_HDR failed.\n"));
-               prs_mem_free(&outgoing_rpc);
-               return False;
-       }
+       u.bind_nak.reject_reason  = 0;
 
        /*
-        * Now add the reject reason.
+        * Marshall directly into the outgoing PDU space. We
+        * must do this as we need to set to the bind response
+        * header and are never sending more than one PDU here.
         */
 
-       if(!prs_uint16("reject code", &outgoing_rpc, 0, &zero)) {
-               prs_mem_free(&outgoing_rpc);
+       status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                         DCERPC_PKT_BIND_NAK,
+                                         DCERPC_PFC_FLAG_FIRST |
+                                               DCERPC_PFC_FLAG_LAST,
+                                         0,
+                                         pkt->call_id,
+                                         &u,
+                                         &p->out_data.frag);
+       if (!NT_STATUS_IS_OK(status)) {
                return False;
        }
 
        p->out_data.data_sent_length = 0;
-       p->out_data.current_pdu_len = prs_offset(&outgoing_rpc);
        p->out_data.current_pdu_sent = 0;
 
        if (p->auth.auth_data_free_func) {
                (*p->auth.auth_data_free_func)(&p->auth);
        }
-       p->auth.auth_level = PIPE_AUTH_LEVEL_NONE;
+       p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE;
        p->auth.auth_type = PIPE_AUTH_TYPE_NONE;
        p->pipe_bound = False;
 
@@ -837,84 +616,22 @@ static bool setup_bind_nak(pipes_struct *p)
  Marshall a fault pdu.
 *******************************************************************/
 
-bool setup_fault_pdu(pipes_struct *p, NTSTATUS status)
+bool setup_fault_pdu(pipes_struct *p, NTSTATUS fault_status)
 {
-       prs_struct outgoing_pdu;
-       RPC_HDR fault_hdr;
-       RPC_HDR_RESP hdr_resp;
-       RPC_HDR_FAULT fault_resp;
+       NTSTATUS status;
+       union dcerpc_payload u;
 
        /* Free any memory in the current return data buffer. */
-       prs_mem_free(&p->out_data.rdata);
-
-       /*
-        * Marshall directly into the outgoing PDU space. We
-        * must do this as we need to set to the bind response
-        * header and are never sending more than one PDU here.
-        */
-
-       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
-       prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
+       data_blob_free(&p->out_data.rdata);
 
        /*
         * Initialize a fault header.
         */
 
-       init_rpc_hdr(&fault_hdr, RPC_FAULT, RPC_FLG_FIRST | RPC_FLG_LAST | RPC_FLG_NOCALL,
-            p->hdr.call_id, RPC_HEADER_LEN + RPC_HDR_RESP_LEN + RPC_HDR_FAULT_LEN, 0);
-
-       /*
-        * Initialize the HDR_RESP and FAULT parts of the PDU.
-        */
+       ZERO_STRUCT(u);
 
-       memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
-
-       fault_resp.status = status;
-       fault_resp.reserved = 0;
-
-       /*
-        * Marshall the header into the outgoing PDU.
-        */
-
-       if(!smb_io_rpc_hdr("", &fault_hdr, &outgoing_pdu, 0)) {
-               DEBUG(0,("setup_fault_pdu: marshalling of RPC_HDR failed.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
-       }
-
-       if(!smb_io_rpc_hdr_resp("resp", &hdr_resp, &outgoing_pdu, 0)) {
-               DEBUG(0,("setup_fault_pdu: failed to marshall RPC_HDR_RESP.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
-       }
-
-       if(!smb_io_rpc_hdr_fault("fault", &fault_resp, &outgoing_pdu, 0)) {
-               DEBUG(0,("setup_fault_pdu: failed to marshall RPC_HDR_FAULT.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
-       }
-
-       p->out_data.data_sent_length = 0;
-       p->out_data.current_pdu_len = prs_offset(&outgoing_pdu);
-       p->out_data.current_pdu_sent = 0;
-
-       prs_mem_free(&outgoing_pdu);
-       return True;
-}
-
-#if 0
-/*******************************************************************
- Marshall a cancel_ack pdu.
- We should probably check the auth-verifier here.
-*******************************************************************/
-
-bool setup_cancel_ack_reply(pipes_struct *p, prs_struct *rpc_in_p)
-{
-       prs_struct outgoing_pdu;
-       RPC_HDR ack_reply_hdr;
-
-       /* Free any memory in the current return data buffer. */
-       prs_mem_free(&p->out_data.rdata);
+       u.fault.status          = NT_STATUS_V(fault_status);
+       u.fault._pad            = data_blob_talloc_zero(p->mem_ctx, 4);
 
        /*
         * Marshall directly into the outgoing PDU space. We
@@ -922,62 +639,47 @@ bool setup_cancel_ack_reply(pipes_struct *p, prs_struct *rpc_in_p)
         * header and are never sending more than one PDU here.
         */
 
-       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
-       prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
-
-       /*
-        * Initialize a cancel_ack header.
-        */
-
-       init_rpc_hdr(&ack_reply_hdr, RPC_CANCEL_ACK, RPC_FLG_FIRST | RPC_FLG_LAST,
-                       p->hdr.call_id, RPC_HEADER_LEN, 0);
-
-       /*
-        * Marshall the header into the outgoing PDU.
-        */
-
-       if(!smb_io_rpc_hdr("", &ack_reply_hdr, &outgoing_pdu, 0)) {
-               DEBUG(0,("setup_cancel_ack_reply: marshalling of RPC_HDR failed.\n"));
-               prs_mem_free(&outgoing_pdu);
+       status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                         DCERPC_PKT_FAULT,
+                                         DCERPC_PFC_FLAG_FIRST |
+                                          DCERPC_PFC_FLAG_LAST |
+                                          DCERPC_PFC_FLAG_DID_NOT_EXECUTE,
+                                         0,
+                                         p->call_id,
+                                         &u,
+                                         &p->out_data.frag);
+       if (!NT_STATUS_IS_OK(status)) {
                return False;
        }
 
        p->out_data.data_sent_length = 0;
-       p->out_data.current_pdu_len = prs_offset(&outgoing_pdu);
        p->out_data.current_pdu_sent = 0;
 
-       prs_mem_free(&outgoing_pdu);
        return True;
 }
-#endif
 
 /*******************************************************************
  Ensure a bind request has the correct abstract & transfer interface.
  Used to reject unknown binds from Win2k.
 *******************************************************************/
 
-bool check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract,
-                    RPC_IFACE* transfer, uint32 context_id)
+static bool check_bind_req(struct pipes_struct *p,
+                          struct ndr_syntax_id* abstract,
+                          struct ndr_syntax_id* transfer,
+                          uint32 context_id)
 {
-       int i=0;
        struct pipe_rpc_fns *context_fns;
 
-       DEBUG(3,("check_bind_req for %s\n", p->name));
+       DEBUG(3,("check_bind_req for %s\n",
+                get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
 
        /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */
-
-       for (i=0; i<rpc_lookup_size; i++) {
-               DEBUGADD(10, ("checking %s\n", rpc_lookup[i].pipe.clnt));
-               if (strequal(rpc_lookup[i].pipe.clnt, p->name)
-                   && ndr_syntax_id_equal(
-                           abstract, &rpc_lookup[i].rpc_interface)
-                   && ndr_syntax_id_equal(
-                           transfer, &ndr_transfer_syntax)) {
-                       break;
-               }
-       }
-
-       if (i == rpc_lookup_size) {
+       if (rpc_srv_pipe_exists_by_id(abstract) &&
+          ndr_syntax_id_equal(transfer, &ndr_transfer_syntax)) {
+               DEBUG(3, ("check_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
+                       rpc_srv_get_pipe_cli_name(abstract),
+                       rpc_srv_get_pipe_srv_name(abstract)));
+       } else {
                return false;
        }
 
@@ -987,8 +689,8 @@ bool check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract,
                return False;
        }
 
-       context_fns->cmds = rpc_lookup[i].cmds;
-       context_fns->n_cmds = rpc_lookup[i].n_cmds;
+       context_fns->n_cmds = rpc_srv_get_pipe_num_cmds(abstract);
+       context_fns->cmds = rpc_srv_get_pipe_cmds(abstract);
        context_fns->context_id = context_id;
 
        /* add to the list of open contexts */
@@ -998,69 +700,15 @@ bool check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract,
        return True;
 }
 
-/*******************************************************************
- Register commands to an RPC pipe
-*******************************************************************/
-
-NTSTATUS rpc_pipe_register_commands(int version, const char *clnt,
-                                   const char *srv,
-                                   const struct ndr_syntax_id *interface,
-                                   const struct api_struct *cmds, int size)
-{
-        struct rpc_table *rpc_entry;
-
-       if (!clnt || !srv || !cmds) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       if (version != SMB_RPC_INTERFACE_VERSION) {
-               DEBUG(0,("Can't register rpc commands!\n"
-                        "You tried to register a rpc module with SMB_RPC_INTERFACE_VERSION %d"
-                        ", while this version of samba uses version %d!\n", 
-                        version,SMB_RPC_INTERFACE_VERSION));
-               return NT_STATUS_OBJECT_TYPE_MISMATCH;
-       }
-
-       /* TODO: 
-        *
-        * we still need to make sure that don't register the same commands twice!!!
-        * 
-        * --metze
-        */
-
-        /* We use a temporary variable because this call can fail and 
-           rpc_lookup will still be valid afterwards.  It could then succeed if
-           called again later */
-       rpc_lookup_size++;
-        rpc_entry = SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(rpc_lookup, struct rpc_table, rpc_lookup_size);
-        if (NULL == rpc_entry) {
-                rpc_lookup_size--;
-                DEBUG(0, ("rpc_pipe_register_commands: memory allocation failed\n"));
-                return NT_STATUS_NO_MEMORY;
-        } else {
-                rpc_lookup = rpc_entry;
-        }
-        
-        rpc_entry = rpc_lookup + (rpc_lookup_size - 1);
-        ZERO_STRUCTP(rpc_entry);
-        rpc_entry->pipe.clnt = SMB_STRDUP(clnt);
-        rpc_entry->pipe.srv = SMB_STRDUP(srv);
-       rpc_entry->rpc_interface = *interface;
-        rpc_entry->cmds = cmds;
-        rpc_entry->n_cmds = size;
-        
-        return NT_STATUS_OK;
-}
-
 /**
  * Is a named pipe known?
  * @param[in] cli_filename     The pipe name requested by the client
  * @result                     Do we want to serve this?
  */
-bool is_known_pipename(const char *cli_filename)
+bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax)
 {
        const char *pipename = cli_filename;
-       int i;
+       NTSTATUS status;
 
        if (strnequal(pipename, "\\PIPE\\", 6)) {
                pipename += 5;
@@ -1075,13 +723,27 @@ bool is_known_pipename(const char *cli_filename)
                return false;
        }
 
-       for (i=0; i<rpc_lookup_size; i++) {
-               if (strequal(pipename, rpc_lookup[i].pipe.clnt)) {
-                       return true;
-               }
+       if (rpc_srv_get_pipe_interface_by_cli_name(pipename, syntax)) {
+               return true;
+       }
+
+       status = smb_probe_module("rpc", pipename);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("is_known_pipename: %s unknown\n", cli_filename));
+               return false;
        }
+       DEBUG(10, ("is_known_pipename: %s loaded dynamically\n", pipename));
+
+       /*
+        * Scan the list again for the interface id
+        */
+       if (rpc_srv_get_pipe_interface_by_cli_name(pipename, syntax)) {
+               return true;
+       }
+
+       DEBUG(10, ("is_known_pipename: pipe %s did not register itself!\n",
+                  pipename));
 
-       DEBUG(10, ("is_known_pipename: %s unknown\n", cli_filename));
        return false;
 }
 
@@ -1089,8 +751,11 @@ bool is_known_pipename(const char *cli_filename)
  Handle a SPNEGO krb5 bind auth.
 *******************************************************************/
 
-static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info,
-               DATA_BLOB *psecblob, prs_struct *pout_auth)
+static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p,
+                                          TALLOC_CTX *mem_ctx,
+                                          struct dcerpc_auth *pauth_info,
+                                          DATA_BLOB *psecblob,
+                                          DATA_BLOB *response)
 {
        return False;
 }
@@ -1099,39 +764,28 @@ static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p
  Handle the first part of a SPNEGO bind auth.
 *******************************************************************/
 
-static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_p,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
+                                           TALLOC_CTX *mem_ctx,
+                                           struct dcerpc_auth *pauth_info,
+                                           DATA_BLOB *response)
 {
-       DATA_BLOB blob;
        DATA_BLOB secblob;
-       DATA_BLOB response;
        DATA_BLOB chal;
        char *OIDs[ASN1_MAX_OIDS];
         int i;
        NTSTATUS status;
         bool got_kerberos_mechanism = false;
-       AUTH_NTLMSSP_STATE *a = NULL;
-       RPC_HDR_AUTH auth_info;
+       struct auth_ntlmssp_state *a = NULL;
 
        ZERO_STRUCT(secblob);
        ZERO_STRUCT(chal);
-       ZERO_STRUCT(response);
-
-       /* Grab the SPNEGO blob. */
-       blob = data_blob(NULL,p->hdr.auth_len);
-
-       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
-               DEBUG(0,("pipe_spnego_auth_bind_negotiate: Failed to pull %u bytes - the SPNEGO auth header.\n",
-                       (unsigned int)p->hdr.auth_len ));
-               goto err;
-       }
 
-       if (blob.data[0] != ASN1_APPLICATION(0)) {
+       if (pauth_info->credentials.data[0] != ASN1_APPLICATION(0)) {
                goto err;
        }
 
        /* parse out the OIDs and the first sec blob */
-       if (!parse_negTokenTarg(blob, OIDs, &secblob)) {
+       if (!parse_negTokenTarg(pauth_info->credentials, OIDs, &secblob)) {
                DEBUG(0,("pipe_spnego_auth_bind_negotiate: Failed to parse the security blob.\n"));
                goto err;
         }
@@ -1146,10 +800,11 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
        }
        DEBUG(3,("pipe_spnego_auth_bind_negotiate: Got secblob of size %lu\n", (unsigned long)secblob.length));
 
-       if ( got_kerberos_mechanism && ((lp_security()==SEC_ADS) || lp_use_kerberos_keytab()) ) {
-               bool ret = pipe_spnego_auth_bind_kerberos(p, rpc_in_p, pauth_info, &secblob, pout_auth);
+       if ( got_kerberos_mechanism && ((lp_security()==SEC_ADS) || USE_KERBEROS_KEYTAB) ) {
+               bool ret;
+               ret = pipe_spnego_auth_bind_kerberos(p, mem_ctx, pauth_info,
+                                                    &secblob, response);
                data_blob_free(&secblob);
-               data_blob_free(&blob);
                return ret;
        }
 
@@ -1165,6 +820,16 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
                        goto err;
                }
 
+               switch (pauth_info->auth_level) {
+                       case DCERPC_AUTH_LEVEL_INTEGRITY:
+                               auth_ntlmssp_want_sign(a);
+                               break;
+                       case DCERPC_AUTH_LEVEL_PRIVACY:
+                               auth_ntlmssp_want_seal(a);
+                               break;
+                       default:
+                               break;
+               }
                /*
                 * Pass the first security blob of data to it.
                 * This can return an error or NT_STATUS_MORE_PROCESSING_REQUIRED
@@ -1179,48 +844,37 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
                }
 
                /* Generate the response blob we need for step 2 of the bind. */
-               response = spnego_gen_auth_response(&chal, status, OID_NTLMSSP);
+               *response = spnego_gen_auth_response(&chal, status, OID_NTLMSSP);
        } else {
                /*
                 * SPNEGO negotiate down to NTLMSSP. The subsequent
                 * code to process follow-up packets is not complete
                 * yet. JRA.
                 */
-               response = spnego_gen_auth_response(NULL,
+               *response = spnego_gen_auth_response(NULL,
                                        NT_STATUS_MORE_PROCESSING_REQUIRED,
                                        OID_NTLMSSP);
        }
 
-       /* Copy the blob into the pout_auth parse struct */
-       init_rpc_hdr_auth(&auth_info, RPC_SPNEGO_AUTH_TYPE, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
-       if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-               DEBUG(0,("pipe_spnego_auth_bind_negotiate: marshalling of RPC_HDR_AUTH failed.\n"));
-               goto err;
-       }
+       /* Make sure data is bound to the memctx, to be freed the caller */
+       talloc_steal(mem_ctx, response->data);
 
-       if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
-               DEBUG(0,("pipe_spnego_auth_bind_negotiate: marshalling of data blob failed.\n"));
-               goto err;
-       }
+       /* auth_pad_len will be handled by the caller */
 
        p->auth.a_u.auth_ntlmssp_state = a;
        p->auth.auth_data_free_func = &free_pipe_ntlmssp_auth_data;
        p->auth.auth_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
 
-       data_blob_free(&blob);
        data_blob_free(&secblob);
        data_blob_free(&chal);
-       data_blob_free(&response);
 
        /* We can't set pipe_bound True yet - we need an RPC_ALTER_CONTEXT response packet... */
        return True;
 
  err:
 
-       data_blob_free(&blob);
        data_blob_free(&secblob);
        data_blob_free(&chal);
-       data_blob_free(&response);
 
        p->auth.a_u.auth_ntlmssp_state = NULL;
 
@@ -1231,20 +885,17 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
  Handle the second part of a SPNEGO bind auth.
 *******************************************************************/
 
-static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+static bool pipe_spnego_auth_bind_continue(pipes_struct *p,
+                                          TALLOC_CTX *mem_ctx,
+                                          struct dcerpc_auth *pauth_info,
+                                          DATA_BLOB *response)
 {
-       RPC_HDR_AUTH auth_info;
-       DATA_BLOB spnego_blob;
        DATA_BLOB auth_blob;
        DATA_BLOB auth_reply;
-       DATA_BLOB response;
-       AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
+       struct auth_ntlmssp_state *a = p->auth.a_u.auth_ntlmssp_state;
 
-       ZERO_STRUCT(spnego_blob);
        ZERO_STRUCT(auth_blob);
        ZERO_STRUCT(auth_reply);
-       ZERO_STRUCT(response);
 
        /*
         * NB. If we've negotiated down from krb5 to NTLMSSP we'll currently
@@ -1255,21 +906,12 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
                goto err;
        }
 
-       /* Grab the SPNEGO blob. */
-       spnego_blob = data_blob(NULL,p->hdr.auth_len);
-
-       if (!prs_copy_data_out((char *)spnego_blob.data, rpc_in_p, p->hdr.auth_len)) {
-               DEBUG(0,("pipe_spnego_auth_bind_continue: Failed to pull %u bytes - the SPNEGO auth header.\n",
-                       (unsigned int)p->hdr.auth_len ));
-               goto err;
-       }
-
-       if (spnego_blob.data[0] != ASN1_CONTEXT(1)) {
+       if (pauth_info->credentials.data[0] != ASN1_CONTEXT(1)) {
                DEBUG(0,("pipe_spnego_auth_bind_continue: invalid SPNEGO blob type.\n"));
                goto err;
        }
 
-       if (!spnego_parse_auth(spnego_blob, &auth_blob)) {
+       if (!spnego_parse_auth(pauth_info->credentials, &auth_blob)) {
                DEBUG(0,("pipe_spnego_auth_bind_continue: invalid SPNEGO blob.\n"));
                goto err;
        }
@@ -1283,26 +925,15 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
                goto err;
        }
 
-       data_blob_free(&spnego_blob);
        data_blob_free(&auth_blob);
 
        /* Generate the spnego "accept completed" blob - no incoming data. */
-       response = spnego_gen_auth_response(&auth_reply, NT_STATUS_OK, OID_NTLMSSP);
+       *response = spnego_gen_auth_response(&auth_reply, NT_STATUS_OK, OID_NTLMSSP);
 
-       /* Copy the blob into the pout_auth parse struct */
-       init_rpc_hdr_auth(&auth_info, RPC_SPNEGO_AUTH_TYPE, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
-       if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-               DEBUG(0,("pipe_spnego_auth_bind_continue: marshalling of RPC_HDR_AUTH failed.\n"));
-               goto err;
-       }
-
-       if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
-               DEBUG(0,("pipe_spnego_auth_bind_continue: marshalling of data blob failed.\n"));
-               goto err;
-       }
+       /* Make sure data is bound to the memctx, to be freed the caller */
+       talloc_steal(mem_ctx, response->data);
 
        data_blob_free(&auth_reply);
-       data_blob_free(&response);
 
        p->pipe_bound = True;
 
@@ -1310,10 +941,8 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
 
  err:
 
-       data_blob_free(&spnego_blob);
        data_blob_free(&auth_blob);
        data_blob_free(&auth_reply);
-       data_blob_free(&response);
 
        free_pipe_ntlmssp_auth_data(&p->auth);
        p->auth.a_u.auth_ntlmssp_state = NULL;
@@ -1325,50 +954,62 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
  Handle an schannel bind auth.
 *******************************************************************/
 
-static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+static bool pipe_schannel_auth_bind(pipes_struct *p,
+                                   TALLOC_CTX *mem_ctx,
+                                   struct dcerpc_auth *auth_info,
+                                   DATA_BLOB *response)
 {
-       RPC_HDR_AUTH auth_info;
-       RPC_AUTH_SCHANNEL_NEG neg;
-       RPC_AUTH_VERIFIER auth_verifier;
+       struct NL_AUTH_MESSAGE neg;
+       struct NL_AUTH_MESSAGE reply;
        bool ret;
-       struct dcinfo *pdcinfo;
-       uint32 flags;
+       NTSTATUS status;
+       struct netlogon_creds_CredentialState *creds;
        DATA_BLOB session_key;
+       enum ndr_err_code ndr_err;
 
-       if (!smb_io_rpc_auth_schannel_neg("", &neg, rpc_in_p, 0)) {
+       ndr_err = ndr_pull_struct_blob(
+                       &auth_info->credentials, mem_ctx, &neg,
+                       (ndr_pull_flags_fn_t)ndr_pull_NL_AUTH_MESSAGE);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                DEBUG(0,("pipe_schannel_auth_bind: Could not unmarshal SCHANNEL auth neg\n"));
-               return False;
+               return false;
+       }
+
+       if (DEBUGLEVEL >= 10) {
+               NDR_PRINT_DEBUG(NL_AUTH_MESSAGE, &neg);
+       }
+
+       if (!(neg.Flags & NL_FLAG_OEM_NETBIOS_COMPUTER_NAME)) {
+               DEBUG(0,("pipe_schannel_auth_bind: Did not receive netbios computer name\n"));
+               return false;
        }
 
        /*
-        * The neg.myname key here must match the remote computer name
+        * The neg.oem_netbios_computer.a key here must match the remote computer name
         * given in the DOM_CLNT_SRV.uni_comp_name used on all netlogon pipe
         * operations that use credentials.
         */
 
        become_root();
-       ret = secrets_restore_schannel_session_info(p->mem_ctx, neg.myname, &pdcinfo);
+       status = schannel_get_creds_state(p, lp_private_dir(),
+                                           neg.oem_netbios_computer.a, &creds);
        unbecome_root();
 
-       if (!ret) {
+       if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("pipe_schannel_auth_bind: Attempt to bind using schannel without successful serverauth2\n"));
                return False;
        }
 
-       p->auth.a_u.schannel_auth = talloc(p, struct schannel_auth_struct);
+       p->auth.a_u.schannel_auth = talloc(p, struct schannel_state);
        if (!p->auth.a_u.schannel_auth) {
-               TALLOC_FREE(pdcinfo);
+               TALLOC_FREE(creds);
                return False;
        }
 
-       memset(p->auth.a_u.schannel_auth->sess_key, 0, sizeof(p->auth.a_u.schannel_auth->sess_key));
-       memcpy(p->auth.a_u.schannel_auth->sess_key, pdcinfo->sess_key,
-                       sizeof(pdcinfo->sess_key));
-
-       TALLOC_FREE(pdcinfo);
-
+       p->auth.a_u.schannel_auth->state = SCHANNEL_STATE_START;
        p->auth.a_u.schannel_auth->seq_num = 0;
+       p->auth.a_u.schannel_auth->initiator = false;
+       p->auth.a_u.schannel_auth->creds = creds;
 
        /*
         * JRA. Should we also copy the schannel session key into the pipe session key p->session_key
@@ -1397,29 +1038,27 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                return false;
        }
 
-       init_rpc_hdr_auth(&auth_info, RPC_SCHANNEL_AUTH_TYPE, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
-       if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-               DEBUG(0,("pipe_schannel_auth_bind: marshalling of RPC_HDR_AUTH failed.\n"));
-               return False;
-       }
-
        /*** SCHANNEL verifier ***/
 
-       init_rpc_auth_verifier(&auth_verifier, "\001", 0x0);
-       if(!smb_io_rpc_schannel_verifier("", &auth_verifier, pout_auth, 0)) {
-               DEBUG(0,("pipe_schannel_auth_bind: marshalling of RPC_AUTH_VERIFIER failed.\n"));
-               return False;
-       }
+       reply.MessageType                       = NL_NEGOTIATE_RESPONSE;
+       reply.Flags                             = 0;
+       reply.Buffer.dummy                      = 5; /* ??? actually I don't think
+                                                     * this has any meaning
+                                                     * here - gd */
 
-       prs_align(pout_auth);
+       ndr_err = ndr_push_struct_blob(response, mem_ctx, &reply,
+                      (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"));
+               return false;
+       }
 
-       flags = 5;
-       if(!prs_uint32("flags ", pout_auth, 0, &flags)) {
-               return False;
+       if (DEBUGLEVEL >= 10) {
+               NDR_PRINT_DEBUG(NL_AUTH_MESSAGE, &reply);
        }
 
        DEBUG(10,("pipe_schannel_auth_bind: schannel auth: domain [%s] myname [%s]\n",
-               neg.domain, neg.myname));
+               neg.oem_netbios_domain.a, neg.oem_netbios_computer.a));
 
        /* We're finished with this bind - no more packets. */
        p->auth.auth_data_free_func = NULL;
@@ -1434,29 +1073,16 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
  Handle an NTLMSSP bind auth.
 *******************************************************************/
 
-static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+static bool pipe_ntlmssp_auth_bind(pipes_struct *p,
+                                  TALLOC_CTX *mem_ctx,
+                                  struct dcerpc_auth *auth_info,
+                                  DATA_BLOB *response)
 {
-       RPC_HDR_AUTH auth_info;
-        DATA_BLOB blob;
-       DATA_BLOB response;
         NTSTATUS status;
-       AUTH_NTLMSSP_STATE *a = NULL;
-
-       ZERO_STRUCT(blob);
-       ZERO_STRUCT(response);
-
-       /* Grab the NTLMSSP blob. */
-       blob = data_blob(NULL,p->hdr.auth_len);
+       struct auth_ntlmssp_state *a = NULL;
 
-       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: Failed to pull %u bytes - the NTLM auth header.\n",
-                       (unsigned int)p->hdr.auth_len ));
-               goto err;
-       }
-
-       if (strncmp((char *)blob.data, "NTLMSSP", 7) != 0) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: Failed to read NTLMSSP in blob\n"));
+       if (strncmp((char *)auth_info->credentials.data, "NTLMSSP", 7) != 0) {
+               DEBUG(0, ("Failed to read NTLMSSP in blob\n"));
                 goto err;
         }
 
@@ -1468,44 +1094,38 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                goto err;
        }
 
-       status = auth_ntlmssp_update(a, blob, &response);
+       switch (auth_info->auth_level) {
+       case DCERPC_AUTH_LEVEL_INTEGRITY:
+               auth_ntlmssp_want_sign(a);
+               break;
+       case DCERPC_AUTH_LEVEL_PRIVACY:
+               auth_ntlmssp_want_seal(a);
+               break;
+       default:
+               break;
+       }
+
+       status = auth_ntlmssp_update(a, auth_info->credentials, response);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
                DEBUG(0,("pipe_ntlmssp_auth_bind: auth_ntlmssp_update failed: %s\n",
                        nt_errstr(status) ));
                goto err;
        }
 
-       data_blob_free(&blob);
-
-       /* Copy the blob into the pout_auth parse struct */
-       init_rpc_hdr_auth(&auth_info, RPC_NTLMSSP_AUTH_TYPE, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
-       if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: marshalling of RPC_HDR_AUTH failed.\n"));
-               goto err;
-       }
-
-       if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: marshalling of data blob failed.\n"));
-               goto err;
-       }
+       /* Make sure data is bound to the memctx, to be freed the caller */
+       talloc_steal(mem_ctx, response->data);
 
        p->auth.a_u.auth_ntlmssp_state = a;
        p->auth.auth_data_free_func = &free_pipe_ntlmssp_auth_data;
        p->auth.auth_type = PIPE_AUTH_TYPE_NTLMSSP;
 
-       data_blob_free(&blob);
-       data_blob_free(&response);
-
        DEBUG(10,("pipe_ntlmssp_auth_bind: NTLMSSP auth started\n"));
 
-       /* We can't set pipe_bound True yet - we need an RPC_AUTH3 response packet... */
+       /* We can't set pipe_bound True yet - we need an DCERPC_PKT_AUTH3 response packet... */
        return True;
 
   err:
 
-       data_blob_free(&blob);
-       data_blob_free(&response);
-
        free_pipe_ntlmssp_auth_data(&p->auth);
        p->auth.a_u.auth_ntlmssp_state = NULL;
        return False;
@@ -1515,67 +1135,27 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
  Respond to a pipe bind request.
 *******************************************************************/
 
-bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
+bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt)
 {
-       RPC_HDR_BA hdr_ba;
-       RPC_HDR_RB hdr_rb;
-       RPC_HDR_AUTH auth_info;
+       struct dcerpc_auth auth_info;
        uint16 assoc_gid;
-       fstring ack_pipe_name;
-       prs_struct out_hdr_ba;
-       prs_struct out_auth;
-       prs_struct outgoing_rpc;
-       int i = 0;
-       int auth_len = 0;
-       unsigned int auth_type = RPC_ANONYMOUS_AUTH_TYPE;
+       unsigned int auth_type = DCERPC_AUTH_TYPE_NONE;
+       NTSTATUS status;
+       struct ndr_syntax_id id;
+       union dcerpc_payload u;
+       struct dcerpc_ack_ctx bind_ack_ctx;
+       DATA_BLOB auth_resp = data_blob_null;
+       DATA_BLOB auth_blob = data_blob_null;
 
        /* No rebinds on a bound pipe - use alter context. */
        if (p->pipe_bound) {
-               DEBUG(2,("api_pipe_bind_req: rejecting bind request on bound pipe %s.\n", p->pipe_srv_name));
-               return setup_bind_nak(p);
+               DEBUG(2,("api_pipe_bind_req: rejecting bind request on bound "
+                        "pipe %s.\n",
+                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
+               return setup_bind_nak(p, pkt);
        }
 
-       prs_init_empty( &outgoing_rpc, p->mem_ctx, MARSHALL);
-
-       /* 
-        * Marshall directly into the outgoing PDU space. We
-        * must do this as we need to set to the bind response
-        * header and are never sending more than one PDU here.
-        */
-
-       prs_give_memory( &outgoing_rpc, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
-
-       /*
-        * Setup the memory to marshall the ba header, and the
-        * auth footers.
-        */
-
-       if(!prs_init(&out_hdr_ba, 1024, p->mem_ctx, MARSHALL)) {
-               DEBUG(0,("api_pipe_bind_req: malloc out_hdr_ba failed.\n"));
-               prs_mem_free(&outgoing_rpc);
-               return False;
-       }
-
-       if(!prs_init(&out_auth, 1024, p->mem_ctx, MARSHALL)) {
-               DEBUG(0,("api_pipe_bind_req: malloc out_auth failed.\n"));
-               prs_mem_free(&outgoing_rpc);
-               prs_mem_free(&out_hdr_ba);
-               return False;
-       }
-
-       DEBUG(5,("api_pipe_bind_req: decode request. %d\n", __LINE__));
-
-       ZERO_STRUCT(hdr_rb);
-
-       /* decode the bind request */
-
-       if(!smb_io_rpc_hdr_rb("", &hdr_rb, rpc_in_p, 0))  {
-               DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_RB "
-                        "struct.\n"));
-               goto err_exit;
-       }
-
-       if (hdr_rb.num_contexts == 0) {
+       if (pkt->u.bind.num_contexts == 0) {
                DEBUG(0, ("api_pipe_bind_req: no rpc contexts around\n"));
                goto err_exit;
        }
@@ -1584,61 +1164,103 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
         * Try and find the correct pipe name to ensure
         * that this is a pipe name we support.
         */
+       id = pkt->u.bind.ctx_list[0].abstract_syntax;
+       if (rpc_srv_pipe_exists_by_id(&id)) {
+               DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
+                       rpc_srv_get_pipe_cli_name(&id),
+                       rpc_srv_get_pipe_srv_name(&id)));
+       } else {
+               status = smb_probe_module(
+                       "rpc", get_pipe_name_from_syntax(
+                               talloc_tos(),
+                               &pkt->u.bind.ctx_list[0].abstract_syntax));
+
+               if (NT_STATUS_IS_ERR(status)) {
+                       DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in bind request.\n",
+                                get_pipe_name_from_syntax(
+                                       talloc_tos(),
+                                       &pkt->u.bind.ctx_list[0].abstract_syntax)));
 
-       for (i = 0; i < rpc_lookup_size; i++) {
-               if (ndr_syntax_id_equal(&rpc_lookup[i].rpc_interface,
-                                       &hdr_rb.rpc_context[0].abstract)) {
+                       return setup_bind_nak(p, pkt);
+               }
+
+               if (rpc_srv_get_pipe_interface_by_cli_name(
+                               get_pipe_name_from_syntax(talloc_tos(),
+                                                         &p->syntax),
+                               &id)) {
                        DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
-                               rpc_lookup[i].pipe.clnt, rpc_lookup[i].pipe.srv));
-                       fstrcpy(p->name, rpc_lookup[i].pipe.clnt);
-                       fstrcpy(p->pipe_srv_name, rpc_lookup[i].pipe.srv);
-                       break;
+                               rpc_srv_get_pipe_cli_name(&id),
+                               rpc_srv_get_pipe_srv_name(&id)));
+               } else {
+                       DEBUG(0, ("module %s doesn't provide functions for "
+                                 "pipe %s!\n",
+                                 get_pipe_name_from_syntax(talloc_tos(),
+                                                           &p->syntax),
+                                 get_pipe_name_from_syntax(talloc_tos(),
+                                                           &p->syntax)));
+                       return setup_bind_nak(p, pkt);
                }
        }
 
-       if (i == rpc_lookup_size) {
-               if (NT_STATUS_IS_ERR(smb_probe_module("rpc", p->name))) {
-                       DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in bind request.\n",
-                                p->name ));
-                       prs_mem_free(&outgoing_rpc);
-                       prs_mem_free(&out_hdr_ba);
-                       prs_mem_free(&out_auth);
-
-                       return setup_bind_nak(p);
-                }
-
-                for (i = 0; i < rpc_lookup_size; i++) {
-                       if (strequal(rpc_lookup[i].pipe.clnt, p->name)) {
-                               DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
-                                         rpc_lookup[i].pipe.clnt, rpc_lookup[i].pipe.srv));
-                               fstrcpy(p->pipe_srv_name, rpc_lookup[i].pipe.srv);
-                               break;
-                       }
-                }
-
-               if (i == rpc_lookup_size) {
-                       DEBUG(0, ("module %s doesn't provide functions for pipe %s!\n", p->name, p->name));
-                       goto err_exit;
-               }
+       DEBUG(5,("api_pipe_bind_req: make response. %d\n", __LINE__));
+
+       if (pkt->u.bind.assoc_group_id != 0) {
+               assoc_gid = pkt->u.bind.assoc_group_id;
+       } else {
+               assoc_gid = 0x53f0;
        }
 
-       /* name has to be \PIPE\xxxxx */
-       fstrcpy(ack_pipe_name, "\\PIPE\\");
-       fstrcat(ack_pipe_name, p->pipe_srv_name);
+       /*
+        * Create the bind response struct.
+        */
+
+       /* If the requested abstract synt uuid doesn't match our client pipe,
+               reject the bind_ack & set the transfer interface synt to all 0's,
+               ver 0 (observed when NT5 attempts to bind to abstract interfaces
+               unknown to NT4)
+               Needed when adding entries to a DACL from NT5 - SK */
+
+       if (check_bind_req(p,
+                       &pkt->u.bind.ctx_list[0].abstract_syntax,
+                       &pkt->u.bind.ctx_list[0].transfer_syntaxes[0],
+                       pkt->u.bind.ctx_list[0].context_id)) {
 
-       DEBUG(5,("api_pipe_bind_req: make response. %d\n", __LINE__));
+               bind_ack_ctx.result = 0;
+               bind_ack_ctx.reason = 0;
+               bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0];
+       } else {
+               p->pipe_bound = False;
+               /* Rejection reason: abstract syntax not supported */
+               bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT;
+               bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX;
+               bind_ack_ctx.syntax = null_ndr_syntax_id;
+       }
 
        /*
         * Check if this is an authenticated bind request.
         */
+       if (pkt->auth_length) {
+               /* Quick length check. Won't catch a bad auth footer,
+                * prevents overrun. */
+
+               if (pkt->frag_length < RPC_HEADER_LEN +
+                                       DCERPC_AUTH_TRAILER_LENGTH +
+                                       pkt->auth_length) {
+                       DEBUG(0,("api_pipe_bind_req: auth_len (%u) "
+                               "too long for fragment %u.\n",
+                               (unsigned int)pkt->auth_length,
+                               (unsigned int)pkt->frag_length));
+                       goto err_exit;
+               }
 
-       if (p->hdr.auth_len) {
-               /* 
+               /*
                 * Decode the authentication verifier.
                 */
-
-               if(!smb_io_rpc_hdr_auth("", &auth_info, rpc_in_p, 0)) {
-                       DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_AUTH struct.\n"));
+               status = dcerpc_pull_dcerpc_auth(pkt,
+                                                &pkt->u.bind.auth_info,
+                                                &auth_info);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n"));
                        goto err_exit;
                }
 
@@ -1646,132 +1268,129 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
                /* Work out if we have to sign or seal etc. */
                switch (auth_info.auth_level) {
-                       case RPC_AUTH_LEVEL_INTEGRITY:
-                               p->auth.auth_level = PIPE_AUTH_LEVEL_INTEGRITY;
-                               break;
-                       case RPC_AUTH_LEVEL_PRIVACY:
-                               p->auth.auth_level = PIPE_AUTH_LEVEL_PRIVACY;
-                               break;
-                       default:
-                               DEBUG(0,("api_pipe_bind_req: unexpected auth level (%u).\n",
-                                       (unsigned int)auth_info.auth_level ));
-                               goto err_exit;
+               case DCERPC_AUTH_LEVEL_INTEGRITY:
+                       p->auth.auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+                       break;
+               case DCERPC_AUTH_LEVEL_PRIVACY:
+                       p->auth.auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
+                       break;
+               default:
+                       DEBUG(0, ("Unexpected auth level (%u).\n",
+                               (unsigned int)auth_info.auth_level ));
+                       goto err_exit;
                }
-       } else {
-               ZERO_STRUCT(auth_info);
-       }
 
-       assoc_gid = hdr_rb.bba.assoc_gid ? hdr_rb.bba.assoc_gid : 0x53f0;
-
-       switch(auth_type) {
-               case RPC_NTLMSSP_AUTH_TYPE:
-                       if (!pipe_ntlmssp_auth_bind(p, rpc_in_p, &auth_info, &out_auth)) {
+               switch (auth_type) {
+               case DCERPC_AUTH_TYPE_NTLMSSP:
+                       if (!pipe_ntlmssp_auth_bind(p, pkt,
+                                               &auth_info, &auth_resp)) {
                                goto err_exit;
                        }
                        assoc_gid = 0x7a77;
                        break;
 
-               case RPC_SCHANNEL_AUTH_TYPE:
-                       if (!pipe_schannel_auth_bind(p, rpc_in_p, &auth_info, &out_auth)) {
+               case DCERPC_AUTH_TYPE_SCHANNEL:
+                       if (!pipe_schannel_auth_bind(p, pkt,
+                                               &auth_info, &auth_resp)) {
                                goto err_exit;
                        }
                        break;
 
-               case RPC_SPNEGO_AUTH_TYPE:
-                       if (!pipe_spnego_auth_bind_negotiate(p, rpc_in_p, &auth_info, &out_auth)) {
+               case DCERPC_AUTH_TYPE_SPNEGO:
+                       if (!pipe_spnego_auth_bind_negotiate(p, pkt,
+                                               &auth_info, &auth_resp)) {
                                goto err_exit;
                        }
                        break;
 
-               case RPC_ANONYMOUS_AUTH_TYPE:
-                       /* Unauthenticated bind request. */
-                       /* We're finished - no more packets. */
-                       p->auth.auth_type = PIPE_AUTH_TYPE_NONE;
-                       /* We must set the pipe auth_level here also. */
-                       p->auth.auth_level = PIPE_AUTH_LEVEL_NONE;
-                       p->pipe_bound = True;
-                       /* The session key was initialized from the SMB
-                        * session in make_internal_rpc_pipe_p */
+               case DCERPC_AUTH_TYPE_NONE:
                        break;
 
                default:
-                       DEBUG(0,("api_pipe_bind_req: unknown auth type %x requested.\n", auth_type ));
+                       DEBUG(0, ("Unknown auth type %x requested.\n", auth_type));
                        goto err_exit;
+               }
        }
 
-       /*
-        * Create the bind response struct.
-        */
-
-       /* If the requested abstract synt uuid doesn't match our client pipe,
-               reject the bind_ack & set the transfer interface synt to all 0's,
-               ver 0 (observed when NT5 attempts to bind to abstract interfaces
-               unknown to NT4)
-               Needed when adding entries to a DACL from NT5 - SK */
-
-       if(check_bind_req(p, &hdr_rb.rpc_context[0].abstract, &hdr_rb.rpc_context[0].transfer[0],
-                               hdr_rb.rpc_context[0].context_id )) {
-               init_rpc_hdr_ba(&hdr_ba,
-                       RPC_MAX_PDU_FRAG_LEN,
-                       RPC_MAX_PDU_FRAG_LEN,
-                       assoc_gid,
-                       ack_pipe_name,
-                       0x1, 0x0, 0x0,
-                       &hdr_rb.rpc_context[0].transfer[0]);
-       } else {
-               RPC_IFACE null_interface;
-               ZERO_STRUCT(null_interface);
-               /* Rejection reason: abstract syntax not supported */
-               init_rpc_hdr_ba(&hdr_ba, RPC_MAX_PDU_FRAG_LEN,
-                                       RPC_MAX_PDU_FRAG_LEN, assoc_gid,
-                                       ack_pipe_name, 0x1, 0x2, 0x1,
-                                       &null_interface);
-               p->pipe_bound = False;
+       if (auth_type == DCERPC_AUTH_TYPE_NONE) {
+               /* Unauthenticated bind request. */
+               /* We're finished - no more packets. */
+               p->auth.auth_type = PIPE_AUTH_TYPE_NONE;
+               /* We must set the pipe auth_level here also. */
+               p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE;
+               p->pipe_bound = True;
+               /* The session key was initialized from the SMB
+                * session in make_internal_rpc_pipe_p */
        }
 
-       /*
-        * and marshall it.
-        */
+       ZERO_STRUCT(u.bind_ack);
+       u.bind_ack.max_xmit_frag = RPC_MAX_PDU_FRAG_LEN;
+       u.bind_ack.max_recv_frag = RPC_MAX_PDU_FRAG_LEN;
+       u.bind_ack.assoc_group_id = assoc_gid;
 
-       if(!smb_io_rpc_hdr_ba("", &hdr_ba, &out_hdr_ba, 0)) {
-               DEBUG(0,("api_pipe_bind_req: marshalling of RPC_HDR_BA failed.\n"));
+       /* name has to be \PIPE\xxxxx */
+       u.bind_ack.secondary_address =
+                       talloc_asprintf(pkt, "\\PIPE\\%s",
+                                       rpc_srv_get_pipe_srv_name(&id));
+       if (!u.bind_ack.secondary_address) {
+               DEBUG(0, ("Out of memory!\n"));
                goto err_exit;
        }
+       u.bind_ack.secondary_address_size =
+                               strlen(u.bind_ack.secondary_address) + 1;
 
-       /*
-        * Create the header, now we know the length.
-        */
-
-       if (prs_offset(&out_auth)) {
-               auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
-       }
+       u.bind_ack.num_results = 1;
+       u.bind_ack.ctx_list = &bind_ack_ctx;
 
-       init_rpc_hdr(&p->hdr, RPC_BINDACK, RPC_FLG_FIRST | RPC_FLG_LAST,
-                       p->hdr.call_id,
-                       RPC_HEADER_LEN + prs_offset(&out_hdr_ba) + prs_offset(&out_auth),
-                       auth_len);
+       /* NOTE: We leave the auth_info empty so we can calculate the padding
+        * later and then append the auth_info --simo */
 
        /*
-        * Marshall the header into the outgoing PDU.
+        * Marshall directly into the outgoing PDU space. We
+        * must do this as we need to set to the bind response
+        * header and are never sending more than one PDU here.
         */
 
-       if(!smb_io_rpc_hdr("", &p->hdr, &outgoing_rpc, 0)) {
-               DEBUG(0,("api_pipe_bind_req: marshalling of RPC_HDR failed.\n"));
-               goto err_exit;
+       status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                         DCERPC_PKT_BIND_ACK,
+                                         DCERPC_PFC_FLAG_FIRST |
+                                               DCERPC_PFC_FLAG_LAST,
+                                         auth_resp.length,
+                                         pkt->call_id,
+                                         &u,
+                                         &p->out_data.frag);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed to marshall bind_ack packet. (%s)\n",
+                         nt_errstr(status)));
        }
 
-       /*
-        * Now add the RPC_HDR_BA and any auth needed.
-        */
+       if (auth_resp.length) {
 
-       if(!prs_append_prs_data( &outgoing_rpc, &out_hdr_ba)) {
-               DEBUG(0,("api_pipe_bind_req: append of RPC_HDR_BA failed.\n"));
-               goto err_exit;
+               status = dcerpc_push_dcerpc_auth(pkt,
+                                                auth_type,
+                                                auth_info.auth_level,
+                                                0,
+                                                1, /* auth_context_id */
+                                                &auth_resp,
+                                                &auth_blob);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("Marshalling of dcerpc_auth failed.\n"));
+                       goto err_exit;
+               }
        }
 
-       if (auth_len && !prs_append_prs_data( &outgoing_rpc, &out_auth)) {
-               DEBUG(0,("api_pipe_bind_req: append of auth info failed.\n"));
-               goto err_exit;
+       /* Now that we have the auth len store it into the right place in
+        * the dcerpc header */
+       dcerpc_set_frag_length(&p->out_data.frag,
+                               p->out_data.frag.length + auth_blob.length);
+
+       if (auth_blob.length) {
+
+               if (!data_blob_append(p->mem_ctx, &p->out_data.frag,
+                                       auth_blob.data, auth_blob.length)) {
+                       DEBUG(0, ("Append of auth info failed.\n"));
+                       goto err_exit;
+               }
        }
 
        /*
@@ -1779,20 +1398,16 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
         */
 
        p->out_data.data_sent_length = 0;
-       p->out_data.current_pdu_len = prs_offset(&outgoing_rpc);
        p->out_data.current_pdu_sent = 0;
 
-       prs_mem_free(&out_hdr_ba);
-       prs_mem_free(&out_auth);
-
+       TALLOC_FREE(auth_blob.data);
        return True;
 
   err_exit:
 
-       prs_mem_free(&outgoing_rpc);
-       prs_mem_free(&out_hdr_ba);
-       prs_mem_free(&out_auth);
-       return setup_bind_nak(p);
+       data_blob_free(&p->out_data.frag);
+       TALLOC_FREE(auth_blob.data);
+       return setup_bind_nak(p, pkt);
 }
 
 /****************************************************************************
@@ -1800,170 +1415,181 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
  SPNEGO calls.
 ****************************************************************************/
 
-bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
+bool api_pipe_alter_context(pipes_struct *p, struct ncacn_packet *pkt)
 {
-       RPC_HDR_BA hdr_ba;
-       RPC_HDR_RB hdr_rb;
-       RPC_HDR_AUTH auth_info;
+       struct dcerpc_auth auth_info;
        uint16 assoc_gid;
-       fstring ack_pipe_name;
-       prs_struct out_hdr_ba;
-       prs_struct out_auth;
-       prs_struct outgoing_rpc;
-       int auth_len = 0;
-
-       prs_init_empty( &outgoing_rpc, p->mem_ctx, MARSHALL);
+       NTSTATUS status;
+       union dcerpc_payload u;
+       struct dcerpc_ack_ctx bind_ack_ctx;
+       DATA_BLOB auth_resp = data_blob_null;
+       DATA_BLOB auth_blob = data_blob_null;
+       int pad_len = 0;
 
-       /* 
-        * Marshall directly into the outgoing PDU space. We
-        * must do this as we need to set to the bind response
-        * header and are never sending more than one PDU here.
-        */
+       DEBUG(5,("api_pipe_alter_context: make response. %d\n", __LINE__));
 
-       prs_give_memory( &outgoing_rpc, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
+       if (pkt->u.bind.assoc_group_id != 0) {
+               assoc_gid = pkt->u.bind.assoc_group_id;
+       } else {
+               assoc_gid = 0x53f0;
+       }
 
        /*
-        * Setup the memory to marshall the ba header, and the
-        * auth footers.
+        * Create the bind response struct.
         */
 
-       if(!prs_init(&out_hdr_ba, 1024, p->mem_ctx, MARSHALL)) {
-               DEBUG(0,("api_pipe_alter_context: malloc out_hdr_ba failed.\n"));
-               prs_mem_free(&outgoing_rpc);
-               return False;
-       }
-
-       if(!prs_init(&out_auth, 1024, p->mem_ctx, MARSHALL)) {
-               DEBUG(0,("api_pipe_alter_context: malloc out_auth failed.\n"));
-               prs_mem_free(&outgoing_rpc);
-               prs_mem_free(&out_hdr_ba);
-               return False;
-       }
+       /* If the requested abstract synt uuid doesn't match our client pipe,
+               reject the bind_ack & set the transfer interface synt to all 0's,
+               ver 0 (observed when NT5 attempts to bind to abstract interfaces
+               unknown to NT4)
+               Needed when adding entries to a DACL from NT5 - SK */
 
-       DEBUG(5,("api_pipe_alter_context: decode request. %d\n", __LINE__));
+       if (check_bind_req(p,
+                       &pkt->u.bind.ctx_list[0].abstract_syntax,
+                       &pkt->u.bind.ctx_list[0].transfer_syntaxes[0],
+                       pkt->u.bind.ctx_list[0].context_id)) {
 
-       /* decode the alter context request */
-       if(!smb_io_rpc_hdr_rb("", &hdr_rb, rpc_in_p, 0))  {
-               DEBUG(0,("api_pipe_alter_context: unable to unmarshall RPC_HDR_RB struct.\n"));
-               goto err_exit;
+               bind_ack_ctx.result = 0;
+               bind_ack_ctx.reason = 0;
+               bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0];
+       } else {
+               p->pipe_bound = False;
+               /* Rejection reason: abstract syntax not supported */
+               bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT;
+               bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX;
+               bind_ack_ctx.syntax = null_ndr_syntax_id;
        }
 
-       /* secondary address CAN be NULL
-        * as the specs say it's ignored.
-        * It MUST be NULL to have the spoolss working.
-        */
-       fstrcpy(ack_pipe_name,"");
-
-       DEBUG(5,("api_pipe_alter_context: make response. %d\n", __LINE__));
-
        /*
         * Check if this is an authenticated alter context request.
         */
+       if (pkt->auth_length) {
+               /* Quick length check. Won't catch a bad auth footer,
+                * prevents overrun. */
+
+               if (pkt->frag_length < RPC_HEADER_LEN +
+                                       DCERPC_AUTH_TRAILER_LENGTH +
+                                       pkt->auth_length) {
+                       DEBUG(0,("api_pipe_alter_context: auth_len (%u) "
+                               "too long for fragment %u.\n",
+                               (unsigned int)pkt->auth_length,
+                               (unsigned int)pkt->frag_length ));
+                       goto err_exit;
+               }
 
-       if (p->hdr.auth_len != 0) {
-               /* 
-                * Decode the authentication verifier.
-                */
-
-               if(!smb_io_rpc_hdr_auth("", &auth_info, rpc_in_p, 0)) {
-                       DEBUG(0,("api_pipe_alter_context: unable to unmarshall RPC_HDR_AUTH struct.\n"));
+               status = dcerpc_pull_dcerpc_auth(pkt,
+                                                &pkt->u.bind.auth_info,
+                                                &auth_info);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n"));
                        goto err_exit;
                }
 
+
                /*
                 * Currently only the SPNEGO auth type uses the alter ctx
                 * response in place of the NTLMSSP auth3 type.
                 */
 
-               if (auth_info.auth_type == RPC_SPNEGO_AUTH_TYPE) {
+               if (auth_info.auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
                        /* We can only finish if the pipe is unbound. */
                        if (!p->pipe_bound) {
-                               if (!pipe_spnego_auth_bind_continue(p, rpc_in_p, &auth_info, &out_auth)) {
+                               if (!pipe_spnego_auth_bind_continue(p, pkt,
+                                               &auth_info, &auth_resp)) {
                                        goto err_exit;
                                }
+
                        } else {
                                goto err_exit;
                        }
                }
-       } else {
-               ZERO_STRUCT(auth_info);
        }
 
-       assoc_gid = hdr_rb.bba.assoc_gid ? hdr_rb.bba.assoc_gid : 0x53f0;
+       ZERO_STRUCT(u.alter_resp);
+       u.alter_resp.max_xmit_frag = RPC_MAX_PDU_FRAG_LEN;
+       u.alter_resp.max_recv_frag = RPC_MAX_PDU_FRAG_LEN;
+       u.alter_resp.assoc_group_id = assoc_gid;
 
-       /*
-        * Create the bind response struct.
+       /* secondary address CAN be NULL
+        * as the specs say it's ignored.
+        * It MUST be NULL to have the spoolss working.
         */
+       u.alter_resp.secondary_address = "";
+       u.alter_resp.secondary_address_size = 1;
 
-       /* If the requested abstract synt uuid doesn't match our client pipe,
-               reject the bind_ack & set the transfer interface synt to all 0's,
-               ver 0 (observed when NT5 attempts to bind to abstract interfaces
-               unknown to NT4)
-               Needed when adding entries to a DACL from NT5 - SK */
-
-       if(check_bind_req(p, &hdr_rb.rpc_context[0].abstract, &hdr_rb.rpc_context[0].transfer[0],
-                               hdr_rb.rpc_context[0].context_id )) {
-               init_rpc_hdr_ba(&hdr_ba,
-                       RPC_MAX_PDU_FRAG_LEN,
-                       RPC_MAX_PDU_FRAG_LEN,
-                       assoc_gid,
-                       ack_pipe_name,
-                       0x1, 0x0, 0x0,
-                       &hdr_rb.rpc_context[0].transfer[0]);
-       } else {
-               RPC_IFACE null_interface;
-               ZERO_STRUCT(null_interface);
-               /* Rejection reason: abstract syntax not supported */
-               init_rpc_hdr_ba(&hdr_ba, RPC_MAX_PDU_FRAG_LEN,
-                                       RPC_MAX_PDU_FRAG_LEN, assoc_gid,
-                                       ack_pipe_name, 0x1, 0x2, 0x1,
-                                       &null_interface);
-               p->pipe_bound = False;
-       }
-
-       /*
-        * and marshall it.
-        */
+       u.alter_resp.num_results = 1;
+       u.alter_resp.ctx_list = &bind_ack_ctx;
 
-       if(!smb_io_rpc_hdr_ba("", &hdr_ba, &out_hdr_ba, 0)) {
-               DEBUG(0,("api_pipe_alter_context: marshalling of RPC_HDR_BA failed.\n"));
-               goto err_exit;
-       }
+       /* NOTE: We leave the auth_info empty so we can calculate the padding
+        * later and then append the auth_info --simo */
 
        /*
-        * Create the header, now we know the length.
+        * Marshall directly into the outgoing PDU space. We
+        * must do this as we need to set to the bind response
+        * header and are never sending more than one PDU here.
         */
 
-       if (prs_offset(&out_auth)) {
-               auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
+       status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                         DCERPC_PKT_ALTER_RESP,
+                                         DCERPC_PFC_FLAG_FIRST |
+                                               DCERPC_PFC_FLAG_LAST,
+                                         auth_resp.length,
+                                         pkt->call_id,
+                                         &u,
+                                         &p->out_data.frag);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed to marshall bind_ack packet. (%s)\n",
+                         nt_errstr(status)));
        }
 
-       init_rpc_hdr(&p->hdr, RPC_ALTCONTRESP, RPC_FLG_FIRST | RPC_FLG_LAST,
-                       p->hdr.call_id,
-                       RPC_HEADER_LEN + prs_offset(&out_hdr_ba) + prs_offset(&out_auth),
-                       auth_len);
+       if (auth_resp.length) {
 
-       /*
-        * Marshall the header into the outgoing PDU.
-        */
+               /* Work out any padding needed before the auth footer. */
+               pad_len = p->out_data.frag.length % SERVER_NDR_PADDING_SIZE;
+               if (pad_len) {
+                       pad_len = SERVER_NDR_PADDING_SIZE - pad_len;
+                       DEBUG(10, ("auth pad_len = %u\n",
+                                  (unsigned int)pad_len));
+               }
 
-       if(!smb_io_rpc_hdr("", &p->hdr, &outgoing_rpc, 0)) {
-               DEBUG(0,("api_pipe_alter_context: marshalling of RPC_HDR failed.\n"));
-               goto err_exit;
+               status = dcerpc_push_dcerpc_auth(pkt,
+                                                auth_info.auth_type,
+                                                auth_info.auth_level,
+                                                pad_len,
+                                                1, /* auth_context_id */
+                                                &auth_resp,
+                                                &auth_blob);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("Marshalling of dcerpc_auth failed.\n"));
+                       goto err_exit;
+               }
        }
 
-       /*
-        * Now add the RPC_HDR_BA and any auth needed.
-        */
-
-       if(!prs_append_prs_data( &outgoing_rpc, &out_hdr_ba)) {
-               DEBUG(0,("api_pipe_alter_context: append of RPC_HDR_BA failed.\n"));
-               goto err_exit;
-       }
+       /* Now that we have the auth len store it into the right place in
+        * the dcerpc header */
+       dcerpc_set_frag_length(&p->out_data.frag,
+                               p->out_data.frag.length +
+                                       pad_len + auth_blob.length);
+
+       if (auth_resp.length) {
+               if (pad_len) {
+                       char pad[SERVER_NDR_PADDING_SIZE];
+                       memset(pad, '\0', SERVER_NDR_PADDING_SIZE);
+                       if (!data_blob_append(p->mem_ctx,
+                                               &p->out_data.frag,
+                                               pad, pad_len)) {
+                               DEBUG(0, ("api_pipe_bind_req: failed to add "
+                                         "%u bytes of pad data.\n",
+                                         (unsigned int)pad_len));
+                               goto err_exit;
+                       }
+               }
 
-       if (auth_len && !prs_append_prs_data( &outgoing_rpc, &out_auth)) {
-               DEBUG(0,("api_pipe_alter_context: append of auth info failed.\n"));
-               goto err_exit;
+               if (!data_blob_append(p->mem_ctx, &p->out_data.frag,
+                                       auth_blob.data, auth_blob.length)) {
+                       DEBUG(0, ("Append of auth info failed.\n"));
+                       goto err_exit;
+               }
        }
 
        /*
@@ -1971,227 +1597,16 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
         */
 
        p->out_data.data_sent_length = 0;
-       p->out_data.current_pdu_len = prs_offset(&outgoing_rpc);
        p->out_data.current_pdu_sent = 0;
 
-       prs_mem_free(&out_hdr_ba);
-       prs_mem_free(&out_auth);
-
+       TALLOC_FREE(auth_blob.data);
        return True;
 
   err_exit:
 
-       prs_mem_free(&outgoing_rpc);
-       prs_mem_free(&out_hdr_ba);
-       prs_mem_free(&out_auth);
-       return setup_bind_nak(p);
-}
-
-/****************************************************************************
- Deal with NTLMSSP sign & seal processing on an RPC request.
-****************************************************************************/
-
-bool api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
-                                       uint32 *p_ss_padding_len, NTSTATUS *pstatus)
-{
-       RPC_HDR_AUTH auth_info;
-       uint32 auth_len = p->hdr.auth_len;
-       uint32 save_offset = prs_offset(rpc_in);
-       AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
-       unsigned char *data = NULL;
-       size_t data_len;
-       unsigned char *full_packet_data = NULL;
-       size_t full_packet_data_len;
-       DATA_BLOB auth_blob;
-       
-       *pstatus = NT_STATUS_OK;
-
-       if (p->auth.auth_level == PIPE_AUTH_LEVEL_NONE || p->auth.auth_level == PIPE_AUTH_LEVEL_CONNECT) {
-               return True;
-       }
-
-       if (!a) {
-               *pstatus = NT_STATUS_INVALID_PARAMETER;
-               return False;
-       }
-
-       /* Ensure there's enough data for an authenticated request. */
-       if ((auth_len > RPC_MAX_SIGN_SIZE) ||
-                       (RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_HDR_AUTH_LEN + auth_len > p->hdr.frag_len)) {
-               DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_len %u is too large.\n",
-                       (unsigned int)auth_len ));
-               *pstatus = NT_STATUS_INVALID_PARAMETER;
-               return False;
-       }
-
-       /*
-        * We need the full packet data + length (minus auth stuff) as well as the packet data + length
-        * after the RPC header. 
-        * We need to pass in the full packet (minus auth len) to the NTLMSSP sign and check seal
-        * functions as NTLMv2 checks the rpc headers also.
-        */
-
-       data = (unsigned char *)(prs_data_p(rpc_in) + RPC_HDR_REQ_LEN);
-       data_len = (size_t)(p->hdr.frag_len - RPC_HEADER_LEN - RPC_HDR_REQ_LEN - RPC_HDR_AUTH_LEN - auth_len);
-
-       full_packet_data = p->in_data.current_in_pdu;
-       full_packet_data_len = p->hdr.frag_len - auth_len;
-
-       /* Pull the auth header and the following data into a blob. */
-       if(!prs_set_offset(rpc_in, RPC_HDR_REQ_LEN + data_len)) {
-               DEBUG(0,("api_pipe_ntlmssp_auth_process: cannot move offset to %u.\n",
-                       (unsigned int)RPC_HDR_REQ_LEN + (unsigned int)data_len ));
-               *pstatus = NT_STATUS_INVALID_PARAMETER;
-               return False;
-       }
-
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, rpc_in, 0)) {
-               DEBUG(0,("api_pipe_ntlmssp_auth_process: failed to unmarshall RPC_HDR_AUTH.\n"));
-               *pstatus = NT_STATUS_INVALID_PARAMETER;
-               return False;
-       }
-
-       auth_blob.data = (unsigned char *)prs_data_p(rpc_in) + prs_offset(rpc_in);
-       auth_blob.length = auth_len;
-       
-       switch (p->auth.auth_level) {
-               case PIPE_AUTH_LEVEL_PRIVACY:
-                       /* Data is encrypted. */
-                       *pstatus = ntlmssp_unseal_packet(a->ntlmssp_state,
-                                                       data, data_len,
-                                                       full_packet_data,
-                                                       full_packet_data_len,
-                                                       &auth_blob);
-                       if (!NT_STATUS_IS_OK(*pstatus)) {
-                               return False;
-                       }
-                       break;
-               case PIPE_AUTH_LEVEL_INTEGRITY:
-                       /* Data is signed. */
-                       *pstatus = ntlmssp_check_packet(a->ntlmssp_state,
-                                                       data, data_len,
-                                                       full_packet_data,
-                                                       full_packet_data_len,
-                                                       &auth_blob);
-                       if (!NT_STATUS_IS_OK(*pstatus)) {
-                               return False;
-                       }
-                       break;
-               default:
-                       *pstatus = NT_STATUS_INVALID_PARAMETER;
-                       return False;
-       }
-
-       /*
-        * Return the current pointer to the data offset.
-        */
-
-       if(!prs_set_offset(rpc_in, save_offset)) {
-               DEBUG(0,("api_pipe_auth_process: failed to set offset back to %u\n",
-                       (unsigned int)save_offset ));
-               *pstatus = NT_STATUS_INVALID_PARAMETER;
-               return False;
-       }
-
-       /*
-        * Remember the padding length. We must remove it from the real data
-        * stream once the sign/seal is done.
-        */
-
-       *p_ss_padding_len = auth_info.auth_pad_len;
-
-       return True;
-}
-
-/****************************************************************************
- Deal with schannel processing on an RPC request.
-****************************************************************************/
-
-bool api_pipe_schannel_process(pipes_struct *p, prs_struct *rpc_in, uint32 *p_ss_padding_len)
-{
-       uint32 data_len;
-       uint32 auth_len;
-       uint32 save_offset = prs_offset(rpc_in);
-       RPC_HDR_AUTH auth_info;
-       RPC_AUTH_SCHANNEL_CHK schannel_chk;
-
-       auth_len = p->hdr.auth_len;
-
-       if (auth_len != RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN) {
-               DEBUG(0,("Incorrect auth_len %u.\n", (unsigned int)auth_len ));
-               return False;
-       }
-
-       /*
-        * The following is that length of the data we must verify or unseal.
-        * This doesn't include the RPC headers or the auth_len or the RPC_HDR_AUTH_LEN
-        * preceeding the auth_data.
-        */
-
-       if (p->hdr.frag_len < RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_HDR_AUTH_LEN + auth_len) {
-               DEBUG(0,("Incorrect frag %u, auth %u.\n",
-                       (unsigned int)p->hdr.frag_len,
-                       (unsigned int)auth_len ));
-               return False;
-       }
-
-       data_len = p->hdr.frag_len - RPC_HEADER_LEN - RPC_HDR_REQ_LEN - 
-               RPC_HDR_AUTH_LEN - auth_len;
-       
-       DEBUG(5,("data %d auth %d\n", data_len, auth_len));
-
-       if(!prs_set_offset(rpc_in, RPC_HDR_REQ_LEN + data_len)) {
-               DEBUG(0,("cannot move offset to %u.\n",
-                        (unsigned int)RPC_HDR_REQ_LEN + data_len ));
-               return False;
-       }
-
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, rpc_in, 0)) {
-               DEBUG(0,("failed to unmarshall RPC_HDR_AUTH.\n"));
-               return False;
-       }
-
-       if (auth_info.auth_type != RPC_SCHANNEL_AUTH_TYPE) {
-               DEBUG(0,("Invalid auth info %d on schannel\n",
-                        auth_info.auth_type));
-               return False;
-       }
-
-       if(!smb_io_rpc_auth_schannel_chk("", RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN, &schannel_chk, rpc_in, 0)) {
-               DEBUG(0,("failed to unmarshal RPC_AUTH_SCHANNEL_CHK.\n"));
-               return False;
-       }
-
-       if (!schannel_decode(p->auth.a_u.schannel_auth,
-                          p->auth.auth_level,
-                          SENDER_IS_INITIATOR,
-                          &schannel_chk,
-                          prs_data_p(rpc_in)+RPC_HDR_REQ_LEN, data_len)) {
-               DEBUG(3,("failed to decode PDU\n"));
-               return False;
-       }
-
-       /*
-        * Return the current pointer to the data offset.
-        */
-
-       if(!prs_set_offset(rpc_in, save_offset)) {
-               DEBUG(0,("failed to set offset back to %u\n",
-                        (unsigned int)save_offset ));
-               return False;
-       }
-
-       /* The sequence number gets incremented on both send and receive. */
-       p->auth.a_u.schannel_auth->seq_num++;
-
-       /*
-        * Remember the padding length. We must remove it from the real data
-        * stream once the sign/seal is done.
-        */
-
-       *p_ss_padding_len = auth_info.auth_pad_len;
-
-       return True;
+       data_blob_free(&p->out_data.frag);
+       TALLOC_FREE(auth_blob.data);
+       return setup_bind_nak(p, pkt);
 }
 
 /****************************************************************************
@@ -2201,21 +1616,17 @@ bool api_pipe_schannel_process(pipes_struct *p, prs_struct *rpc_in, uint32 *p_ss
 static PIPE_RPC_FNS* find_pipe_fns_by_context( PIPE_RPC_FNS *list, uint32 context_id )
 {
        PIPE_RPC_FNS *fns = NULL;
-       PIPE_RPC_FNS *tmp = NULL;
-       
+
        if ( !list ) {
                DEBUG(0,("find_pipe_fns_by_context: ERROR!  No context list for pipe!\n"));
                return NULL;
        }
-       
-       for (tmp=list; tmp; tmp=tmp->next ) {
-               if ( tmp->context_id == context_id )
-                       break;
+
+       for (fns=list; fns; fns=fns->next ) {
+               if ( fns->context_id == context_id )
+                       return fns;
        }
-       
-       fns = tmp;
-       
-       return fns;
+       return NULL;
 }
 
 /****************************************************************************
@@ -2226,7 +1637,7 @@ void free_pipe_rpc_context( PIPE_RPC_FNS *list )
 {
        PIPE_RPC_FNS *tmp = list;
        PIPE_RPC_FNS *tmp2;
-               
+
        while (tmp) {
                tmp2 = tmp->next;
                SAFE_FREE(tmp);
@@ -2236,7 +1647,7 @@ void free_pipe_rpc_context( PIPE_RPC_FNS *list )
        return; 
 }
 
-static bool api_rpcTNP(pipes_struct *p, const char *rpc_name, 
+static bool api_rpcTNP(pipes_struct *p, struct ncacn_packet *pkt,
                       const struct api_struct *api_rpc_cmds, int n_cmds);
 
 /****************************************************************************
@@ -2245,36 +1656,41 @@ static bool api_rpcTNP(pipes_struct *p, const char *rpc_name,
  before doing the call.
 ****************************************************************************/
 
-bool api_pipe_request(pipes_struct *p)
+bool api_pipe_request(pipes_struct *p, struct ncacn_packet *pkt)
 {
        bool ret = False;
        bool changed_user = False;
        PIPE_RPC_FNS *pipe_fns;
-       
+
        if (p->pipe_bound &&
                        ((p->auth.auth_type == PIPE_AUTH_TYPE_NTLMSSP) ||
                         (p->auth.auth_type == PIPE_AUTH_TYPE_SPNEGO_NTLMSSP))) {
                if(!become_authenticated_pipe_user(p)) {
-                       prs_mem_free(&p->out_data.rdata);
+                       data_blob_free(&p->out_data.rdata);
                        return False;
                }
                changed_user = True;
        }
 
-       DEBUG(5, ("Requested \\PIPE\\%s\n", p->name));
-       
+       DEBUG(5, ("Requested \\PIPE\\%s\n",
+                 get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
+
        /* get the set of RPC functions for this context */
-       
-       pipe_fns = find_pipe_fns_by_context(p->contexts, p->hdr_req.context_id);
-       
+
+       pipe_fns = find_pipe_fns_by_context(p->contexts,
+                                           pkt->u.request.context_id);
+
        if ( pipe_fns ) {
                TALLOC_CTX *frame = talloc_stackframe();
-               ret = api_rpcTNP(p, p->name, pipe_fns->cmds, pipe_fns->n_cmds);
+               ret = api_rpcTNP(p, pkt, pipe_fns->cmds, pipe_fns->n_cmds);
                TALLOC_FREE(frame);
        }
        else {
-               DEBUG(0,("api_pipe_request: No rpc function table associated with context [%d] on pipe [%s]\n",
-                       p->hdr_req.context_id, p->name));
+               DEBUG(0, ("No rpc function table associated with context "
+                         "[%d] on pipe [%s]\n",
+                         pkt->u.request.context_id,
+                         get_pipe_name_from_syntax(talloc_tos(),
+                                                   &p->syntax)));
        }
 
        if (changed_user) {
@@ -2288,22 +1704,31 @@ bool api_pipe_request(pipes_struct *p)
  Calls the underlying RPC function for a named pipe.
  ********************************************************************/
 
-static bool api_rpcTNP(pipes_struct *p, const char *rpc_name, 
+static bool api_rpcTNP(pipes_struct *p, struct ncacn_packet *pkt,
                       const struct api_struct *api_rpc_cmds, int n_cmds)
 {
        int fn_num;
-       fstring name;
-       uint32 offset1, offset2;
+       uint32_t offset1;
+
        /* interpret the command */
-       DEBUG(4,("api_rpcTNP: %s op 0x%x - ", rpc_name, p->hdr_req.opnum));
+       DEBUG(4,("api_rpcTNP: %s op 0x%x - ",
+                get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
+                pkt->u.request.opnum));
 
-       slprintf(name, sizeof(name)-1, "in_%s", rpc_name);
-       prs_dump(name, p->hdr_req.opnum, &p->in_data.data);
+       if (DEBUGLEVEL >= 50) {
+               fstring name;
+               slprintf(name, sizeof(name)-1, "in_%s",
+                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
+               prs_dump_region(name, pkt->u.request.opnum,
+                               p->in_data.data.data, 0,
+                               p->in_data.data.length);
+       }
 
        for (fn_num = 0; fn_num < n_cmds; fn_num++) {
-               if (api_rpc_cmds[fn_num].opnum == p->hdr_req.opnum && api_rpc_cmds[fn_num].fn != NULL) {
-                       DEBUG(3,("api_rpcTNP: rpc command: %s\n", api_rpc_cmds[fn_num].name));
+               if (api_rpc_cmds[fn_num].opnum == pkt->u.request.opnum &&
+                   api_rpc_cmds[fn_num].fn != NULL) {
+                       DEBUG(3, ("api_rpcTNP: rpc command: %s\n",
+                                 api_rpc_cmds[fn_num].name));
                        break;
                }
        }
@@ -2319,14 +1744,16 @@ static bool api_rpcTNP(pipes_struct *p, const char *rpc_name,
                return True;
        }
 
-       offset1 = prs_offset(&p->out_data.rdata);
+       offset1 = p->out_data.rdata.length;
 
         DEBUG(6, ("api_rpc_cmds[%d].fn == %p\n", 
                 fn_num, api_rpc_cmds[fn_num].fn));
        /* do the actual command */
        if(!api_rpc_cmds[fn_num].fn(p)) {
-               DEBUG(0,("api_rpcTNP: %s: %s failed.\n", rpc_name, api_rpc_cmds[fn_num].name));
-               prs_mem_free(&p->out_data.rdata);
+               DEBUG(0,("api_rpcTNP: %s: %s failed.\n",
+                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
+                        api_rpc_cmds[fn_num].name));
+               data_blob_free(&p->out_data.rdata);
                return False;
        }
 
@@ -2344,27 +1771,25 @@ static bool api_rpcTNP(pipes_struct *p, const char *rpc_name,
                return True;
        }
 
-       slprintf(name, sizeof(name)-1, "out_%s", rpc_name);
-       offset2 = prs_offset(&p->out_data.rdata);
-       prs_set_offset(&p->out_data.rdata, offset1);
-       prs_dump(name, p->hdr_req.opnum, &p->out_data.rdata);
-       prs_set_offset(&p->out_data.rdata, offset2);
+       if (DEBUGLEVEL >= 50) {
+               fstring name;
+               slprintf(name, sizeof(name)-1, "out_%s",
+                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
+               prs_dump_region(name, pkt->u.request.opnum,
+                               p->out_data.rdata.data,
+                               offset1,
+                               p->out_data.rdata.length);
+       }
 
-       DEBUG(5,("api_rpcTNP: called %s successfully\n", rpc_name));
+       DEBUG(5,("api_rpcTNP: called %s successfully\n",
+                get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
 
        /* Check for buffer underflow in rpc parsing */
-
-       if ((DEBUGLEVEL >= 10) && 
-           (prs_offset(&p->in_data.data) != prs_data_size(&p->in_data.data))) {
-               size_t data_len = prs_data_size(&p->in_data.data) - prs_offset(&p->in_data.data);
-               char *data = (char *)SMB_MALLOC(data_len);
-
+       if ((DEBUGLEVEL >= 10) &&
+           (pkt->frag_length < p->in_data.data.length)) {
                DEBUG(10, ("api_rpcTNP: rpc input buffer underflow (parse error?)\n"));
-               if (data) {
-                       prs_uint8s(False, "", &p->in_data.data, 0, (unsigned char *)data, (uint32)data_len);
-                       SAFE_FREE(data);
-               }
-
+               dump_data(10, p->in_data.data.data + pkt->frag_length,
+                             p->in_data.data.length - pkt->frag_length);
        }
 
        return True;