s3-dcerpc: consolidate respones packet creation code
[kamenim/samba.git] / source3 / rpc_server / srv_pipe.c
index cdb59ade80ad7d01c20b17cd70f29f7ca02fa1ea..6b8514136725f981ba68ead161235123c21e5108 100644 (file)
@@ -53,625 +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)
 {
-       DATA_BLOB hdr;
-       uint8_t hdr_flags;
-       RPC_HDR_RESP hdr_resp;
-       uint32 ss_padding_len = 0;
-       uint32 data_space_available;
-       uint32 data_len_left;
-       uint32 data_len;
+       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;
-       struct auth_ntlmssp_state *a = p->auth.a_u.auth_ntlmssp_state;
-       TALLOC_CTX *frame;
-
-       /*
-        * 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));
-
-       /* Set up rpc header flags. */
-       if (p->out_data.data_sent_length == 0) {
-               hdr_flags = DCERPC_PFC_FLAG_FIRST;
-       } else {
-               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;
-       }
-
-       /* Space available - not including padding. */
-       data_space_available = RPC_MAX_PDU_FRAG_LEN - 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.
+       /* FIXME: Is this right ?
+        * Keeping only to avoid changing semantics during refactoring
+        * --simo
         */
-
-       data_len = MIN(data_len_left, data_space_available);
-
-       /* Work out any padding alignment requirements. */
-       if ((RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len) % SERVER_NDR_PADDING_SIZE) {
-               ss_padding_len = SERVER_NDR_PADDING_SIZE -
-                       ((RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len) % SERVER_NDR_PADDING_SIZE);
-               DEBUG(10,("create_next_pdu_ntlmssp: adding sign/seal padding of %u\n",
-                       ss_padding_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 + ss_padding_len > data_space_available) {
-                       data_len -= SERVER_NDR_PADDING_SIZE;
-               }
+       if (auth_level != DCERPC_AUTH_LEVEL_PRIVACY) {
+               auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
        }
 
-       /*
-        * Set up the alloc hint. This should be the data left to
-        * send.
-        */
+       /* 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;
 
-       hdr_resp.alloc_hint = data_len_left;
+       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;
 
-       /*
-        * Work out if this PDU will be the last.
-        */
-       if (p->out_data.data_sent_length + data_len >=
-                                       prs_offset(&p->out_data.rdata)) {
-               hdr_flags |= DCERPC_PFC_FLAG_LAST;
+       default:
+               status = NT_STATUS_INTERNAL_ERROR;
+               return false;
        }
 
-       /*
-        * Init the parse struct to point at the outgoing
-        * data.
-        */
-       prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL);
-
-       status = dcerpc_push_ncacn_packet_header(
-                               prs_get_mem_context(&p->out_data.frag),
-                               DCERPC_PKT_RESPONSE,
-                               hdr_flags,
-                               RPC_HEADER_LEN + RPC_HDR_RESP_LEN +
-                                 data_len + ss_padding_len +
-                                 RPC_HDR_AUTH_LEN + NTLMSSP_SIG_SIZE,
-                               NTLMSSP_SIG_SIZE,
-                               p->hdr.call_id,
-                               &hdr);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("Failed to marshall RPC Header.\n"));
-               prs_mem_free(&p->out_data.frag);
-               return False;
-       }
-
-       /* Store the header in the data stream. */
-       if (!prs_copy_data_in(&p->out_data.frag,
-                               (char *)hdr.data, hdr.length)) {
-               DEBUG(0, ("Out of memory.\n"));
-               prs_mem_free(&p->out_data.frag);
-               return False;
+               DEBUG(0, ("Failed to add NTLMSSP auth blob: %s\n",
+                       nt_errstr(status)));
+               data_blob_free(&p->out_data.frag);
+               return false;
        }
 
-       if(!smb_io_rpc_hdr_resp("resp", &hdr_resp, &p->out_data.frag, 0)) {
-               DEBUG(0,("create_next_pdu_ntlmssp: failed to marshall RPC_HDR_RESP.\n"));
-               prs_mem_free(&p->out_data.frag);
+       /* 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 data into the PDU. */
+       return true;
+}
 
-       if(!prs_append_some_prs_data(&p->out_data.frag, &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(&p->out_data.frag);
-               return False;
-       }
+/*******************************************************************
+ Append a schannel authenticated fragment.
+ ********************************************************************/
 
-       /* Copy the sign/seal padding data. */
-       if (ss_padding_len) {
-               char pad[SERVER_NDR_PADDING_SIZE];
+static bool add_schannel_auth(pipes_struct *p)
+{
+       DATA_BLOB auth_blob = data_blob_null;
+       NTSTATUS status;
 
-               memset(pad, '\0', SERVER_NDR_PADDING_SIZE);
-               if (!prs_copy_data_in(&p->out_data.frag, 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(&p->out_data.frag);
-                       return False;
-               }
-       }
+       /* 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;
 
-       /* Now write out the auth header and null blob. */
-       if (p->auth.auth_type == PIPE_AUTH_TYPE_NTLMSSP) {
-               auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
-       } else {
-               auth_type = DCERPC_AUTH_TYPE_SPNEGO;
-       }
-       if (p->auth.auth_level == DCERPC_AUTH_LEVEL_PRIVACY) {
-               auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
-       } else {
-               auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+       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,
-                               &p->out_data.frag, 0)) {
-               DEBUG(0,("create_next_pdu_ntlmssp: failed to marshall RPC_HDR_AUTH.\n"));
-               prs_mem_free(&p->out_data.frag);
-               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. */
-
-       frame = talloc_stackframe();
-       switch (p->auth.auth_level) {
-               case DCERPC_AUTH_LEVEL_PRIVACY:
-                       /* Data portion is encrypted. */
-                       status = auth_ntlmssp_seal_packet(
-                               a, frame,
-                               (uint8_t *)prs_data_p(&p->out_data.frag)
-                               + RPC_HEADER_LEN + RPC_HDR_RESP_LEN,
-                               data_len + ss_padding_len,
-                               (unsigned char *)prs_data_p(&p->out_data.frag),
-                               (size_t)prs_offset(&p->out_data.frag),
-                               &auth_blob);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               talloc_free(frame);
-                               prs_mem_free(&p->out_data.frag);
-                               return False;
-                       }
-                       break;
-               case DCERPC_AUTH_LEVEL_INTEGRITY:
-                       /* Data is signed. */
-                       status = auth_ntlmssp_sign_packet(
-                               a, frame,
-                               (unsigned char *)prs_data_p(&p->out_data.frag)
-                               + RPC_HEADER_LEN + RPC_HDR_RESP_LEN,
-                               data_len + ss_padding_len,
-                               (unsigned char *)prs_data_p(&p->out_data.frag),
-                               (size_t)prs_offset(&p->out_data.frag),
-                               &auth_blob);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               talloc_free(frame);
-                               prs_mem_free(&p->out_data.frag);
-                               return False;
-                       }
-                       break;
-               default:
-                       talloc_free(frame);
-                       prs_mem_free(&p->out_data.frag);
-                       return False;
+       if (DEBUGLEVEL >= 10) {
+               dump_NL_AUTH_SIGNATURE(talloc_tos(), &auth_blob);
        }
 
-       /* Append the auth blob. */
-       if (!prs_copy_data_in(&p->out_data.frag, (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));
-               talloc_free(frame);
-               prs_mem_free(&p->out_data.frag);
-               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;
        }
-       talloc_free(frame);
-
-       /*
-        * Setup the counts for this PDU.
-        */
-
-       p->out_data.data_sent_length += data_len;
-       p->out_data.current_pdu_sent = 0;
+       data_blob_free(&auth_blob);
 
-       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)
 {
-       DATA_BLOB hdr;
-       uint8_t hdr_flags;
-       RPC_HDR_RESP hdr_resp;
-       uint32 ss_padding_len = 0;
-       uint32 data_len;
-       uint32 data_space_available;
-       uint32 data_len_left;
-       uint32 data_pos;
+       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;
 
-       /*
-        * If we're in the fault state, keep returning fault PDU's until
-        * the pipe gets closed. JRA.
-        */
+       ZERO_STRUCT(u.response);
 
-       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));
-
-       /* Set up rpc header flags. */
+       /* Set up rpc packet pfc flags. */
        if (p->out_data.data_sent_length == 0) {
-               hdr_flags = DCERPC_PFC_FLAG_FIRST;
+               pfc_flags = DCERPC_PFC_FLAG_FIRST;
        } else {
-               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_schannel: no data left to send !\n"));
-               return False;
+               pfc_flags = 0;
        }
 
-       /* Space available - not including padding. */
-       data_space_available = RPC_MAX_PDU_FRAG_LEN - 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.
-        */
+       /* 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;
 
-       data_len = MIN(data_len_left, data_space_available);
-
-       /* Work out any padding alignment requirements. */
-       if ((RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len) % SERVER_NDR_PADDING_SIZE) {
-               ss_padding_len = SERVER_NDR_PADDING_SIZE -
-                       ((RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len) % SERVER_NDR_PADDING_SIZE);
-               DEBUG(10,("create_next_pdu_schannel: adding sign/seal padding of %u\n",
-                       ss_padding_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 + ss_padding_len > data_space_available) {
-                       data_len -= SERVER_NDR_PADDING_SIZE;
-               }
+       /* Ensure there really is data left to send. */
+       if (!data_len_left) {
+               DEBUG(0, ("No data left to send !\n"));
+               return false;
        }
 
-       /*
-        * 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)) {
-               hdr_flags |= DCERPC_PFC_FLAG_LAST;
+       /* 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;
        }
 
        /*
-        * Init the parse struct to point at the outgoing
-        * data.
+        * The amount we send is the minimum of the max_len
+        * and the amount left to send.
         */
-       prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL);
-
-       status = dcerpc_push_ncacn_packet_header(
-                               prs_get_mem_context(&p->out_data.frag),
-                               DCERPC_PKT_RESPONSE,
-                               hdr_flags,
-                               RPC_HEADER_LEN + RPC_HDR_RESP_LEN +
-                                 data_len + ss_padding_len +
-                                 RPC_HDR_AUTH_LEN +
-                                 RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN,
-                               RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN,
-                               p->hdr.call_id,
-                               &hdr);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("Failed to marshall RPC Header.\n"));
-               prs_mem_free(&p->out_data.frag);
-               return False;
+       data_len = MIN(data_len_left, max_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;
+                       }
+               }
        }
 
-       /* Store the header in the data stream. */
-       if (!prs_copy_data_in(&p->out_data.frag,
-                               (char *)hdr.data, hdr.length)) {
-               DEBUG(0, ("Out of memory.\n"));
-               prs_mem_free(&p->out_data.frag);
-               return False;
-       }
+       /* Set up the alloc hint. This should be the data left to send. */
+       u.response.alloc_hint = data_len_left;
 
-       if(!smb_io_rpc_hdr_resp("resp", &hdr_resp, &p->out_data.frag, 0)) {
-               DEBUG(0,("create_next_pdu_schannel: failed to marshall RPC_HDR_RESP.\n"));
-               prs_mem_free(&p->out_data.frag);
-               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;
        }
 
-       /* Store the current offset. */
-       data_pos = prs_offset(&p->out_data.frag);
-
-       /* Copy the data into the PDU. */
+       /* 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);
 
-       if(!prs_append_some_prs_data(&p->out_data.frag, &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(&p->out_data.frag);
-               return False;
+       /* 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;
        }
 
-       /* Copy the sign/seal padding data. */
-       if (ss_padding_len) {
-               char pad[SERVER_NDR_PADDING_SIZE];
-               memset(pad, '\0', SERVER_NDR_PADDING_SIZE);
-               if (!prs_copy_data_in(&p->out_data.frag, 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(&p->out_data.frag);
-                       return False;
-               }
-       }
+       if (auth_length) {
+               DATA_BLOB empty = data_blob_null;
+               DATA_BLOB auth_hdr;
 
-       {
-               /*
-                * Schannel processing.
-                */
-               RPC_HDR_AUTH auth_info;
-               DATA_BLOB blob;
-               uint8_t *data;
-
-               /* Check it's the type of reply we were expecting to decode */
-
-               init_rpc_hdr_auth(&auth_info,
-                               DCERPC_AUTH_TYPE_SCHANNEL,
-                               p->auth.auth_level == DCERPC_AUTH_LEVEL_PRIVACY ?
-                                       DCERPC_AUTH_LEVEL_PRIVACY : DCERPC_AUTH_LEVEL_INTEGRITY,
-                               ss_padding_len, 1);
-
-               if (!smb_io_rpc_hdr_auth("hdr_auth", &auth_info,
-                                       &p->out_data.frag, 0)) {
-                       DEBUG(0,("create_next_pdu_schannel: failed to marshall RPC_HDR_AUTH.\n"));
-                       prs_mem_free(&p->out_data.frag);
-                       return False;
-               }
+               /* 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);
 
-               data = (uint8_t *)prs_data_p(&p->out_data.frag) + data_pos;
+               if (pad_len) {
+                       size_t offset = p->out_data.frag.length;
 
-               switch (p->auth.auth_level) {
-               case DCERPC_AUTH_LEVEL_PRIVACY:
-                       status = netsec_outgoing_packet(p->auth.a_u.schannel_auth,
-                                                       talloc_tos(),
-                                                       true,
-                                                       data,
-                                                       data_len + ss_padding_len,
-                                                       &blob);
-                       break;
-               case DCERPC_AUTH_LEVEL_INTEGRITY:
-                       status = netsec_outgoing_packet(p->auth.a_u.schannel_auth,
-                                                       talloc_tos(),
-                                                       false,
-                                                       data,
-                                                       data_len + ss_padding_len,
-                                                       &blob);
-                       break;
-               default:
-                       status = NT_STATUS_INTERNAL_ERROR;
-                       break;
+                       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);
                }
 
+               /* 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,("create_next_pdu_schannel: failed to process packet: %s\n",
-                               nt_errstr(status)));
-                       prs_mem_free(&p->out_data.frag);
+                       DEBUG(0, ("Failed to marshall RPC Auth.\n"));
                        return false;
                }
 
-               /* Finally marshall the blob. */
-
-               if (DEBUGLEVEL >= 10) {
-                       dump_NL_AUTH_SIGNATURE(talloc_tos(), &blob);
-               }
-
-               if (!prs_copy_data_in(&p->out_data.frag, (const char *)blob.data, blob.length)) {
-                       prs_mem_free(&p->out_data.frag);
+               /* 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;
                }
+               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_sent = 0;
-
-       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)
 {
-       DATA_BLOB hdr;
-       uint8_t hdr_flags;
-       NTSTATUS status;
-       RPC_HDR_RESP hdr_resp;
-       uint32 data_len;
-       uint32 data_space_available;
-       uint32 data_len_left;
+       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));
-
-       /* Set up rpc header flags. */
-       if (p->out_data.data_sent_length == 0) {
-               hdr_flags = DCERPC_PFC_FLAG_FIRST;
-       } else {
-               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_noath: no data left to send !\n"));
-               return False;
-       }
-
-       data_space_available = RPC_MAX_PDU_FRAG_LEN - 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)) {
-               hdr_flags |= DCERPC_PFC_FLAG_LAST;
-       }
-
-       /*
-        * Init the parse struct to point at the outgoing
-        * data.
-        */
-       prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL);
-
-       status = dcerpc_push_ncacn_packet_header(
-                               prs_get_mem_context(&p->out_data.frag),
-                               DCERPC_PKT_RESPONSE,
-                               hdr_flags,
-                               RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len,
-                               0,
-                               p->hdr.call_id,
-                               &hdr);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("Failed to marshall RPC Header.\n"));
-               prs_mem_free(&p->out_data.frag);
-               return False;
-       }
-
-       /* Store the header in the data stream. */
-       if (!prs_copy_data_in(&p->out_data.frag,
-                               (char *)hdr.data, hdr.length)) {
-               DEBUG(0, ("Out of memory.\n"));
-               prs_mem_free(&p->out_data.frag);
-               return False;
-       }
-
-       if(!smb_io_rpc_hdr_resp("resp", &hdr_resp, &p->out_data.frag, 0)) {
-               DEBUG(0,("create_next_pdu_noath: failed to marshall RPC_HDR_RESP.\n"));
-               prs_mem_free(&p->out_data.frag);
-               return False;
-       }
-
-       /* Copy the data into the PDU. */
-
-       if(!prs_append_some_prs_data(&p->out_data.frag, &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(&p->out_data.frag);
-               return False;
+               return true;
        }
 
-       /*
-        * Setup the counts for this PDU.
-        */
-
-       p->out_data.data_sent_length += data_len;
-       p->out_data.current_pdu_sent = 0;
+       switch (p->auth.auth_level) {
+       case DCERPC_AUTH_LEVEL_NONE:
+       case DCERPC_AUTH_LEVEL_CONNECT:
+               /* This is incorrect for auth level connect. Fixme. JRA */
 
-       return True;
-}
+               /* No authentication done. */
+               return create_next_packet(p, auth_type,
+                                         p->auth.auth_level, 0);
 
-/*******************************************************************
- Generate the next PDU to be returned from the data in p->rdata. 
-********************************************************************/
+       case DCERPC_AUTH_LEVEL_CALL:
+       case DCERPC_AUTH_LEVEL_PACKET:
+       case DCERPC_AUTH_LEVEL_INTEGRITY:
+       case DCERPC_AUTH_LEVEL_PRIVACY:
 
-bool create_next_pdu(pipes_struct *p)
-{
-       switch(p->auth.auth_level) {
-               case DCERPC_AUTH_LEVEL_NONE:
-               case DCERPC_AUTH_LEVEL_CONNECT:
-                       /* This is incorrect for auth level connect. Fixme. JRA */
-                       return create_next_pdu_noauth(p);
+               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);
 
-               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;
 }
 
 /*******************************************************************
@@ -736,9 +461,10 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
 
        TALLOC_FREE(p->server_info);
 
-       p->server_info = auth_ntlmssp_server_info(p, a);
-       if (p->server_info == NULL) {
-               DEBUG(0, ("auth_ntlmssp_server_info failed to obtain the server info for authenticated user\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;
        }
 
@@ -769,12 +495,10 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
  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)
 {
        struct dcerpc_auth auth_info;
-       uint32 pad = 0;
-       DATA_BLOB auth_blob;
-       uint32_t auth_len = p->hdr.auth_len;
+       uint32_t auth_len = pkt->auth_length;
        NTSTATUS status;
 
        DEBUG(5,("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
@@ -784,15 +508,9 @@ bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
                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"));
-               goto err;
-       }
-
        /* Ensure there's enough data for an authenticated request. */
        if (RPC_HEADER_LEN + RPC_HDR_AUTH_LEN + auth_len >
-                               p->hdr.frag_len) {
+                               pkt->frag_length) {
                        DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_len "
                                "%u is too large.\n",
                         (unsigned int)auth_len ));
@@ -803,28 +521,9 @@ bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
         * Decode the authentication verifier response.
         */
 
-       /* Pull the auth header and the following data into a blob. */
-       /* NB. The offset of the auth_header is relative to the *end*
-        * of the packet, not the start. Also, the length of the
-        * data in rpc_in_p is p->hdr.frag_len - RPC_HEADER_LEN,
-        * as the RPC header isn't included in rpc_in_p. */
-       if(!prs_set_offset(rpc_in_p,
-                       p->hdr.frag_len - RPC_HEADER_LEN -
-                       RPC_HDR_AUTH_LEN - auth_len)) {
-               DEBUG(0,("api_pipe_bind_auth3: cannot move "
-                       "offset to %u.\n",
-                       (unsigned int)(p->hdr.frag_len -
-                               RPC_HDR_AUTH_LEN - auth_len) ));
-               goto err;
-       }
-
-       auth_blob = data_blob_const(prs_data_p(rpc_in_p)
-                                       + prs_offset(rpc_in_p),
-                                   prs_data_size(rpc_in_p)
-                                       - prs_offset(rpc_in_p));
-
-       status = dcerpc_pull_dcerpc_auth(prs_get_mem_context(rpc_in_p),
-                                        &auth_blob, &auth_info);
+       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;
@@ -866,22 +565,13 @@ 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)
 {
        NTSTATUS status;
        union dcerpc_payload u;
-       DATA_BLOB blob;
 
        /* 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(&p->out_data.frag, p->mem_ctx, MARSHALL);
+       data_blob_free(&p->out_data.rdata);
 
        /*
         * Initialize a bind_nak header.
@@ -891,22 +581,21 @@ static bool setup_bind_nak(pipes_struct *p)
 
        u.bind_nak.reject_reason  = 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.
+        */
+
        status = dcerpc_push_ncacn_packet(p->mem_ctx,
                                          DCERPC_PKT_BIND_NAK,
                                          DCERPC_PFC_FLAG_FIRST |
                                                DCERPC_PFC_FLAG_LAST,
                                          0,
-                                         p->hdr.call_id,
-                                         u,
-                                         &blob);
+                                         pkt->call_id,
+                                         &u,
+                                         &p->out_data.frag);
        if (!NT_STATUS_IS_OK(status)) {
-               prs_mem_free(&p->out_data.frag);
-               return False;
-       }
-
-       if (!prs_copy_data_in(&p->out_data.frag,
-                             (char *)blob.data, blob.length)) {
-               prs_mem_free(&p->out_data.frag);
                return False;
        }
 
@@ -931,18 +620,9 @@ bool setup_fault_pdu(pipes_struct *p, NTSTATUS fault_status)
 {
        NTSTATUS status;
        union dcerpc_payload u;
-       DATA_BLOB blob;
 
        /* 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(&p->out_data.frag, p->mem_ctx, MARSHALL);
+       data_blob_free(&p->out_data.rdata);
 
        /*
         * Initialize a fault header.
@@ -953,23 +633,22 @@ bool setup_fault_pdu(pipes_struct *p, NTSTATUS fault_status)
        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
+        * must do this as we need to set to the bind response
+        * header and are never sending more than one PDU here.
+        */
+
        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->hdr.call_id,
-                                         u,
-                                         &blob);
+                                         p->call_id,
+                                         &u,
+                                         &p->out_data.frag);
        if (!NT_STATUS_IS_OK(status)) {
-               prs_mem_free(&p->out_data.frag);
-               return False;
-       }
-
-       if (!prs_copy_data_in(&p->out_data.frag,
-                             (char *)blob.data, blob.length)) {
-               prs_mem_free(&p->out_data.frag);
                return False;
        }
 
@@ -1073,10 +752,10 @@ bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax)
 *******************************************************************/
 
 static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p,
-                                          prs_struct *rpc_in_p,
+                                          TALLOC_CTX *mem_ctx,
                                           struct dcerpc_auth *pauth_info,
                                           DATA_BLOB *psecblob,
-                                          prs_struct *pout_auth)
+                                          DATA_BLOB *response)
 {
        return False;
 }
@@ -1086,14 +765,11 @@ static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p,
 *******************************************************************/
 
 static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
-                                           prs_struct *rpc_in_p,
-                                           uint32_t ss_padding_len,
+                                           TALLOC_CTX *mem_ctx,
                                            struct dcerpc_auth *pauth_info,
-                                           prs_struct *pout_auth)
+                                           DATA_BLOB *response)
 {
-       DATA_BLOB blob;
        DATA_BLOB secblob;
-       DATA_BLOB response;
        DATA_BLOB chal;
        char *OIDs[ASN1_MAX_OIDS];
         int i;
@@ -1103,7 +779,6 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
 
        ZERO_STRUCT(secblob);
        ZERO_STRUCT(chal);
-       ZERO_STRUCT(response);
 
        if (pauth_info->credentials.data[0] != ASN1_APPLICATION(0)) {
                goto err;
@@ -1126,7 +801,9 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
        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) || USE_KERBEROS_KEYTAB) ) {
-               bool ret = pipe_spnego_auth_bind_kerberos(p, rpc_in_p, pauth_info, &secblob, pout_auth);
+               bool ret;
+               ret = pipe_spnego_auth_bind_kerberos(p, mem_ctx, pauth_info,
+                                                    &secblob, response);
                data_blob_free(&secblob);
                return ret;
        }
@@ -1167,37 +844,22 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
                }
 
                /* 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);
        }
 
-       /* auth_pad_len will be handled by the caller */
+       /* Make sure data is bound to the memctx, to be freed the caller */
+       talloc_steal(mem_ctx, response->data);
 
-       status = dcerpc_push_dcerpc_auth(prs_get_mem_context(pout_auth),
-                                        DCERPC_AUTH_TYPE_SPNEGO,
-                                        pauth_info->auth_level,
-                                        ss_padding_len,
-                                        1, /* auth_context_id */
-                                        &response,
-                                        &blob);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("Marshalling of dcerpc_auth failed.\n"));
-               goto err;
-       }
-
-       /* Copy the blob into the pout_auth parse struct */
-       if (!prs_copy_data_in(pout_auth, (char *)blob.data, blob.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;
@@ -1205,7 +867,6 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
 
        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;
@@ -1214,7 +875,6 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
 
        data_blob_free(&secblob);
        data_blob_free(&chal);
-       data_blob_free(&response);
 
        p->auth.a_u.auth_ntlmssp_state = NULL;
 
@@ -1225,21 +885,17 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
  Handle the second part of a SPNEGO bind auth.
 *******************************************************************/
 
-static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p,
-                               uint32_t ss_padding_len,
-                               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;
        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
@@ -1250,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;
        }
@@ -1278,29 +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);
 
-       /* FIXME - add auth_pad_len here ! */
-
-       /* Copy the blob into the pout_auth parse struct */
-       init_rpc_hdr_auth(&auth_info, DCERPC_AUTH_TYPE_SPNEGO,
-                       pauth_info->auth_level, ss_padding_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;
 
@@ -1308,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;
@@ -1324,12 +955,10 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
 *******************************************************************/
 
 static bool pipe_schannel_auth_bind(pipes_struct *p,
-                                       prs_struct *rpc_in_p,
-                                       uint32_t ss_padding_len,
-                                       struct dcerpc_auth *auth_info,
-                                       prs_struct *pout_auth)
+                                   TALLOC_CTX *mem_ctx,
+                                   struct dcerpc_auth *auth_info,
+                                   DATA_BLOB *response)
 {
-       DATA_BLOB auth_blob;
        struct NL_AUTH_MESSAGE neg;
        struct NL_AUTH_MESSAGE reply;
        bool ret;
@@ -1337,11 +966,9 @@ static bool pipe_schannel_auth_bind(pipes_struct *p,
        struct netlogon_creds_CredentialState *creds;
        DATA_BLOB session_key;
        enum ndr_err_code ndr_err;
-       DATA_BLOB blob;
 
        ndr_err = ndr_pull_struct_blob(
-                       &auth_info->credentials,
-                       prs_get_mem_context(pout_auth), &neg,
+                       &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"));
@@ -1419,7 +1046,7 @@ static bool pipe_schannel_auth_bind(pipes_struct *p,
                                                      * this has any meaning
                                                      * here - gd */
 
-       ndr_err = ndr_push_struct_blob(&auth_blob, talloc_tos(), &reply,
+       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"));
@@ -1430,22 +1057,6 @@ static bool pipe_schannel_auth_bind(pipes_struct *p,
                NDR_PRINT_DEBUG(NL_AUTH_MESSAGE, &reply);
        }
 
-       status = dcerpc_push_dcerpc_auth(prs_get_mem_context(pout_auth),
-                                        DCERPC_AUTH_TYPE_SCHANNEL,
-                                        auth_info->auth_level,
-                                        ss_padding_len,
-                                        1, /* auth_context_id */
-                                        &auth_blob,
-                                        &blob);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("Marshalling of dcerpc_auth failed.\n"));
-               return False;
-       }
-
-       if (!prs_copy_data_in(pout_auth, (const char *)blob.data, blob.length)) {
-               return false;
-       }
-
        DEBUG(10,("pipe_schannel_auth_bind: schannel auth: domain [%s] myname [%s]\n",
                neg.oem_netbios_domain.a, neg.oem_netbios_computer.a));
 
@@ -1463,18 +1074,13 @@ static bool pipe_schannel_auth_bind(pipes_struct *p,
 *******************************************************************/
 
 static bool pipe_ntlmssp_auth_bind(pipes_struct *p,
-                                       prs_struct *rpc_in_p,
-                                       uint32_t ss_padding_len,
-                                       struct dcerpc_auth *auth_info,
-                                       prs_struct *pout_auth)
+                                  TALLOC_CTX *mem_ctx,
+                                  struct dcerpc_auth *auth_info,
+                                  DATA_BLOB *response)
 {
-        DATA_BLOB blob;
-       DATA_BLOB response;
         NTSTATUS status;
        struct auth_ntlmssp_state *a = NULL;
 
-       ZERO_STRUCT(response);
-
        if (strncmp((char *)auth_info->credentials.data, "NTLMSSP", 7) != 0) {
                DEBUG(0, ("Failed to read NTLMSSP in blob\n"));
                 goto err;
@@ -1499,37 +1105,20 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p,
                break;
        }
 
-       status = auth_ntlmssp_update(a, auth_info->credentials, &response);
+       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;
        }
 
-       status = dcerpc_push_dcerpc_auth(prs_get_mem_context(pout_auth),
-                                        DCERPC_AUTH_TYPE_NTLMSSP,
-                                        auth_info->auth_level,
-                                        ss_padding_len,
-                                        1, /* auth_context_id */
-                                        &response,
-                                        &blob);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("Marshalling of dcerpc_auth failed.\n"));
-               goto err;
-       }
-
-       /* Copy the blob into the pout_auth parse struct */
-       if (!prs_copy_data_in(pout_auth, (char *)blob.data, blob.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(&response);
-
        DEBUG(10,("pipe_ntlmssp_auth_bind: NTLMSSP auth started\n"));
 
        /* We can't set pipe_bound True yet - we need an DCERPC_PKT_AUTH3 response packet... */
@@ -1537,8 +1126,6 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p,
 
   err:
 
-       data_blob_free(&response);
-
        free_pipe_ntlmssp_auth_data(&p->auth);
        p->auth.a_u.auth_ntlmssp_state = NULL;
        return False;
@@ -1548,68 +1135,28 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *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;
-       struct dcerpc_bind rpc_bind;
-       DATA_BLOB blob_rb;
        struct dcerpc_auth auth_info;
-       DATA_BLOB auth_blob;
        uint16 assoc_gid;
-       fstring ack_pipe_name;
-       prs_struct out_hdr_ba;
-       prs_struct out_auth;
-       int auth_len = 0;
        unsigned int auth_type = DCERPC_AUTH_TYPE_NONE;
-       uint32_t ss_padding_len = 0;
        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;
+       int pad_len = 0;
 
        /* 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",
-                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
-               return setup_bind_nak(p);
-       }
-
-       prs_init_empty(&p->out_data.frag, 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.
-        */
-
-       /*
-        * 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(&p->out_data.frag);
-               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(&p->out_data.frag);
-               prs_mem_free(&out_hdr_ba);
-               return False;
-       }
-
-       DEBUG(5,("api_pipe_bind_req: decode request. %d\n", __LINE__));
-
-       /* decode the bind request */
-       blob_rb = data_blob_const(prs_data_p(rpc_in_p),
-                                 prs_data_size(rpc_in_p));
-       status = dcerpc_pull_dcerpc_bind(talloc_tos(), &blob_rb, &rpc_bind);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto err_exit;
+               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);
        }
 
-       if (rpc_bind.num_contexts == 0) {
+       if (pkt->u.bind.num_contexts == 0) {
                DEBUG(0, ("api_pipe_bind_req: no rpc contexts around\n"));
                goto err_exit;
        }
@@ -1618,7 +1165,7 @@ 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 = rpc_bind.ctx_list[0].abstract_syntax;
+       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),
@@ -1627,18 +1174,15 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                status = smb_probe_module(
                        "rpc", get_pipe_name_from_syntax(
                                talloc_tos(),
-                               &rpc_bind.ctx_list[0].abstract_syntax));
+                               &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(),
-                                       &rpc_bind.ctx_list[0].abstract_syntax)));
-                       prs_mem_free(&p->out_data.frag);
-                       prs_mem_free(&out_hdr_ba);
-                       prs_mem_free(&out_auth);
+                                       &pkt->u.bind.ctx_list[0].abstract_syntax)));
 
-                       return setup_bind_nak(p);
+                       return setup_bind_nak(p, pkt);
                }
 
                if (rpc_srv_get_pipe_interface_by_cli_name(
@@ -1655,23 +1199,18 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                                                            &p->syntax),
                                  get_pipe_name_from_syntax(talloc_tos(),
                                                            &p->syntax)));
-                       goto err_exit;
+                       return setup_bind_nak(p, pkt);
                }
        }
 
-       /* name has to be \PIPE\xxxxx */
-       fstrcpy(ack_pipe_name, "\\PIPE\\");
-       fstrcat(ack_pipe_name, rpc_srv_get_pipe_srv_name(&id));
-
        DEBUG(5,("api_pipe_bind_req: make response. %d\n", __LINE__));
 
-       if (rpc_bind.assoc_group_id != 0) {
-               assoc_gid = rpc_bind.assoc_group_id;
+       if (pkt->u.bind.assoc_group_id != 0) {
+               assoc_gid = pkt->u.bind.assoc_group_id;
        } else {
                assoc_gid = 0x53f0;
        }
 
-
        /*
         * Create the bind response struct.
         */
@@ -1683,84 +1222,44 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                Needed when adding entries to a DACL from NT5 - SK */
 
        if (check_bind_req(p,
-                       &rpc_bind.ctx_list[0].abstract_syntax,
-                       &rpc_bind.ctx_list[0].transfer_syntaxes[0],
-                       rpc_bind.ctx_list[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,
-                       &rpc_bind.ctx_list[0].transfer_syntaxes[0]);
+                       &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)) {
+
+               bind_ack_ctx.result = 0;
+               bind_ack_ctx.reason = 0;
+               bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0];
        } else {
-               /* 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_ndr_syntax_id);
                p->pipe_bound = False;
-       }
-
-       /*
-        * and marshall it.
-        */
-
-       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"));
-               goto err_exit;
+               /* 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 (p->hdr.auth_len) {
-               /* 
-                * Decode the authentication verifier.
-                */
-
-               /* Work out any padding needed before the auth footer. */
-               if ((RPC_HEADER_LEN + prs_offset(&out_hdr_ba)) % SERVER_NDR_PADDING_SIZE) {
-                       ss_padding_len = SERVER_NDR_PADDING_SIZE -
-                               ((RPC_HEADER_LEN + prs_offset(&out_hdr_ba)) % SERVER_NDR_PADDING_SIZE);
-                       DEBUG(10,("api_pipe_bind_req: auth pad_len = %u\n",
-                               (unsigned int)ss_padding_len ));
-               }
-
+       if (pkt->auth_length) {
                /* Quick length check. Won't catch a bad auth footer,
                 * prevents overrun. */
 
-               if (p->hdr.frag_len < RPC_HEADER_LEN + RPC_HDR_AUTH_LEN + p->hdr.auth_len) {
+               if (pkt->frag_length < RPC_HEADER_LEN +
+                                       RPC_HDR_AUTH_LEN +
+                                       pkt->auth_length) {
                        DEBUG(0,("api_pipe_bind_req: auth_len (%u) "
                                "too long for fragment %u.\n",
-                               (unsigned int)p->hdr.auth_len,
-                               (unsigned int)p->hdr.frag_len ));
+                               (unsigned int)pkt->auth_length,
+                               (unsigned int)pkt->frag_length));
                        goto err_exit;
                }
 
-               /* Pull the auth header and the following data into a blob. */
-               /* NB. The offset of the auth_header is relative to the *end*
-                * of the packet, not the start. Also, the length of the
-                * data in rpc_in_p is p->hdr.frag_len - RPC_HEADER_LEN,
-                * as the RPC header isn't included in rpc_in_p. */
-               if(!prs_set_offset(rpc_in_p,
-                               p->hdr.frag_len - RPC_HEADER_LEN -
-                               RPC_HDR_AUTH_LEN - p->hdr.auth_len)) {
-                       DEBUG(0,("api_pipe_bind_req: cannot move "
-                               "offset to %u.\n",
-                               (unsigned int)(p->hdr.frag_len -
-                               RPC_HDR_AUTH_LEN - p->hdr.auth_len) ));
-                       goto err_exit;
-               }
-
-               auth_blob = data_blob_const(prs_data_p(rpc_in_p)
-                                               + prs_offset(rpc_in_p),
-                                           prs_data_size(rpc_in_p)
-                                               - prs_offset(rpc_in_p));
-
-               status = dcerpc_pull_dcerpc_auth(prs_get_mem_context(rpc_in_p),
-                                                &auth_blob, &auth_info);
+               /*
+                * Decode the authentication verifier.
+                */
+               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;
@@ -1781,96 +1280,137 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                                (unsigned int)auth_info.auth_level ));
                        goto err_exit;
                }
-       } else {
-               ZERO_STRUCT(auth_info);
-       }
 
-       switch(auth_type) {
+               switch (auth_type) {
                case DCERPC_AUTH_TYPE_NTLMSSP:
-                       if (!pipe_ntlmssp_auth_bind(p, rpc_in_p,
-                                       ss_padding_len, &auth_info, &out_auth)) {
+                       if (!pipe_ntlmssp_auth_bind(p, pkt,
+                                               &auth_info, &auth_resp)) {
                                goto err_exit;
                        }
                        assoc_gid = 0x7a77;
                        break;
 
                case DCERPC_AUTH_TYPE_SCHANNEL:
-                       if (!pipe_schannel_auth_bind(p, rpc_in_p,
-                                       ss_padding_len, &auth_info, &out_auth)) {
+                       if (!pipe_schannel_auth_bind(p, pkt,
+                                               &auth_info, &auth_resp)) {
                                goto err_exit;
                        }
                        break;
 
                case DCERPC_AUTH_TYPE_SPNEGO:
-                       if (!pipe_spnego_auth_bind_negotiate(p, rpc_in_p,
-                                       ss_padding_len, &auth_info, &out_auth)) {
+                       if (!pipe_spnego_auth_bind_negotiate(p, pkt,
+                                               &auth_info, &auth_resp)) {
                                goto err_exit;
                        }
                        break;
 
                case 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 */
-                       ss_padding_len = 0;
                        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 header, now we know the length.
-        */
 
-       if (prs_offset(&out_auth)) {
-               auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
+       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 */
        }
 
-       init_rpc_hdr(&p->hdr, DCERPC_PKT_BIND_ACK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
-                       p->hdr.call_id,
-                       RPC_HEADER_LEN + prs_offset(&out_hdr_ba) +
-                               ss_padding_len + prs_offset(&out_auth),
-                       auth_len);
+       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;
 
-       /*
-        * Marshall the header into the outgoing PDU.
-        */
-
-       if(!smb_io_rpc_hdr("", &p->hdr, &p->out_data.frag, 0)) {
-               DEBUG(0,("api_pipe_bind_req: marshalling of RPC_HDR 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;
+
+       u.bind_ack.num_results = 1;
+       u.bind_ack.ctx_list = &bind_ack_ctx;
+
+       /* NOTE: We leave the auth_info empty so we can calculate the padding
+        * later and then append the auth_info --simo */
 
        /*
-        * Now add the RPC_HDR_BA and any auth needed.
+        * 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_append_prs_data(&p->out_data.frag, &out_hdr_ba)) {
-               DEBUG(0,("api_pipe_bind_req: append of RPC_HDR_BA 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)));
+       }
+
+       if (auth_resp.length) {
+
+               /* 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));
+               }
+
+               status = dcerpc_push_dcerpc_auth(pkt,
+                                                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;
+               }
        }
 
-       if (auth_len) {
-               if (ss_padding_len) {
+       /* 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_blob.length) {
+               if (pad_len) {
                        char pad[SERVER_NDR_PADDING_SIZE];
                        memset(pad, '\0', SERVER_NDR_PADDING_SIZE);
-                       if (!prs_copy_data_in(&p->out_data.frag, pad,
-                                       ss_padding_len)) {
-                               DEBUG(0,("api_pipe_bind_req: failed to add %u "
-                                       "bytes of pad data.\n",
-                                       (unsigned int)ss_padding_len));
+                       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 (!prs_append_prs_data( &p->out_data.frag, &out_auth)) {
-                       DEBUG(0,("api_pipe_bind_req: append of auth info failed.\n"));
+               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;
                }
        }
@@ -1882,17 +1422,14 @@ 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_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(&p->out_data.frag);
-       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);
 }
 
 /****************************************************************************
@@ -1900,66 +1437,21 @@ 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;
-       struct dcerpc_bind rpc_bind;
-       DATA_BLOB blob_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;
-       int auth_len = 0;
-       uint32_t ss_padding_len = 0;
        NTSTATUS status;
-
-       prs_init_empty(&p->out_data.frag, 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.
-        */
-
-       /*
-        * 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_alter_context: malloc out_hdr_ba failed.\n"));
-               prs_mem_free(&p->out_data.frag);
-               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(&p->out_data.frag);
-               prs_mem_free(&out_hdr_ba);
-               return False;
-       }
-
-       DEBUG(5,("api_pipe_alter_context: decode request. %d\n", __LINE__));
-
-       /* decode the alter context request */
-       blob_rb = data_blob_const(prs_data_p(rpc_in_p),
-                                 prs_data_size(rpc_in_p));
-       status = dcerpc_pull_dcerpc_bind(talloc_tos(), &blob_rb, &rpc_bind);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto err_exit;
-       }
-
-       /* 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,"");
+       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;
 
        DEBUG(5,("api_pipe_alter_context: make response. %d\n", __LINE__));
 
-       if (rpc_bind.assoc_group_id != 0) {
-               assoc_gid = rpc_bind.assoc_group_id;
+       if (pkt->u.bind.assoc_group_id != 0) {
+               assoc_gid = pkt->u.bind.assoc_group_id;
        } else {
                assoc_gid = 0x53f0;
        }
@@ -1975,82 +1467,46 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
                Needed when adding entries to a DACL from NT5 - SK */
 
        if (check_bind_req(p,
-                       &rpc_bind.ctx_list[0].abstract_syntax,
-                       &rpc_bind.ctx_list[0].transfer_syntaxes[0],
-                       rpc_bind.ctx_list[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,
-                       &rpc_bind.ctx_list[0].transfer_syntaxes[0]);
+                       &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)) {
+
+               bind_ack_ctx.result = 0;
+               bind_ack_ctx.reason = 0;
+               bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0];
        } else {
-               /* 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_ndr_syntax_id);
                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;
        }
 
-       /*
-        * and marshall it.
-        */
-
-       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;
-       }
-
-
        /*
         * Check if this is an authenticated alter context request.
         */
-
-       if (p->hdr.auth_len != 0) {
-               /* 
-                * Decode the authentication verifier.
-                */
-
-               /* Work out any padding needed before the auth footer. */
-               if ((RPC_HEADER_LEN + prs_offset(&out_hdr_ba)) % SERVER_NDR_PADDING_SIZE) {
-                       ss_padding_len = SERVER_NDR_PADDING_SIZE -
-                               ((RPC_HEADER_LEN + prs_offset(&out_hdr_ba)) % SERVER_NDR_PADDING_SIZE);
-                       DEBUG(10,("api_pipe_alter_context: auth pad_len = %u\n",
-                               (unsigned int)ss_padding_len ));
-               }
-
+       if (pkt->auth_length) {
                /* Quick length check. Won't catch a bad auth footer,
                 * prevents overrun. */
 
-               if (p->hdr.frag_len < RPC_HEADER_LEN + RPC_HDR_AUTH_LEN + p->hdr.auth_len) {
+               if (pkt->frag_length < RPC_HEADER_LEN +
+                                       RPC_HDR_AUTH_LEN +
+                                       pkt->auth_length) {
                        DEBUG(0,("api_pipe_alter_context: auth_len (%u) "
                                "too long for fragment %u.\n",
-                               (unsigned int)p->hdr.auth_len,
-                               (unsigned int)p->hdr.frag_len ));
+                               (unsigned int)pkt->auth_length,
+                               (unsigned int)pkt->frag_length ));
                        goto err_exit;
                }
 
-               /* Pull the auth header and the following data into a blob. */
-               /* NB. The offset of the auth_header is relative to the *end*
-                * of the packet, not the start. Also, the length of the
-                * data in rpc_in_p is p->hdr.frag_len - RPC_HEADER_LEN,
-                * as the RPC header isn't included in rpc_in_p. */
-               if(!prs_set_offset(rpc_in_p,
-                               p->hdr.frag_len - RPC_HEADER_LEN -
-                               RPC_HDR_AUTH_LEN - p->hdr.auth_len)) {
-                       DEBUG(0,("api_alter_context: cannot move "
-                               "offset to %u.\n",
-                               (unsigned int)(p->hdr.frag_len -
-                               RPC_HDR_AUTH_LEN - p->hdr.auth_len) ));
+               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;
                }
 
-               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"));
-                       goto err_exit;
-               }
 
                /*
                 * Currently only the SPNEGO auth type uses the alter ctx
@@ -2060,63 +1516,100 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
                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,
-                                               ss_padding_len, &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);
        }
-       /*
-        * Create the header, now we know the length.
+
+       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;
+
+       /* 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 (prs_offset(&out_auth)) {
-               auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
-       }
+       u.alter_resp.num_results = 1;
+       u.alter_resp.ctx_list = &bind_ack_ctx;
 
-       init_rpc_hdr(&p->hdr, DCERPC_PKT_ALTER_RESP, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_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, &p->out_data.frag, 0)) {
-               DEBUG(0,("api_pipe_alter_context: marshalling of RPC_HDR failed.\n"));
-               goto err_exit;
+       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)));
        }
 
-       /*
-        * Now add the RPC_HDR_BA and any auth needed.
-        */
+       if (auth_resp.length) {
 
-       if(!prs_append_prs_data(&p->out_data.frag, &out_hdr_ba)) {
-               DEBUG(0,("api_pipe_alter_context: append of RPC_HDR_BA failed.\n"));
-               goto err_exit;
+               /* 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));
+               }
+
+               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;
+               }
        }
 
-       if (auth_len) {
-               if (ss_padding_len) {
+       /* 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 (!prs_copy_data_in(&p->out_data.frag, pad,
-                                       ss_padding_len)) {
-                               DEBUG(0,("api_pipe_alter_context: failed to add %u "
-                                       "bytes of pad data.\n",
-                                       (unsigned int)ss_padding_len));
+                       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 (!prs_append_prs_data( &p->out_data.frag, &out_auth)) {
-                       DEBUG(0,("api_pipe_alter_context: append of auth info failed.\n"));
+               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;
                }
        }
@@ -2128,290 +1621,14 @@ 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_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(&p->out_data.frag);
-       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);
-       struct 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 == DCERPC_AUTH_LEVEL_NONE || p->auth.auth_level == DCERPC_AUTH_LEVEL_CONNECT) {
-               return True;
-       }
-
-       if (!a) {
-               *pstatus = NT_STATUS_INVALID_PARAMETER;
-               return False;
-       }
-
-       /* Ensure there's enough data for an authenticated request. */
-       if (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.
-        * Both of these values include any auth_pad_len bytes.
-        */
-
-       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. */
-       /* NB. The offset of the auth_header is relative to the *end*
-        * of the packet, not the start. Also, the length of the
-        * data in rpc_in_p is p->hdr.frag_len - RPC_HEADER_LEN,
-        * as the RPC header isn't included in rpc_in_p. */
-       if(!prs_set_offset(rpc_in,
-                       p->hdr.frag_len - RPC_HEADER_LEN -
-                       RPC_HDR_AUTH_LEN - auth_len)) {
-               DEBUG(0,("api_pipe_ntlmssp_auth_process: cannot move "
-                       "offset to %u.\n",
-                       (unsigned int)(p->hdr.frag_len -
-                               RPC_HDR_AUTH_LEN - auth_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;
-       }
-
-       /* Ensure auth_pad_len fits into the packet. */
-       if (RPC_HEADER_LEN + RPC_HDR_REQ_LEN + auth_info.auth_pad_len +
-                       RPC_HDR_AUTH_LEN + auth_len > p->hdr.frag_len) {
-               DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_info.auth_pad_len "
-                       "too large (%u), auth_len (%u), frag_len = (%u).\n",
-                       (unsigned int)auth_info.auth_pad_len,
-                       (unsigned int)auth_len,
-                       (unsigned int)p->hdr.frag_len ));
-               *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 DCERPC_AUTH_LEVEL_PRIVACY:
-                       /* Data is encrypted. */
-                       *pstatus = auth_ntlmssp_unseal_packet(a,
-                                                             data, data_len,
-                                                             full_packet_data,
-                                                             full_packet_data_len,
-                                                             &auth_blob);
-                       if (!NT_STATUS_IS_OK(*pstatus)) {
-                               return False;
-                       }
-                       break;
-               case DCERPC_AUTH_LEVEL_INTEGRITY:
-                       /* Data is signed. */
-                       *pstatus = auth_ntlmssp_check_packet(a,
-                                                            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;
-       DATA_BLOB blob;
-       NTSTATUS status;
-       uint8_t *data;
-
-       auth_len = p->hdr.auth_len;
-
-       if (auth_len < RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN ||
-                       auth_len > RPC_HEADER_LEN +
-                                       RPC_HDR_REQ_LEN +
-                                       RPC_HDR_AUTH_LEN +
-                                       auth_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, but does include the auth_pad_len bytes.
-        */
-
-       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));
-
-       /* Pull the auth header and the following data into a blob. */
-       /* NB. The offset of the auth_header is relative to the *end*
-        * of the packet, not the start. Also, the length of the
-        * data in rpc_in_p is p->hdr.frag_len - RPC_HEADER_LEN,
-        * as the RPC header isn't included in rpc_in_p. */
-       if(!prs_set_offset(rpc_in,
-                       p->hdr.frag_len - RPC_HEADER_LEN -
-                       RPC_HDR_AUTH_LEN - auth_len)) {
-               DEBUG(0,("api_pipe_schannel_process: cannot move "
-                       "offset to %u.\n",
-                       (unsigned int)(p->hdr.frag_len -
-                               RPC_HDR_AUTH_LEN - auth_len) ));
-               return False;
-       }
-
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, rpc_in, 0)) {
-               DEBUG(0,("api_pipe_schannel_process: failed to "
-                       "unmarshall RPC_HDR_AUTH.\n"));
-               return False;
-       }
-
-       /* Ensure auth_pad_len fits into the packet. */
-       if (RPC_HEADER_LEN + RPC_HDR_REQ_LEN + auth_info.auth_pad_len +
-                       RPC_HDR_AUTH_LEN + auth_len > p->hdr.frag_len) {
-               DEBUG(0,("api_pipe_schannel_process: auth_info.auth_pad_len "
-                       "too large (%u), auth_len (%u), frag_len = (%u).\n",
-                       (unsigned int)auth_info.auth_pad_len,
-                       (unsigned int)auth_len,
-                       (unsigned int)p->hdr.frag_len ));
-               return False;
-       }
-
-       if (auth_info.auth_type != DCERPC_AUTH_TYPE_SCHANNEL) {
-               DEBUG(0,("Invalid auth info %d on schannel\n",
-                        auth_info.auth_type));
-               return False;
-       }
-
-       blob = data_blob_const(prs_data_p(rpc_in) + prs_offset(rpc_in), auth_len);
-
-       if (DEBUGLEVEL >= 10) {
-               dump_NL_AUTH_SIGNATURE(talloc_tos(), &blob);
-       }
-
-       data = (uint8_t *)prs_data_p(rpc_in)+RPC_HDR_REQ_LEN;
-
-       switch (auth_info.auth_level) {
-       case DCERPC_AUTH_LEVEL_PRIVACY:
-               status = netsec_incoming_packet(p->auth.a_u.schannel_auth,
-                                               talloc_tos(),
-                                               true,
-                                               data,
-                                               data_len,
-                                               &blob);
-               break;
-       case DCERPC_AUTH_LEVEL_INTEGRITY:
-               status = netsec_incoming_packet(p->auth.a_u.schannel_auth,
-                                               talloc_tos(),
-                                               false,
-                                               data,
-                                               data_len,
-                                               &blob);
-               break;
-       default:
-               status = NT_STATUS_INTERNAL_ERROR;
-               break;
-       }
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("failed to unseal packet: %s\n", nt_errstr(status)));
-               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;
-       }
-
-       /*
-        * 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);
 }
 
 /****************************************************************************
@@ -2452,7 +1669,7 @@ void free_pipe_rpc_context( PIPE_RPC_FNS *list )
        return; 
 }
 
-static bool api_rpcTNP(pipes_struct *p,
+static bool api_rpcTNP(pipes_struct *p, struct ncacn_packet *pkt,
                       const struct api_struct *api_rpc_cmds, int n_cmds);
 
 /****************************************************************************
@@ -2461,7 +1678,7 @@ static bool api_rpcTNP(pipes_struct *p,
  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;
@@ -2471,7 +1688,7 @@ bool api_pipe_request(pipes_struct *p)
                        ((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;
@@ -2482,17 +1699,20 @@ bool api_pipe_request(pipes_struct *p)
 
        /* 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, 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,
-                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
+               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) {
@@ -2506,27 +1726,29 @@ bool api_pipe_request(pipes_struct *p)
  Calls the underlying RPC function for a named pipe.
  ********************************************************************/
 
-static bool api_rpcTNP(pipes_struct *p,
+static bool api_rpcTNP(pipes_struct *p, struct ncacn_packet *pkt,
                       const struct api_struct *api_rpc_cmds, int n_cmds)
 {
        int fn_num;
-       uint32 offset1, offset2;
+       uint32_t offset1;
 
        /* interpret the command */
        DEBUG(4,("api_rpcTNP: %s op 0x%x - ",
                 get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
-                p->hdr_req.opnum));
+                pkt->u.request.opnum));
 
        if (DEBUGLEVEL >= 50) {
                fstring name;
                slprintf(name, sizeof(name)-1, "in_%s",
                         get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
-               prs_dump(name, p->hdr_req.opnum, &p->in_data.data);
+               prs_dump(name, pkt->u.request.opnum, &p->in_data.data);
        }
 
        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;
                }
        }
@@ -2542,7 +1764,7 @@ static bool api_rpcTNP(pipes_struct *p,
                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));
@@ -2551,7 +1773,7 @@ static bool api_rpcTNP(pipes_struct *p,
                DEBUG(0,("api_rpcTNP: %s: %s failed.\n",
                         get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
                         api_rpc_cmds[fn_num].name));
-               prs_mem_free(&p->out_data.rdata);
+               data_blob_free(&p->out_data.rdata);
                return False;
        }
 
@@ -2569,15 +1791,15 @@ static bool api_rpcTNP(pipes_struct *p,
                return True;
        }
 
-       offset2 = prs_offset(&p->out_data.rdata);
-       prs_set_offset(&p->out_data.rdata, offset1);
        if (DEBUGLEVEL >= 50) {
                fstring name;
                slprintf(name, sizeof(name)-1, "out_%s",
                         get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
-               prs_dump(name, p->hdr_req.opnum, &p->out_data.rdata);
+               prs_dump_region(name, pkt->u.request.opnum,
+                               p->out_data.rdata.data,
+                               offset1,
+                               p->out_data.rdata.length);
        }
-       prs_set_offset(&p->out_data.rdata, offset2);
 
        DEBUG(5,("api_rpcTNP: called %s successfully\n",
                 get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));