s3-dcerpc: Use dcerpc_pull_dcerpc_auth in api_pipe_bind_auth3()
[kamenim/samba.git] / source3 / rpc_server / srv_pipe.c
index d1f9823b497b8adb07b76371db1ab1a2ba7ee1fb..7a6261613f8a0773731d4e8247668c9e3cbc0c7e 100644 (file)
@@ -748,12 +748,11 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
 
 bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
 {
-       RPC_HDR_AUTH auth_info;
+       struct dcerpc_auth auth_info;
        uint32 pad = 0;
-       DATA_BLOB blob;
+       DATA_BLOB auth_blob;
        uint32_t auth_len = p->hdr.auth_len;
-
-       ZERO_STRUCT(blob);
+       NTSTATUS status;
 
        DEBUG(5,("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
 
@@ -796,9 +795,15 @@ bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
                goto err;
        }
 
-       if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, rpc_in_p, 0)) {
-               DEBUG(0,("api_pipe_bind_auth3: failed to "
-                       "unmarshall RPC_HDR_AUTH.\n"));
+       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);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed to unmarshall dcerpc_auth.\n"));
                goto err;
        }
 
@@ -813,32 +818,21 @@ bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
                return False;
        }
 
-       blob = data_blob(NULL,p->hdr.auth_len);
-
-       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
-               DEBUG(0,("api_pipe_bind_auth3: Failed to pull %u bytes - the response blob.\n",
-                       (unsigned int)p->hdr.auth_len ));
-               goto err;
-       }
-
        /*
         * The following call actually checks the challenge/response data.
         * for correctness against the given DOMAIN\user name.
         */
 
-       if (!pipe_ntlmssp_verify_final(p, &blob)) {
+       if (!pipe_ntlmssp_verify_final(p, &auth_info.credentials)) {
                goto err;
        }
 
-       data_blob_free(&blob);
-
        p->pipe_bound = True;
 
        return True;
 
  err:
 
-       data_blob_free(&blob);
        free_pipe_ntlmssp_auth_data(&p->auth);
        p->auth.a_u.auth_ntlmssp_state = NULL;
 
@@ -851,8 +845,9 @@ bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
 
 static bool setup_bind_nak(pipes_struct *p)
 {
-       RPC_HDR nak_hdr;
-       uint16 zero = 0;
+       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);
@@ -869,24 +864,25 @@ static bool setup_bind_nak(pipes_struct *p)
         * Initialize a bind_nak header.
         */
 
-       init_rpc_hdr(&nak_hdr, DCERPC_PKT_BIND_NAK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
-               p->hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
+       ZERO_STRUCT(u);
 
-       /*
-        * Marshall the header into the outgoing PDU.
-        */
+       u.bind_nak.reject_reason  = 0;
 
-       if(!smb_io_rpc_hdr("", &nak_hdr, &p->out_data.frag, 0)) {
-               DEBUG(0,("setup_bind_nak: marshalling of RPC_HDR failed.\n"));
+       status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                         DCERPC_PKT_BIND_NAK,
+                                         DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
+                                         RPC_HEADER_LEN + sizeof(uint16_t) /* FIXME - gd */,
+                                         0,
+                                         p->hdr.call_id,
+                                         u,
+                                         &blob);
+       if (!NT_STATUS_IS_OK(status)) {
                prs_mem_free(&p->out_data.frag);
                return False;
        }
 
-       /*
-        * Now add the reject reason.
-        */
-
-       if(!prs_uint16("reject code", &p->out_data.frag, 0, &zero)) {
+       if (!prs_copy_data_in(&p->out_data.frag,
+                             (char *)blob.data, blob.length)) {
                prs_mem_free(&p->out_data.frag);
                return False;
        }
@@ -908,11 +904,11 @@ static bool setup_bind_nak(pipes_struct *p)
  Marshall a fault pdu.
 *******************************************************************/
 
-bool setup_fault_pdu(pipes_struct *p, NTSTATUS status)
+bool setup_fault_pdu(pipes_struct *p, NTSTATUS fault_status)
 {
-       RPC_HDR fault_hdr;
-       RPC_HDR_RESP hdr_resp;
-       RPC_HDR_FAULT fault_resp;
+       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);
@@ -929,36 +925,26 @@ bool setup_fault_pdu(pipes_struct *p, NTSTATUS status)
         * Initialize a fault header.
         */
 
-       init_rpc_hdr(&fault_hdr, DCERPC_PKT_FAULT, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST | DCERPC_PFC_FLAG_DID_NOT_EXECUTE,
-            p->hdr.call_id, RPC_HEADER_LEN + RPC_HDR_RESP_LEN + RPC_HDR_FAULT_LEN, 0);
-
-       /*
-        * Initialize the HDR_RESP and FAULT parts of the PDU.
-        */
-
-       memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
-
-       fault_resp.status = status;
-       fault_resp.reserved = 0;
-
-       /*
-        * Marshall the header into the outgoing PDU.
-        */
+       ZERO_STRUCT(u);
 
-       if(!smb_io_rpc_hdr("", &fault_hdr, &p->out_data.frag, 0)) {
-               DEBUG(0,("setup_fault_pdu: marshalling of RPC_HDR failed.\n"));
-               prs_mem_free(&p->out_data.frag);
-               return False;
-       }
+       u.fault.status          = NT_STATUS_V(fault_status);
+       u.fault._pad            = data_blob_talloc_zero(p->mem_ctx, 4);
 
-       if(!smb_io_rpc_hdr_resp("resp", &hdr_resp, &p->out_data.frag, 0)) {
-               DEBUG(0,("setup_fault_pdu: failed to marshall RPC_HDR_RESP.\n"));
+       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,
+                                         RPC_HEADER_LEN + RPC_HDR_RESP_LEN + RPC_HDR_FAULT_LEN /* FIXME - gd */,
+                                         0,
+                                         p->hdr.call_id,
+                                         u,
+                                         &blob);
+       if (!NT_STATUS_IS_OK(status)) {
                prs_mem_free(&p->out_data.frag);
                return False;
        }
 
-       if(!smb_io_rpc_hdr_fault("fault", &fault_resp, &p->out_data.frag, 0)) {
-               DEBUG(0,("setup_fault_pdu: failed to marshall RPC_HDR_FAULT.\n"));
+       if (!prs_copy_data_in(&p->out_data.frag,
+                             (char *)blob.data, blob.length)) {
                prs_mem_free(&p->out_data.frag);
                return False;
        }
@@ -969,55 +955,6 @@ bool setup_fault_pdu(pipes_struct *p, NTSTATUS status)
        return True;
 }
 
-#if 0
-/*******************************************************************
- Marshall a cancel_ack pdu.
- We should probably check the auth-verifier here.
-*******************************************************************/
-
-bool setup_cancel_ack_reply(pipes_struct *p, prs_struct *rpc_in_p)
-{
-       prs_struct outgoing_pdu;
-       RPC_HDR ack_reply_hdr;
-
-       /* Free any memory in the current return data buffer. */
-       prs_mem_free(&p->out_data.rdata);
-
-       /*
-        * Marshall directly into the outgoing PDU space. We
-        * must do this as we need to set to the bind response
-        * header and are never sending more than one PDU here.
-        */
-
-       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
-       prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
-
-       /*
-        * Initialize a cancel_ack header.
-        */
-
-       init_rpc_hdr(&ack_reply_hdr, DCERPC_PKT_CANCEL_ACK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
-                       p->hdr.call_id, RPC_HEADER_LEN, 0);
-
-       /*
-        * Marshall the header into the outgoing PDU.
-        */
-
-       if(!smb_io_rpc_hdr("", &ack_reply_hdr, &outgoing_pdu, 0)) {
-               DEBUG(0,("setup_cancel_ack_reply: marshalling of RPC_HDR failed.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
-       }
-
-       p->out_data.data_sent_length = 0;
-       p->out_data.current_pdu_len = prs_offset(&outgoing_pdu);
-       p->out_data.current_pdu_sent = 0;
-
-       prs_mem_free(&outgoing_pdu);
-       return True;
-}
-#endif
-
 /*******************************************************************
  Ensure a bind request has the correct abstract & transfer interface.
  Used to reject unknown binds from Win2k.
@@ -1111,8 +1048,11 @@ bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax)
  Handle a SPNEGO krb5 bind auth.
 *******************************************************************/
 
-static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info,
-               DATA_BLOB *psecblob, prs_struct *pout_auth)
+static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p,
+                                          prs_struct *rpc_in_p,
+                                          struct dcerpc_auth *pauth_info,
+                                          DATA_BLOB *psecblob,
+                                          prs_struct *pout_auth)
 {
        return False;
 }
@@ -1121,9 +1061,11 @@ static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p
  Handle the first part of a SPNEGO bind auth.
 *******************************************************************/
 
-static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_p,
-                                       uint32_t ss_padding_len,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
+                                           prs_struct *rpc_in_p,
+                                           uint32_t ss_padding_len,
+                                           struct dcerpc_auth *pauth_info,
+                                           prs_struct *pout_auth)
 {
        DATA_BLOB blob;
        DATA_BLOB secblob;
@@ -1134,27 +1076,17 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
        NTSTATUS status;
         bool got_kerberos_mechanism = false;
        struct auth_ntlmssp_state *a = NULL;
-       RPC_HDR_AUTH auth_info;
 
        ZERO_STRUCT(secblob);
        ZERO_STRUCT(chal);
        ZERO_STRUCT(response);
 
-       /* Grab the SPNEGO blob. */
-       blob = data_blob(NULL,p->hdr.auth_len);
-
-       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
-               DEBUG(0,("pipe_spnego_auth_bind_negotiate: Failed to pull %u bytes - the SPNEGO auth header.\n",
-                       (unsigned int)p->hdr.auth_len ));
-               goto err;
-       }
-
-       if (blob.data[0] != ASN1_APPLICATION(0)) {
+       if (pauth_info->credentials.data[0] != ASN1_APPLICATION(0)) {
                goto err;
        }
 
        /* parse out the OIDs and the first sec blob */
-       if (!parse_negTokenTarg(blob, OIDs, &secblob)) {
+       if (!parse_negTokenTarg(pauth_info->credentials, OIDs, &secblob)) {
                DEBUG(0,("pipe_spnego_auth_bind_negotiate: Failed to parse the security blob.\n"));
                goto err;
         }
@@ -1172,7 +1104,6 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
        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);
                data_blob_free(&secblob);
-               data_blob_free(&blob);
                return ret;
        }
 
@@ -1188,7 +1119,7 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
                        goto err;
                }
 
-               switch (auth_info.auth_level) {
+               switch (pauth_info->auth_level) {
                        case DCERPC_AUTH_LEVEL_INTEGRITY:
                                auth_ntlmssp_want_sign(a);
                                break;
@@ -1226,15 +1157,20 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
 
        /* auth_pad_len will be handled by the caller */
 
-       /* 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_negotiate: marshalling of RPC_HDR_AUTH failed.\n"));
+       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;
        }
 
-       if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
+       /* 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;
        }
@@ -1243,7 +1179,6 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
        p->auth.auth_data_free_func = &free_pipe_ntlmssp_auth_data;
        p->auth.auth_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
 
-       data_blob_free(&blob);
        data_blob_free(&secblob);
        data_blob_free(&chal);
        data_blob_free(&response);
@@ -1253,7 +1188,6 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
 
  err:
 
-       data_blob_free(&blob);
        data_blob_free(&secblob);
        data_blob_free(&chal);
        data_blob_free(&response);
@@ -1365,11 +1299,13 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
  Handle an schannel bind auth.
 *******************************************************************/
 
-static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
+static bool pipe_schannel_auth_bind(pipes_struct *p,
+                                       prs_struct *rpc_in_p,
                                        uint32_t ss_padding_len,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+                                       struct dcerpc_auth *auth_info,
+                                       prs_struct *pout_auth)
 {
-       RPC_HDR_AUTH auth_info;
+       DATA_BLOB auth_blob;
        struct NL_AUTH_MESSAGE neg;
        struct NL_AUTH_MESSAGE reply;
        bool ret;
@@ -1379,11 +1315,10 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
        enum ndr_err_code ndr_err;
        DATA_BLOB blob;
 
-       blob = data_blob_const(prs_data_p(rpc_in_p) + prs_offset(rpc_in_p),
-                              prs_data_size(rpc_in_p));
-
-       ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &neg,
-                              (ndr_pull_flags_fn_t)ndr_pull_NL_AUTH_MESSAGE);
+       ndr_err = ndr_pull_struct_blob(
+                       &auth_info->credentials,
+                       prs_get_mem_context(pout_auth), &neg,
+                       (ndr_pull_flags_fn_t)ndr_pull_NL_AUTH_MESSAGE);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                DEBUG(0,("pipe_schannel_auth_bind: Could not unmarshal SCHANNEL auth neg\n"));
                return false;
@@ -1452,13 +1387,6 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                return false;
        }
 
-       init_rpc_hdr_auth(&auth_info, DCERPC_AUTH_TYPE_SCHANNEL,
-                       pauth_info->auth_level, ss_padding_len, 1);
-       if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-               DEBUG(0,("pipe_schannel_auth_bind: marshalling of RPC_HDR_AUTH failed.\n"));
-               return False;
-       }
-
        /*** SCHANNEL verifier ***/
 
        reply.MessageType                       = NL_NEGOTIATE_RESPONSE;
@@ -1467,7 +1395,7 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                                                      * this has any meaning
                                                      * here - gd */
 
-       ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), &reply,
+       ndr_err = ndr_push_struct_blob(&auth_blob, talloc_tos(), &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"));
@@ -1478,6 +1406,18 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_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;
        }
@@ -1498,30 +1438,21 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
  Handle an NTLMSSP bind auth.
 *******************************************************************/
 
-static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
+static bool pipe_ntlmssp_auth_bind(pipes_struct *p,
+                                       prs_struct *rpc_in_p,
                                        uint32_t ss_padding_len,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+                                       struct dcerpc_auth *auth_info,
+                                       prs_struct *pout_auth)
 {
-       RPC_HDR_AUTH auth_info;
         DATA_BLOB blob;
        DATA_BLOB response;
         NTSTATUS status;
        struct auth_ntlmssp_state *a = NULL;
 
-       ZERO_STRUCT(blob);
        ZERO_STRUCT(response);
 
-       /* Grab the NTLMSSP blob. */
-       blob = data_blob(NULL,p->hdr.auth_len);
-
-       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: Failed to pull %u bytes - the NTLM auth header.\n",
-                       (unsigned int)p->hdr.auth_len ));
-               goto err;
-       }
-
-       if (strncmp((char *)blob.data, "NTLMSSP", 7) != 0) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: Failed to read NTLMSSP in blob\n"));
+       if (strncmp((char *)auth_info->credentials.data, "NTLMSSP", 7) != 0) {
+               DEBUG(0, ("Failed to read NTLMSSP in blob\n"));
                 goto err;
         }
 
@@ -1533,7 +1464,7 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                goto err;
        }
 
-       switch (pauth_info->auth_level) {
+       switch (auth_info->auth_level) {
        case DCERPC_AUTH_LEVEL_INTEGRITY:
                auth_ntlmssp_want_sign(a);
                break;
@@ -1544,24 +1475,27 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                break;
        }
 
-       status = auth_ntlmssp_update(a, blob, &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;
        }
 
-       data_blob_free(&blob);
-
-       /* Copy the blob into the pout_auth parse struct */
-       init_rpc_hdr_auth(&auth_info, DCERPC_AUTH_TYPE_NTLMSSP,
-                       pauth_info->auth_level, ss_padding_len, 1);
-       if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: marshalling of RPC_HDR_AUTH failed.\n"));
+       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;
        }
 
-       if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
+       /* 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;
        }
@@ -1570,7 +1504,6 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
        p->auth.auth_data_free_func = &free_pipe_ntlmssp_auth_data;
        p->auth.auth_type = PIPE_AUTH_TYPE_NTLMSSP;
 
-       data_blob_free(&blob);
        data_blob_free(&response);
 
        DEBUG(10,("pipe_ntlmssp_auth_bind: NTLMSSP auth started\n"));
@@ -1580,7 +1513,6 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
 
   err:
 
-       data_blob_free(&blob);
        data_blob_free(&response);
 
        free_pipe_ntlmssp_auth_data(&p->auth);
@@ -1595,8 +1527,10 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
 bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 {
        RPC_HDR_BA hdr_ba;
-       RPC_HDR_RB hdr_rb;
-       RPC_HDR_AUTH auth_info;
+       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;
@@ -1643,17 +1577,15 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
        DEBUG(5,("api_pipe_bind_req: decode request. %d\n", __LINE__));
 
-       ZERO_STRUCT(hdr_rb);
-
        /* decode the bind request */
-
-       if(!smb_io_rpc_hdr_rb("", &hdr_rb, rpc_in_p, 0))  {
-               DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_RB "
-                        "struct.\n"));
+       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;
        }
 
-       if (hdr_rb.num_contexts == 0) {
+       if (rpc_bind.num_contexts == 0) {
                DEBUG(0, ("api_pipe_bind_req: no rpc contexts around\n"));
                goto err_exit;
        }
@@ -1662,7 +1594,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 = hdr_rb.rpc_context[0].abstract;
+       id = rpc_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),
@@ -1671,13 +1603,13 @@ 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(),
-                               &hdr_rb.rpc_context[0].abstract));
+                               &rpc_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(),
-                                       &hdr_rb.rpc_context[0].abstract)));
+                                       &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);
@@ -1709,7 +1641,12 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
        DEBUG(5,("api_pipe_bind_req: make response. %d\n", __LINE__));
 
-       assoc_gid = hdr_rb.bba.assoc_gid ? hdr_rb.bba.assoc_gid : 0x53f0;
+       if (rpc_bind.assoc_group_id != 0) {
+               assoc_gid = rpc_bind.assoc_group_id;
+       } else {
+               assoc_gid = 0x53f0;
+       }
+
 
        /*
         * Create the bind response struct.
@@ -1721,15 +1658,17 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                unknown to NT4)
                Needed when adding entries to a DACL from NT5 - SK */
 
-       if(check_bind_req(p, &hdr_rb.rpc_context[0].abstract, &hdr_rb.rpc_context[0].transfer[0],
-                               hdr_rb.rpc_context[0].context_id )) {
+       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,
-                       &hdr_rb.rpc_context[0].transfer[0]);
+                       &rpc_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,
@@ -1791,8 +1730,15 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                        goto err_exit;
                }
 
-               if(!smb_io_rpc_hdr_auth("", &auth_info, rpc_in_p, 0)) {
-                       DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_AUTH struct.\n"));
+               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);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n"));
                        goto err_exit;
                }
 
@@ -1800,16 +1746,16 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
                /* Work out if we have to sign or seal etc. */
                switch (auth_info.auth_level) {
-                       case DCERPC_AUTH_LEVEL_INTEGRITY:
-                               p->auth.auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
-                               break;
-                       case DCERPC_AUTH_LEVEL_PRIVACY:
-                               p->auth.auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
-                               break;
-                       default:
-                               DEBUG(0,("api_pipe_bind_req: unexpected auth level (%u).\n",
-                                       (unsigned int)auth_info.auth_level ));
-                               goto err_exit;
+               case DCERPC_AUTH_LEVEL_INTEGRITY:
+                       p->auth.auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+                       break;
+               case DCERPC_AUTH_LEVEL_PRIVACY:
+                       p->auth.auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
+                       break;
+               default:
+                       DEBUG(0, ("Unexpected auth level (%u).\n",
+                               (unsigned int)auth_info.auth_level ));
+                       goto err_exit;
                }
        } else {
                ZERO_STRUCT(auth_info);
@@ -1933,7 +1879,8 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
 {
        RPC_HDR_BA hdr_ba;
-       RPC_HDR_RB hdr_rb;
+       struct dcerpc_bind rpc_bind;
+       DATA_BLOB blob_rb;
        RPC_HDR_AUTH auth_info;
        uint16 assoc_gid;
        fstring ack_pipe_name;
@@ -1941,6 +1888,7 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
        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);
 
@@ -1968,13 +1916,13 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
                return False;
        }
 
-       ZERO_STRUCT(hdr_rb);
-
        DEBUG(5,("api_pipe_alter_context: decode request. %d\n", __LINE__));
 
        /* decode the alter context request */
-       if(!smb_io_rpc_hdr_rb("", &hdr_rb, rpc_in_p, 0))  {
-               DEBUG(0,("api_pipe_alter_context: unable to unmarshall RPC_HDR_RB struct.\n"));
+       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;
        }
 
@@ -1986,7 +1934,11 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
 
        DEBUG(5,("api_pipe_alter_context: make response. %d\n", __LINE__));
 
-       assoc_gid = hdr_rb.bba.assoc_gid ? hdr_rb.bba.assoc_gid : 0x53f0;
+       if (rpc_bind.assoc_group_id != 0) {
+               assoc_gid = rpc_bind.assoc_group_id;
+       } else {
+               assoc_gid = 0x53f0;
+       }
 
        /*
         * Create the bind response struct.
@@ -1998,15 +1950,17 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
                unknown to NT4)
                Needed when adding entries to a DACL from NT5 - SK */
 
-       if(check_bind_req(p, &hdr_rb.rpc_context[0].abstract, &hdr_rb.rpc_context[0].transfer[0],
-                               hdr_rb.rpc_context[0].context_id )) {
+       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,
-                       &hdr_rb.rpc_context[0].transfer[0]);
+                       &rpc_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,
@@ -2152,7 +2106,6 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
 
        prs_mem_free(&out_hdr_ba);
        prs_mem_free(&out_auth);
-
        return True;
 
   err_exit: