s3-dcerpc: consolidate respones packet creation code
[kamenim/samba.git] / source3 / rpc_server / srv_pipe.c
index 3034b8aa68c879e8b03890194728c750aa21d7f8..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.
+       /* FIXME: Is this right ?
+        * Keeping only to avoid changing semantics during refactoring
+        * --simo
         */
-
-       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.
-        */
-
-       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->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.
-        */
-
-       if(p->fault_state) {
-               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
-               return True;
-       }
+       ZERO_STRUCT(u.response);
 
-       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;
+               pfc_flags = 0;
        }
 
-       /*
-        * Work out how much we can fit in a single PDU.
-        */
+       /* 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_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;
+       /* Ensure there really is data left to send. */
+       if (!data_len_left) {
+               DEBUG(0, ("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
-               - RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN;
+       /* 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;
+       }
 
        /*
-        * The amount we send is the minimum of the available
-        * space and the amount left to send.
+        * The amount we send is the minimum of the max_len
+        * and the amount left to send.
         */
+       data_len = MIN(data_len_left, max_len);
 
-       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;
+       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;
+                       }
                }
        }
 
-       /*
-        * Set up the alloc hint. This should be the data left to
-        * send.
-        */
+       /* Set up the alloc hint. This should be the data left to send. */
+       u.response.alloc_hint = data_len_left;
 
-       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;
+       /* 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;
        }
 
-       /*
-        * 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 +
-                                 RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN,
-                               RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN,
-                               p->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;
-       }
+       /* 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(!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;
+       /* Store the packet in the data stream. */
+       status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                         DCERPC_PKT_RESPONSE,
+                                         pfc_flags,
+                                         auth_length,
+                                         p->call_id,
+                                         &u,
+                                         &p->out_data.frag);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed to marshall RPC Packet.\n"));
+               return false;
        }
 
-       /* Store the current offset. */
-       data_pos = prs_offset(&p->out_data.frag);
+       if (auth_length) {
+               DATA_BLOB empty = data_blob_null;
+               DATA_BLOB auth_hdr;
 
-       /* 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_schannel: failed to copy %u bytes of data.\n", (unsigned int)data_len));
-               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);
 
-       /* 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;
-               }
-       }
-
-       {
-               /*
-                * 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;
-               }
-
-               data = (uint8_t *)prs_data_p(&p->out_data.frag) + data_pos;
-
-               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 (pad_len) {
+                       size_t offset = p->out_data.frag.length;
+
+                       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->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;
        }
 
@@ -843,18 +569,9 @@ 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.
@@ -864,6 +581,12 @@ static bool setup_bind_nak(pipes_struct *p, struct ncacn_packet *pkt)
 
        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 |
@@ -871,15 +594,8 @@ static bool setup_bind_nak(pipes_struct *p, struct ncacn_packet *pkt)
                                          0,
                                          pkt->call_id,
                                          &u,
-                                         &blob);
+                                         &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;
        }
 
@@ -904,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.
@@ -926,6 +633,12 @@ 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 |
@@ -934,15 +647,8 @@ bool setup_fault_pdu(pipes_struct *p, NTSTATUS fault_status)
                                          0,
                                          p->call_id,
                                          &u,
-                                         &blob);
+                                         &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;
        }
 
@@ -1180,19 +886,16 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
 *******************************************************************/
 
 static bool pipe_spnego_auth_bind_continue(pipes_struct *p,
-                                          uint32_t ss_padding_len,
+                                          TALLOC_CTX *mem_ctx,
                                           struct dcerpc_auth *pauth_info,
-                                          prs_struct *pout_auth)
+                                          DATA_BLOB *response)
 {
-       RPC_HDR_AUTH auth_info;
        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(auth_blob);
        ZERO_STRUCT(auth_reply);
-       ZERO_STRUCT(response);
 
        /*
         * NB. If we've negotiated down from krb5 to NTLMSSP we'll currently
@@ -1225,25 +928,12 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p,
        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;
 
@@ -1253,7 +943,6 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p,
 
        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;
@@ -1457,7 +1146,6 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt)
        struct dcerpc_ack_ctx bind_ack_ctx;
        DATA_BLOB auth_resp = data_blob_null;
        DATA_BLOB auth_blob = data_blob_null;
-       DATA_BLOB blob = data_blob_null;
        int pad_len = 0;
 
        /* No rebinds on a bound pipe - use alter context. */
@@ -1523,14 +1211,6 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt)
                assoc_gid = 0x53f0;
        }
 
-       /*
-        * 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);
-
        /*
         * Create the bind response struct.
         */
@@ -1666,12 +1346,20 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt)
        /* NOTE: We leave the auth_info empty so we can calculate the padding
         * later and then append the auth_info --simo */
 
-       status = dcerpc_push_ncacn_packet(pkt, DCERPC_PKT_BIND_ACK,
+       /*
+        * 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_ACK,
                                          DCERPC_PFC_FLAG_FIRST |
                                                DCERPC_PFC_FLAG_LAST,
                                          auth_resp.length,
                                          pkt->call_id,
-                                         &u, &blob);
+                                         &u,
+                                         &p->out_data.frag);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("Failed to marshall bind_ack packet. (%s)\n",
                          nt_errstr(status)));
@@ -1680,7 +1368,7 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt)
        if (auth_resp.length) {
 
                /* Work out any padding needed before the auth footer. */
-               pad_len = blob.length % SERVER_NDR_PADDING_SIZE;
+               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",
@@ -1702,20 +1390,17 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt)
 
        /* Now that we have the auth len store it into the right place in
         * the dcerpc header */
-       dcerpc_set_frag_length(&blob, blob.length + pad_len + auth_blob.length);
-
-       /* And finally copy all bits in the output pdu */
-       if (!prs_copy_data_in(&p->out_data.frag,
-                                       (char *)blob.data, blob.length)) {
-               DEBUG(0, ("Failed to copy data to output buffer.\n"));
-               goto err_exit;
-       }
+       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, pad_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));
@@ -1723,9 +1408,8 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt)
                        }
                }
 
-               if (!prs_copy_data_in(&p->out_data.frag,
-                                       (char *)auth_blob.data,
-                                       auth_blob.length)) {
+               if (!data_blob_append(p->mem_ctx, &p->out_data.frag,
+                                       auth_blob.data, auth_blob.length)) {
                        DEBUG(0, ("Append of auth info failed.\n"));
                        goto err_exit;
                }
@@ -1739,14 +1423,12 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt)
        p->out_data.current_pdu_sent = 0;
 
        TALLOC_FREE(auth_blob.data);
-       TALLOC_FREE(blob.data);
        return True;
 
   err_exit:
 
-       prs_mem_free(&p->out_data.frag);
+       data_blob_free(&p->out_data.frag);
        TALLOC_FREE(auth_blob.data);
-       TALLOC_FREE(blob.data);
        return setup_bind_nak(p, pkt);
 }
 
@@ -1757,48 +1439,14 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt)
 
 bool api_pipe_alter_context(pipes_struct *p, struct ncacn_packet *pkt)
 {
-       RPC_HDR hdr;
-       RPC_HDR_BA hdr_ba;
        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;
-       }
-
-       /* 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__));
 
@@ -1822,49 +1470,22 @@ bool api_pipe_alter_context(pipes_struct *p, struct ncacn_packet *pkt)
                        &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)) {
-               init_rpc_hdr_ba(&hdr_ba,
-                       RPC_MAX_PDU_FRAG_LEN,
-                       RPC_MAX_PDU_FRAG_LEN,
-                       assoc_gid,
-                       ack_pipe_name,
-                       0x1, 0x0, 0x0,
-                       &pkt->u.bind.ctx_list[0].transfer_syntaxes[0]);
+
+               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 (pkt->auth_length != 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. */
 
@@ -1895,64 +1516,100 @@ bool api_pipe_alter_context(pipes_struct *p, struct ncacn_packet *pkt)
                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,
-                                                   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(&hdr, DCERPC_PKT_ALTER_RESP, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
-                       pkt->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("", &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;
                }
        }
@@ -1964,15 +1621,13 @@ bool api_pipe_alter_context(pipes_struct *p, struct ncacn_packet *pkt)
        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);
+       data_blob_free(&p->out_data.frag);
+       TALLOC_FREE(auth_blob.data);
        return setup_bind_nak(p, pkt);
 }
 
@@ -2033,7 +1688,7 @@ bool api_pipe_request(pipes_struct *p, struct ncacn_packet *pkt)
                        ((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;
@@ -2075,7 +1730,7 @@ 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 - ",
@@ -2109,7 +1764,7 @@ static bool api_rpcTNP(pipes_struct *p, struct ncacn_packet *pkt,
                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));
@@ -2118,7 +1773,7 @@ static bool api_rpcTNP(pipes_struct *p, struct ncacn_packet *pkt,
                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;
        }
 
@@ -2136,15 +1791,15 @@ static bool api_rpcTNP(pipes_struct *p, struct ncacn_packet *pkt,
                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, pkt->u.request.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)));