Changeset 745 for trunk/server/source3/rpc_server/srv_pipe.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/rpc_server/srv_pipe.c (modified) (46 diffs)

trunk/server/source3/rpc_server/srv_pipe.c

@@ -2 +2 @@
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
- *  Almost completely rewritten by (C) Jeremy Allison 2005.
+ *  Almost completely rewritten by (C) Jeremy Allison 2005
  *  
  *  This program is free software; you can redistribute it and/or modify
@@ -29 +29 @@
 
 #include "includes.h"
+
+
 #include "../librpc/gen_ndr/ndr_schannel.h"
 #include "../libcli/auth/schannel.h"
 #include "../libcli/auth/spnego.h"
-
-extern struct current_user current_user;
+#include "dcesrv_ntlmssp.h"
+#include "dcesrv_gssapi.h"
+#include "dcesrv_spnego.h"
+#include "rpc_server.h"
+#include "rpc_dce.h"
+#include "smbd/smbd.h"
+#include "auth.h"
+#include "ntdomain.h"
+#include "rpc_server/srv_pipe.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
-static void free_pipe_ntlmssp_auth_data(struct pipe_auth_data *auth)
-{
-        AUTH_NTLMSSP_STATE *a = auth->a_u.auth_ntlmssp_state;
-
-        if (a) {
-                auth_ntlmssp_end(&a);
-        }
-        auth->a_u.auth_ntlmssp_state = NULL;
+/**
+ * Dump everything from the start of the end up of the provided data
+ * into a file, but only at debug level >= 50
+ **/
+static void dump_pdu_region(const char *name, int v,
+                            DATA_BLOB *data, size_t start, size_t end)
+{
+        int fd, i;
+        char *fname = NULL;
+        ssize_t sz;
+
+        if (DEBUGLEVEL < 50) return;
+
+        if (start > data->length || end > data->length || start > end) return;
+
+        for (i = 1; i < 100; i++) {
+                if (v != -1) {
+                        fname = talloc_asprintf(talloc_tos(),
+                                                "/tmp/%s_%d.%d.prs",
+                                                name, v, i);
+                } else {
+                        fname = talloc_asprintf(talloc_tos(),
+                                                "/tmp/%s_%d.prs",
+                                                name, i);
+                }
+                if (!fname) {
+                        return;
+                }
+                fd = open(fname, O_WRONLY|O_CREAT|O_EXCL, 0644);
+                if (fd != -1 || errno != EEXIST) break;
+        }
+        if (fd != -1) {
+                sz = write(fd, data->data + start, end - start);
+                i = close(fd);
+                if ((sz != end - start) || (i != 0) ) {
+                        DEBUG(0, ("Error writing/closing %s: %ld!=%ld %d\n",
+                                  fname, (unsigned long)sz,
+                                  (unsigned long)end - start, i));
+                } else {
+                        DEBUG(0,("created %s\n", fname));
+                }
+        }
+        TALLOC_FREE(fname);
 }
 
 static DATA_BLOB generic_session_key(void)
 {
-        return data_blob("SystemLibraryDTC", 16);
+        return data_blob("SystemLibraryDTC", 16);
 }
 
 /*******************************************************************
- Generate the next PDU to be returned from the data in p->rdata. 
- Handle NTLMSSP.
- ********************************************************************/
-
-static bool create_next_pdu_ntlmssp(pipes_struct *p)
-{
-        RPC_HDR_RESP hdr_resp;
-        uint32 ss_padding_len = 0;
-        uint32 data_space_available;
-        uint32 data_len_left;
-        uint32 data_len;
+ Generate the next PDU to be returned from the data.
+********************************************************************/
+
+static NTSTATUS create_next_packet(TALLOC_CTX *mem_ctx,
+                                   struct pipe_auth_data *auth,
+                                   uint32_t call_id,
+                                   DATA_BLOB *rdata,
+                                   size_t data_sent_length,
+                                   DATA_BLOB *frag,
+                                   size_t *pdu_size)
+{
+        union dcerpc_payload u;
+        uint8_t pfc_flags;
+        size_t data_left;
+        size_t data_to_send;
+        size_t frag_len;
+        size_t pad_len = 0;
+        size_t auth_len = 0;
         NTSTATUS status;
-        DATA_BLOB auth_blob;
-        RPC_HDR_AUTH auth_info;
-        uint8 auth_type, auth_level;
-        AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
-
-        /*
-         * If we're in the fault state, keep returning fault PDU's until
-         * the pipe gets closed. JRA.
-         */
-
-        if(p->fault_state) {
-                setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
-                return True;
-        }
-
-        memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
-
-        /* Change the incoming request header to a response. */
-        p->hdr.pkt_type = DCERPC_PKT_RESPONSE;
-
-        /* Set up rpc header flags. */
-        if (p->out_data.data_sent_length == 0) {
-                p->hdr.flags = DCERPC_PFC_FLAG_FIRST;
+
+        ZERO_STRUCT(u.response);
+
+        /* Set up rpc packet pfc flags. */
+        if (data_sent_length == 0) {
+                pfc_flags = DCERPC_PFC_FLAG_FIRST;
         } else {
-                p->hdr.flags = 0;
-        }
-
-        /*
-         * Work out how much we can fit in a single PDU.
-         */
-
-        data_len_left = prs_offset(&p->out_data.rdata) - p->out_data.data_sent_length;
-
-        /*
-         * Ensure there really is data left to send.
-         */
-
-        if(!data_len_left) {
-                DEBUG(0,("create_next_pdu_ntlmssp: no data left to send !\n"));
-                return False;
-        }
-
-        data_space_available = 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);
-
-        /*
-         * Set up the alloc hint. This should be the data left to
-         * send.
-         */
-
-        hdr_resp.alloc_hint = data_len_left;
-
-        /*
-         * Work out if this PDU will be the last.
-         */
-
-        if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata)) {
-                p->hdr.flags |= DCERPC_PFC_FLAG_LAST;
-                if (data_len_left % 8) {
-                        ss_padding_len = 8 - (data_len_left % 8);
-                        DEBUG(10,("create_next_pdu_ntlmssp: adding sign/seal padding of %u\n",
-                                ss_padding_len ));
-                }
-        }
-
-        /*
-         * Set up the header lengths.
-         */
-
-        p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN +
-                        data_len + ss_padding_len +
-                        RPC_HDR_AUTH_LEN + NTLMSSP_SIG_SIZE;
-        p->hdr.auth_len = NTLMSSP_SIG_SIZE;
-
-
-        /*
-         * Init the parse struct to point at the outgoing
-         * data.
-         */
-
-        prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL);
-
-        /* Store the header in the data stream. */
-        if(!smb_io_rpc_hdr("hdr", &p->hdr, &p->out_data.frag, 0)) {
-                DEBUG(0,("create_next_pdu_ntlmssp: failed to marshall RPC_HDR.\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_ntlmssp: 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_ntlmssp: failed to copy %u bytes of data.\n", (unsigned int)data_len));
-                prs_mem_free(&p->out_data.frag);
-                return False;
-        }
-
-        /* Copy the sign/seal padding data. */
-        if (ss_padding_len) {
-                char pad[8];
-
-                memset(pad, '\0', 8);
-                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;
-                }
-        }
-
-
-        /* 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;
-        }
-
-        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;
-        }
-
-        /* Generate the sign blob. */
-
-        switch (p->auth.auth_level) {
-                case DCERPC_AUTH_LEVEL_PRIVACY:
-                        /* Data portion is encrypted. */
-                        status = ntlmssp_seal_packet(
-                                a->ntlmssp_state,
-                                (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)) {
-                                data_blob_free(&auth_blob);
-                                prs_mem_free(&p->out_data.frag);
-                                return False;
-                        }
-                        break;
-                case DCERPC_AUTH_LEVEL_INTEGRITY:
-                        /* Data is signed. */
-                        status = ntlmssp_sign_packet(
-                                a->ntlmssp_state,
-                                (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)) {
-                                data_blob_free(&auth_blob);
-                                prs_mem_free(&p->out_data.frag);
-                                return False;
-                        }
-                        break;
-                default:
-                        prs_mem_free(&p->out_data.frag);
-                        return False;
-        }
-
-        /* 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));
-                data_blob_free(&auth_blob);
-                prs_mem_free(&p->out_data.frag);
-                return False;
-        }
-
-        data_blob_free(&auth_blob);
-
-        /*
-         * Setup the counts for this PDU.
-         */
-
-        p->out_data.data_sent_length += data_len;
-        p->out_data.current_pdu_sent = 0;
-
-        return True;
-}
-
-/*******************************************************************
- Generate the next PDU to be returned from the data in p->rdata. 
- Return an schannel authenticated fragment.
- ********************************************************************/
-
-static bool create_next_pdu_schannel(pipes_struct *p)
-{
-        RPC_HDR_RESP hdr_resp;
-        uint32 ss_padding_len = 0;
-        uint32 data_len;
-        uint32 data_space_available;
-        uint32 data_len_left;
-        uint32 data_pos;
-        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;
-        }
-
-        memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
-
-        /* Change the incoming request header to a response. */
-        p->hdr.pkt_type = DCERPC_PKT_RESPONSE;
-
-        /* Set up rpc header flags. */
-        if (p->out_data.data_sent_length == 0) {
-                p->hdr.flags = DCERPC_PFC_FLAG_FIRST;
-        } else {
-                p->hdr.flags = 0;
-        }
-
-        /*
-         * Work out how much we can fit in a single PDU.
-         */
-
-        data_len_left = prs_offset(&p->out_data.rdata) - p->out_data.data_sent_length;
-
-        /*
-         * Ensure there really is data left to send.
-         */
-
-        if(!data_len_left) {
-                DEBUG(0,("create_next_pdu_schannel: no data left to send !\n"));
-                return False;
-        }
-
-        data_space_available = RPC_MAX_PDU_FRAG_LEN - RPC_HEADER_LEN
-                - RPC_HDR_RESP_LEN - RPC_HDR_AUTH_LEN
-                - RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN;
-
-        /*
-         * The amount we send is the minimum of the available
-         * space and the amount left to send.
-         */
-
-        data_len = MIN(data_len_left, data_space_available);
-
-        /*
-         * Set up the alloc hint. This should be the data left to
-         * send.
-         */
-
-        hdr_resp.alloc_hint = data_len_left;
-
-        /*
-         * Work out if this PDU will be the last.
-         */
-
-        if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata)) {
-                p->hdr.flags |= DCERPC_PFC_FLAG_LAST;
-                if (data_len_left % 8) {
-                        ss_padding_len = 8 - (data_len_left % 8);
-                        DEBUG(10,("create_next_pdu_schannel: adding sign/seal padding of %u\n",
-                                ss_padding_len ));
-                }
-        }
-
-        p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len + ss_padding_len +
-                                RPC_HDR_AUTH_LEN + RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN;
-        p->hdr.auth_len = RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN;
-
-        /*
-         * Init the parse struct to point at the outgoing
-         * data.
-         */
-
-        prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL);
-
-        /* Store the header in the data stream. */
-        if(!smb_io_rpc_hdr("hdr", &p->hdr, &p->out_data.frag, 0)) {
-                DEBUG(0,("create_next_pdu_schannel: failed to marshall RPC_HDR.\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_schannel: failed to marshall RPC_HDR_RESP.\n"));
-                prs_mem_free(&p->out_data.frag);
-                return False;
-        }
-
-        /* Store the current offset. */
-        data_pos = prs_offset(&p->out_data.frag);
-
-        /* 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;
-        }
-
-        /* Copy the sign/seal padding data. */
-        if (ss_padding_len) {
-                char pad[8];
-                memset(pad, '\0', 8);
-                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;
-                }
-
+                pfc_flags = 0;
+        }
+
+        /* Work out how much we can fit in a single PDU. */
+        data_left = rdata->length - data_sent_length;
+
+        /* Ensure there really is data left to send. */
+        if (!data_left) {
+                DEBUG(0, ("No data left to send !\n"));
+                return NT_STATUS_BUFFER_TOO_SMALL;
+        }
+
+        status = dcerpc_guess_sizes(auth,
+                                    DCERPC_RESPONSE_LENGTH,
+                                    data_left,
+                                    RPC_MAX_PDU_FRAG_LEN,
+                                    SERVER_NDR_PADDING_SIZE,
+                                    &data_to_send, &frag_len,
+                                    &auth_len, &pad_len);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        /* Set up the alloc hint. This should be the data left to send. */
+        u.response.alloc_hint = data_left;
+
+        /* Work out if this PDU will be the last. */
+        if (data_sent_length + data_to_send >= rdata->length) {
+                pfc_flags |= DCERPC_PFC_FLAG_LAST;
+        }
+
+        /* Prepare data to be NDR encoded. */
+        u.response.stub_and_verifier =
+                data_blob_const(rdata->data + data_sent_length, data_to_send);
+
+        /* Store the packet in the data stream. */
+        status = dcerpc_push_ncacn_packet(mem_ctx, DCERPC_PKT_RESPONSE,
+                                          pfc_flags, auth_len, call_id,
+                                          &u, frag);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("Failed to marshall RPC Packet.\n"));
+                return status;
+        }
+
+        if (auth_len) {
+                /* Set the proper length on the pdu, including padding.
+                 * Only needed if an auth trailer will be appended. */
+                dcerpc_set_frag_length(frag, frag->length
+                                                + pad_len
+                                                + DCERPC_AUTH_TRAILER_LENGTH
+                                                + auth_len);
+        }
+
+        if (auth_len) {
+                status = dcerpc_add_auth_footer(auth, pad_len, frag);
                 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);
-                        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);
-                        return false;
-                }
-        }
-
-        /*
-         * Setup the counts for this PDU.
-         */
-
-        p->out_data.data_sent_length += data_len;
-        p->out_data.current_pdu_sent = 0;
-
-        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)
-{
-        RPC_HDR_RESP hdr_resp;
-        uint32 data_len;
-        uint32 data_space_available;
-        uint32 data_len_left;
-
-        /*
-         * If we're in the fault state, keep returning fault PDU's until
-         * the pipe gets closed. JRA.
-         */
-
-        if(p->fault_state) {
-                setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
-                return True;
-        }
-
-        memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
-
-        /* Change the incoming request header to a response. */
-        p->hdr.pkt_type = DCERPC_PKT_RESPONSE;
-
-        /* Set up rpc header flags. */
-        if (p->out_data.data_sent_length == 0) {
-                p->hdr.flags = DCERPC_PFC_FLAG_FIRST;
-        } else {
-                p->hdr.flags = 0;
-        }
-
-        /*
-         * Work out how much we can fit in a single PDU.
-         */
-
-        data_len_left = prs_offset(&p->out_data.rdata) - p->out_data.data_sent_length;
-
-        /*
-         * Ensure there really is data left to send.
-         */
-
-        if(!data_len_left) {
-                DEBUG(0,("create_next_pdu_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)) {
-                p->hdr.flags |= DCERPC_PFC_FLAG_LAST;
-        }
-
-        /*
-         * Set up the header lengths.
-         */
-
-        p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len;
-        p->hdr.auth_len = 0;
-
-        /*
-         * Init the parse struct to point at the outgoing
-         * data.
-         */
-
-        prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL);
-
-        /* Store the header in the data stream. */
-        if(!smb_io_rpc_hdr("hdr", &p->hdr, &p->out_data.frag, 0)) {
-                DEBUG(0,("create_next_pdu_noath: failed to marshall RPC_HDR.\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;
-        }
-
-        /*
-         * Setup the counts for this PDU.
-         */
-
-        p->out_data.data_sent_length += data_len;
-        p->out_data.current_pdu_sent = 0;
-
-        return True;
+                        data_blob_free(frag);
+                        return status;
+                }
+        }
+
+        *pdu_size = data_to_send;
+        return NT_STATUS_OK;
 }
 
@@ -605 +193 @@
 ********************************************************************/
 
-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);
-
-                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;
-                        }
-        }
-
-        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;
-}
-
-/*******************************************************************
- Process an NTLMSSP authentication response.
- If this function succeeds, the user has been authenticated
- and their domain, name and calling workstation stored in
- the pipe struct.
-*******************************************************************/
-
-static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
-{
-        DATA_BLOB session_key, reply;
+bool create_next_pdu(struct pipes_struct *p)
+{
+        size_t pdu_size = 0;
         NTSTATUS status;
-        AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
-        bool ret;
-
-        DEBUG(5,("pipe_ntlmssp_verify_final: pipe %s checking user details\n",
-                 get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
-
-        ZERO_STRUCT(reply);
-
-        /* this has to be done as root in order to verify the password */
-        become_root();
-        status = auth_ntlmssp_update(a, *p_resp_blob, &reply);
-        unbecome_root();
-
-        /* Don't generate a reply. */
-        data_blob_free(&reply);
-
+
+        /*
+         * 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;
+        }
+
+        status = create_next_packet(p->mem_ctx, &p->auth,
+                                    p->call_id, &p->out_data.rdata,
+                                    p->out_data.data_sent_length,
+                                    &p->out_data.frag, &pdu_size);
         if (!NT_STATUS_IS_OK(status)) {
-                return False;
-        }
-
-        /* Finally - if the pipe negotiated integrity (sign) or privacy (seal)
-           ensure the underlying NTLMSSP flags are also set. If not we should
-           refuse the bind. */
-
-        if (p->auth.auth_level == DCERPC_AUTH_LEVEL_INTEGRITY) {
-                if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
-                        DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet integrity requested "
-                                "but client declined signing.\n",
-                                 get_pipe_name_from_syntax(talloc_tos(),
-                                                           &p->syntax)));
-                        return False;
-                }
-        }
-        if (p->auth.auth_level == DCERPC_AUTH_LEVEL_PRIVACY) {
-                if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
-                        DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet privacy requested "
-                                "but client declined sealing.\n",
-                                 get_pipe_name_from_syntax(talloc_tos(),
-                                                           &p->syntax)));
-                        return False;
-                }
-        }
-
-        DEBUG(5, ("pipe_ntlmssp_verify_final: OK: user: %s domain: %s "
-                  "workstation: %s\n", a->ntlmssp_state->user,
-                  a->ntlmssp_state->domain, a->ntlmssp_state->workstation));
-
-        if (a->server_info->ptok == NULL) {
-                DEBUG(1,("Error: Authmodule failed to provide nt_user_token\n"));
-                return False;
-        }
-
-        TALLOC_FREE(p->server_info);
-
-        p->server_info = copy_serverinfo(p, a->server_info);
-        if (p->server_info == NULL) {
-                DEBUG(0, ("copy_serverinfo failed\n"));
+                DEBUG(0, ("Failed to create packet with error %s, "
+                          "(auth level %u / type %u)\n",
+                          nt_errstr(status),
+                          (unsigned int)p->auth.auth_level,
+                          (unsigned int)p->auth.auth_type));
                 return false;
         }
 
-        /*
-         * We're an authenticated bind over smb, so the session key needs to
-         * be set to "SystemLibraryDTC". Weird, but this is what Windows
-         * does. See the RPC-SAMBA3SESSIONKEY.
-         */
-
-        session_key = generic_session_key();
-        if (session_key.data == NULL) {
-                return False;
-        }
-
-        ret = server_info_set_session_key(p->server_info, session_key);
-
-        data_blob_free(&session_key);
-
-        return True;
-}
-
-/*******************************************************************
- The switch table for the pipe names and the functions to handle them.
-*******************************************************************/
-
-struct rpc_table {
-        struct {
-                const char *clnt;
-                const char *srv;
-        } pipe;
-        struct ndr_syntax_id rpc_interface;
-        const struct api_struct *cmds;
-        int n_cmds;
-};
-
-static struct rpc_table *rpc_lookup;
-static int rpc_lookup_size;
-
-/*******************************************************************
- This is the "stage3" NTLMSSP response after a bind request and reply.
-*******************************************************************/
-
-bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
-{
-        RPC_HDR_AUTH auth_info;
-        uint32 pad = 0;
-        DATA_BLOB blob;
-
-        ZERO_STRUCT(blob);
-
-        DEBUG(5,("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
-
-        if (p->hdr.auth_len == 0) {
-                DEBUG(0,("api_pipe_bind_auth3: No auth field sent !\n"));
-                goto err;
-        }
-
-        /* 4 bytes padding. */
-        if (!prs_uint32("pad", rpc_in_p, 0, &pad)) {
-                DEBUG(0,("api_pipe_bind_auth3: unmarshall of 4 byte pad failed.\n"));
-                goto err;
-        }
-
-        /*
-         * Decode the authentication verifier response.
-         */
-
-        if(!smb_io_rpc_hdr_auth("", &auth_info, rpc_in_p, 0)) {
-                DEBUG(0,("api_pipe_bind_auth3: unmarshall of RPC_HDR_AUTH failed.\n"));
-                goto err;
-        }
-
-        if (auth_info.auth_type != DCERPC_AUTH_TYPE_NTLMSSP) {
-                DEBUG(0,("api_pipe_bind_auth3: incorrect auth type (%u).\n",
-                        (unsigned int)auth_info.auth_type ));
-                return False;
-        }
-
-        blob = data_blob(NULL,p->hdr.auth_len);
-
-        if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
-                DEBUG(0,("api_pipe_bind_auth3: Failed to pull %u bytes - the response blob.\n",
-                        (unsigned int)p->hdr.auth_len ));
-                goto err;
-        }
-
-        /*
-         * The following call actually checks the challenge/response data.
-         * for correctness against the given DOMAIN\user name.
-         */
-
-        if (!pipe_ntlmssp_verify_final(p, &blob)) {
-                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;
-
-        return False;
-}
+        /* Setup the counts for this PDU. */
+        p->out_data.data_sent_length += pdu_size;
+        p->out_data.current_pdu_sent = 0;
+        return true;
+}
+
+
+static bool pipe_init_outgoing_data(struct pipes_struct *p);
 
 /*******************************************************************
@@ -813 +233 @@
 *******************************************************************/
 
-static bool setup_bind_nak(pipes_struct *p)
-{
-        RPC_HDR nak_hdr;
-        uint16 zero = 0;
+static bool setup_bind_nak()
+{
+        ;
+        u;
 
         /* Free any memory in the current return data buffer. */
-        prs_mem_free(&p->out_data.rdata);
+        pipe_init_outgoing_data(p);
+
+        /*
+         * Initialize a bind_nak header.
+         */
+
+        ZERO_STRUCT(u);
+
+        u.bind_nak.reject_reason  = 0;
 
         /*
@@ -827 +255 @@
          */
 
-        prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL);
-
-        /*
-         * 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);
-
-        /*
-         * Marshall the header into the outgoing PDU.
-         */
-
-        if(!smb_io_rpc_hdr("", &nak_hdr, &p->out_data.frag, 0)) {
-                DEBUG(0,("setup_bind_nak: marshalling of RPC_HDR failed.\n"));
-                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)) {
-                prs_mem_free(&p->out_data.frag);
+        status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                          DCERPC_PKT_BIND_NAK,
+                                          DCERPC_PFC_FLAG_FIRST |
+                                                DCERPC_PFC_FLAG_LAST,
+                                          0,
+                                          pkt->call_id,
+                                          &u,
+                                          &p->out_data.frag);
+        if (!NT_STATUS_IS_OK(status)) {
                 return False;
         }
@@ -858 +270 @@
         p->out_data.current_pdu_sent = 0;
 
-        if (p->auth.auth_data_free_func) {
-                (*p->auth.auth_data_free_func)(&p->auth);
-        }
+        TALLOC_FREE(p->auth.auth_ctx);
         p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE;
-        p->auth.auth_type = PIPE_AUTH_TYPE_NONE;
+        p->auth.auth_type = _AUTH_TYPE_NONE;
         p->pipe_bound = False;
 
@@ -872 +282 @@
 *******************************************************************/
 
-bool setup_fault_pdu(pipes_struct *p, NTSTATUS status)
-{
-        RPC_HDR fault_hdr;
-        RPC_HDR_RESP hdr_resp;
-        RPC_HDR_FAULT fault_resp;
+bool setup_fault_pdu(struct pipes_struct *p, NTSTATUS fault_status)
+{
+        NTSTATUS status;
+        union dcerpc_payload u;
 
         /* Free any memory in the current return data buffer. */
-        prs_mem_free(&p->out_data.rdata);
+        pipe_init_outgoing_data(p);
+
+        /*
+         * Initialize a fault header.
+         */
+
+        ZERO_STRUCT(u);
+
+        u.fault.status          = NT_STATUS_V(fault_status);
+        u.fault._pad            = data_blob_talloc_zero(p->mem_ctx, 4);
 
         /*
@@ -887 +305 @@
          */
 
-        prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL);
-
-        /*
-         * 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.
-         */
-
-        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;
-        }
-
-        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"));
-                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"));
-                prs_mem_free(&p->out_data.frag);
+        status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                          DCERPC_PKT_FAULT,
+                                          DCERPC_PFC_FLAG_FIRST |
+                                           DCERPC_PFC_FLAG_LAST |
+                                           DCERPC_PFC_FLAG_DID_NOT_EXECUTE,
+                                          0,
+                                          p->call_id,
+                                          &u,
+                                          &p->out_data.frag);
+        if (!NT_STATUS_IS_OK(status)) {
                 return False;
         }
@@ -932 +323 @@
         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
 
 /*******************************************************************
@@ -992 +334 @@
                            uint32 context_id)
 {
-        int i=0;
         struct pipe_rpc_fns *context_fns;
 
@@ -999 +340 @@
 
         /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */
-
-        for (i=0; i<rpc_lookup_size; i++) {
-                DEBUGADD(10, ("checking %s\n", rpc_lookup[i].pipe.clnt));
-                if (ndr_syntax_id_equal(
-                            abstract, &rpc_lookup[i].rpc_interface)
-                    && ndr_syntax_id_equal(
-                            transfer, &ndr_transfer_syntax)) {
-                        break;
-                }
-        }
-
-        if (i == rpc_lookup_size) {
+        if (rpc_srv_pipe_exists_by_id(abstract) &&
+           ndr_syntax_id_equal(transfer, &ndr_transfer_syntax)) {
+                DEBUG(3, ("check_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
+                        rpc_srv_get_pipe_cli_name(abstract),
+                        rpc_srv_get_pipe_srv_name(abstract)));
+        } else {
                 return false;
         }
@@ -1020 +355 @@
         }
 
-        context_fns->cmds = rpc_lookup[i].cmds;
-        context_fns->n_cmds = rpc_lookup[i].n_cmds;
+        context_fns->next = context_fns->prev = NULL;
+        context_fns->n_cmds = rpc_srv_get_pipe_num_cmds(abstract);
+        context_fns->cmds = rpc_srv_get_pipe_cmds(abstract);
         context_fns->context_id = context_id;
 
@@ -1029 +365 @@
 
         return True;
-}
-
-/*******************************************************************
- Register commands to an RPC pipe
-*******************************************************************/
-
-NTSTATUS rpc_srv_register(int version, const char *clnt, const char *srv,
-                          const struct ndr_interface_table *iface,
-                          const struct api_struct *cmds, int size)
-{
-        struct rpc_table *rpc_entry;
-
-        if (!clnt || !srv || !cmds) {
-                return NT_STATUS_INVALID_PARAMETER;
-        }
-
-        if (version != SMB_RPC_INTERFACE_VERSION) {
-                DEBUG(0,("Can't register rpc commands!\n"
-                         "You tried to register a rpc module with SMB_RPC_INTERFACE_VERSION %d"
-                         ", while this version of samba uses version %d!\n", 
-                         version,SMB_RPC_INTERFACE_VERSION));
-                return NT_STATUS_OBJECT_TYPE_MISMATCH;
-        }
-
-        /* TODO: 
-         *
-         * we still need to make sure that don't register the same commands twice!!!
-         * 
-         * --metze
-         */
-
-        /* We use a temporary variable because this call can fail and 
-           rpc_lookup will still be valid afterwards.  It could then succeed if
-           called again later */
-        rpc_lookup_size++;
-        rpc_entry = SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(rpc_lookup, struct rpc_table, rpc_lookup_size);
-        if (NULL == rpc_entry) {
-                rpc_lookup_size--;
-                DEBUG(0, ("rpc_pipe_register_commands: memory allocation failed\n"));
-                return NT_STATUS_NO_MEMORY;
-        } else {
-                rpc_lookup = rpc_entry;
-        }
-
-        rpc_entry = rpc_lookup + (rpc_lookup_size - 1);
-        ZERO_STRUCTP(rpc_entry);
-        rpc_entry->pipe.clnt = SMB_STRDUP(clnt);
-        rpc_entry->pipe.srv = SMB_STRDUP(srv);
-        rpc_entry->rpc_interface = iface->syntax_id;
-        rpc_entry->cmds = cmds;
-        rpc_entry->n_cmds = size;
-
-        return NT_STATUS_OK;
 }
 
@@ -1092 +375 @@
 {
         const char *pipename = cli_filename;
-        int i;
         NTSTATUS status;
 
@@ -1108 +390 @@
         }
 
-        for (i=0; i<rpc_lookup_size; i++) {
-                if (strequal(pipename, rpc_lookup[i].pipe.clnt)) {
-                        *syntax = rpc_lookup[i].rpc_interface;
-                        return true;
-                }
+        if (rpc_srv_get_pipe_interface_by_cli_name(pipename, syntax)) {
+                return true;
         }
 
@@ -1125 +404 @@
          * Scan the list again for the interface id
          */
-
-        for (i=0; i<rpc_lookup_size; i++) {
-                if (strequal(pipename, rpc_lookup[i].pipe.clnt)) {
-                        *syntax = rpc_lookup[i].rpc_interface;
-                        return true;
-                }
+        if (rpc_srv_get_pipe_interface_by_cli_name(pipename, syntax)) {
+                return true;
         }
 
@@ -1137 +412 @@
 
         return false;
-}
-
-/*******************************************************************
- 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)
-{
-        return False;
 }
 
@@ -1153 +418 @@
 *******************************************************************/
 
-static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_p,
-                                        RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
-{
-        DATA_BLOB blob;
-        DATA_BLOB secblob;
-        DATA_BLOB response;
-        DATA_BLOB chal;
-        char *OIDs[ASN1_MAX_OIDS];
-        int i;
+static bool pipe_spnego_auth_bind(struct pipes_struct *p,
+                                  TALLOC_CTX *mem_ctx,
+                                  struct dcerpc_auth *auth_info,
+                                  DATA_BLOB *response)
+{
+        struct spnego_context *spnego_ctx;
         NTSTATUS status;
-        bool got_kerberos_mechanism = false;
-        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)) {
-                goto err;
-        }
-
-        /* parse out the OIDs and the first sec blob */
-        if (!parse_negTokenTarg(blob, OIDs, &secblob) ||
-                        OIDs[0] == NULL) {
-                DEBUG(0,("pipe_spnego_auth_bind_negotiate: Failed to parse the security blob.\n"));
-                goto err;
-        }
-
-        if (strcmp(OID_KERBEROS5, OIDs[0]) == 0 || strcmp(OID_KERBEROS5_OLD, OIDs[0]) == 0) {
-                got_kerberos_mechanism = true;
-        }
-
-        for (i=0;OIDs[i];i++) {
-                DEBUG(3,("pipe_spnego_auth_bind_negotiate: Got OID %s\n", OIDs[i]));
-                TALLOC_FREE(OIDs[i]);
-        }
-        DEBUG(3,("pipe_spnego_auth_bind_negotiate: Got secblob of size %lu\n", (unsigned long)secblob.length));
-
-        if ( got_kerberos_mechanism && ((lp_security()==SEC_ADS) || USE_KERBEROS_KEYTAB) ) {
-                bool ret = pipe_spnego_auth_bind_kerberos(p, rpc_in_p, pauth_info, &secblob, pout_auth);
-                data_blob_free(&secblob);
-                data_blob_free(&blob);
-                return ret;
-        }
-
-        if (p->auth.auth_type == PIPE_AUTH_TYPE_SPNEGO_NTLMSSP && p->auth.a_u.auth_ntlmssp_state) {
-                /* Free any previous auth type. */
-                free_pipe_ntlmssp_auth_data(&p->auth);
-        }
-
-        if (!got_kerberos_mechanism) {
-                /* Initialize the NTLM engine. */
-                status = auth_ntlmssp_start(&a);
-                if (!NT_STATUS_IS_OK(status)) {
-                        goto err;
-                }
-
-                /*
-                 * Pass the first security blob of data to it.
-                 * This can return an error or NT_STATUS_MORE_PROCESSING_REQUIRED
-                 * which means we need another packet to complete the bind.
-                 */
-
-                status = auth_ntlmssp_update(a, secblob, &chal);
-
-                if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-                        DEBUG(3,("pipe_spnego_auth_bind_negotiate: auth_ntlmssp_update failed.\n"));
-                        goto err;
-                }
-
-                /* Generate the response blob we need for step 2 of the bind. */
-                response = spnego_gen_auth_response(&chal, status, OID_NTLMSSP);
-        } else {
-                /*
-                 * SPNEGO negotiate down to NTLMSSP. The subsequent
-                 * code to process follow-up packets is not complete
-                 * yet. JRA.
-                 */
-                response = spnego_gen_auth_response(NULL,
-                                        NT_STATUS_MORE_PROCESSING_REQUIRED,
-                                        OID_NTLMSSP);
-        }
-
-        /* Copy the blob into the pout_auth parse struct */
-        init_rpc_hdr_auth(&auth_info, DCERPC_AUTH_TYPE_SPNEGO, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
-        if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-                DEBUG(0,("pipe_spnego_auth_bind_negotiate: marshalling of RPC_HDR_AUTH failed.\n"));
-                goto err;
-        }
-
-        if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
-                DEBUG(0,("pipe_spnego_auth_bind_negotiate: marshalling of data blob failed.\n"));
-                goto err;
-        }
-
-        p->auth.a_u.auth_ntlmssp_state = a;
-        p->auth.auth_data_free_func = &free_pipe_ntlmssp_auth_data;
-        p->auth.auth_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
-
-        data_blob_free(&blob);
-        data_blob_free(&secblob);
-        data_blob_free(&chal);
-        data_blob_free(&response);
-
-        /* We can't set pipe_bound True yet - we need an RPC_ALTER_CONTEXT response packet... */
-        return True;
-
- err:
-
-        data_blob_free(&blob);
-        data_blob_free(&secblob);
-        data_blob_free(&chal);
-        data_blob_free(&response);
-
-        p->auth.a_u.auth_ntlmssp_state = NULL;
-
-        return False;
-}
-
-/*******************************************************************
- Handle the second part of a SPNEGO bind auth.
-*******************************************************************/
-
-static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p,
-                                        RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
-{
-        RPC_HDR_AUTH auth_info;
-        DATA_BLOB spnego_blob;
-        DATA_BLOB auth_blob;
-        DATA_BLOB auth_reply;
-        DATA_BLOB response;
-        AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
-
-        ZERO_STRUCT(spnego_blob);
-        ZERO_STRUCT(auth_blob);
-        ZERO_STRUCT(auth_reply);
-        ZERO_STRUCT(response);
-
-        /*
-         * NB. If we've negotiated down from krb5 to NTLMSSP we'll currently
-         * fail here as 'a' == NULL.
-         */
-        if (p->auth.auth_type != PIPE_AUTH_TYPE_SPNEGO_NTLMSSP || !a) {
-                DEBUG(0,("pipe_spnego_auth_bind_continue: not in NTLMSSP auth state.\n"));
-                goto err;
-        }
-
-        /* Grab the SPNEGO blob. */
-        spnego_blob = data_blob(NULL,p->hdr.auth_len);
-
-        if (!prs_copy_data_out((char *)spnego_blob.data, rpc_in_p, p->hdr.auth_len)) {
-                DEBUG(0,("pipe_spnego_auth_bind_continue: Failed to pull %u bytes - the SPNEGO auth header.\n",
-                        (unsigned int)p->hdr.auth_len ));
-                goto err;
-        }
-
-        if (spnego_blob.data[0] != ASN1_CONTEXT(1)) {
-                DEBUG(0,("pipe_spnego_auth_bind_continue: invalid SPNEGO blob type.\n"));
-                goto err;
-        }
-
-        if (!spnego_parse_auth(spnego_blob, &auth_blob)) {
-                DEBUG(0,("pipe_spnego_auth_bind_continue: invalid SPNEGO blob.\n"));
-                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, &auth_blob)) {
-                goto err;
-        }
-
-        data_blob_free(&spnego_blob);
-        data_blob_free(&auth_blob);
-
-        /* Generate the spnego "accept completed" blob - no incoming data. */
-        response = spnego_gen_auth_response(&auth_reply, NT_STATUS_OK, OID_NTLMSSP);
-
-        /* Copy the blob into the pout_auth parse struct */
-        init_rpc_hdr_auth(&auth_info, DCERPC_AUTH_TYPE_SPNEGO, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
-        if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-                DEBUG(0,("pipe_spnego_auth_bind_continue: marshalling of RPC_HDR_AUTH failed.\n"));
-                goto err;
-        }
-
-        if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
-                DEBUG(0,("pipe_spnego_auth_bind_continue: marshalling of data blob failed.\n"));
-                goto err;
-        }
-
-        data_blob_free(&auth_reply);
-        data_blob_free(&response);
-
-        p->pipe_bound = True;
-
-        return True;
-
- err:
-
-        data_blob_free(&spnego_blob);
-        data_blob_free(&auth_blob);
-        data_blob_free(&auth_reply);
-        data_blob_free(&response);
-
-        free_pipe_ntlmssp_auth_data(&p->auth);
-        p->auth.a_u.auth_ntlmssp_state = NULL;
-
-        return False;
+
+        status = spnego_server_auth_start(p,
+                                          (auth_info->auth_level ==
+                                                DCERPC_AUTH_LEVEL_INTEGRITY),
+                                          (auth_info->auth_level ==
+                                                DCERPC_AUTH_LEVEL_PRIVACY),
+                                          true,
+                                          &auth_info->credentials,
+                                          response,
+                                          &spnego_ctx);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("Failed SPNEGO negotiate (%s)\n",
+                          nt_errstr(status)));
+                return false;
+        }
+
+        /* Make sure data is bound to the memctx, to be freed the caller */
+        talloc_steal(mem_ctx, response->data);
+
+        p->auth.auth_ctx = spnego_ctx;
+        p->auth.auth_type = DCERPC_AUTH_TYPE_SPNEGO;
+
+        DEBUG(10, ("SPNEGO auth started\n"));
+
+        return true;
 }
 
@@ -1380 +456 @@
 *******************************************************************/
 
-static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
-                                        RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
-{
-        RPC_HDR_AUTH auth_info;
+static bool pipe_schannel_auth_bind(struct pipes_struct *p,
+                                    TALLOC_CTX *mem_ctx,
+                                    struct dcerpc_auth *auth_info,
+                                    DATA_BLOB *response)
+{
         struct NL_AUTH_MESSAGE neg;
         struct NL_AUTH_MESSAGE reply;
@@ -1389 +466 @@
         NTSTATUS status;
         struct netlogon_creds_CredentialState *creds;
-        DATA_BLOB session_key;
         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(), NULL, &neg,
-                               (ndr_pull_flags_fn_t)ndr_pull_NL_AUTH_MESSAGE);
+        struct schannel_state *schannel_auth;
+
+        ndr_err = ndr_pull_struct_blob(
+                        &auth_info->credentials, mem_ctx, &neg,
+                        (ndr_pull_flags_fn_t)ndr_pull_NL_AUTH_MESSAGE);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                 DEBUG(0,("pipe_schannel_auth_bind: Could not unmarshal SCHANNEL auth neg\n"));
@@ -1419 +493 @@
 
         become_root();
-        status = schannel_fetch_session_key(p,
-                                            neg.oem_netbios_computer.a,
-                                            &creds);
+        status = schannel_get_creds_state(p, lp_private_dir(),
+                                            neg.oem_netbios_computer.a, &creds);
         unbecome_root();
 
@@ -1429 +502 @@
         }
 
-        p->auth.a_u.schannel_auth = talloc(p, struct schannel_state);
-        if (!p->auth.a_u.schannel_auth) {
+        schannel_auth = talloc(p, struct schannel_state);
+        if (!schannel_auth) {
                 TALLOC_FREE(creds);
                 return False;
         }
 
-        p->auth.a_u.schannel_auth->state = SCHANNEL_STATE_START;
-        p->auth.a_u.schannel_auth->seq_num = 0;
-        p->auth.a_u.schannel_auth->initiator = false;
-        p->auth.a_u.schannel_auth->creds = creds;
+        schannel_auth->state = SCHANNEL_STATE_START;
+        schannel_auth->seq_num = 0;
+        schannel_auth->initiator = false;
+        schannel_auth->creds = creds;
 
         /*
@@ -1451 +524 @@
          */
 
-        session_key = generic_session_key();
-        if (session_key.data == NULL) {
-                DEBUG(0, ("pipe_schannel_auth_bind: Could not alloc session"
-                          " key\n"));
+        );
+
+        
+                \n"));
                 return false;
-        }
-
-        ret = server_info_set_session_key(p->server_info, session_key);
-
-        data_blob_free(&session_key);
-
-        if (!ret) {
-                DEBUG(0, ("server_info_set_session_key failed\n"));
-                return false;
-        }
-
-        init_rpc_hdr_auth(&auth_info, DCERPC_AUTH_TYPE_SCHANNEL, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
-        if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-                DEBUG(0,("pipe_schannel_auth_bind: marshalling of RPC_HDR_AUTH failed.\n"));
-                return False;
         }
 
@@ -1481 +539 @@
                                                       * here - gd */
 
-        ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), NULL, &reply,
+        ndr_err = ndr_push_struct_blob(, &reply,
                        (ndr_push_flags_fn_t)ndr_push_NL_AUTH_MESSAGE);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -1492 +550 @@
         }
 
-        if (!prs_copy_data_in(pout_auth, (const char *)blob.data, blob.length)) {
-                return false;
-        }
-
         DEBUG(10,("pipe_schannel_auth_bind: schannel auth: domain [%s] myname [%s]\n",
                 neg.oem_netbios_domain.a, neg.oem_netbios_computer.a));
 
         /* We're finished with this bind - no more packets. */
-        p->auth.auth_data_free_func = NULL;
-        p->auth.auth_type = PIPE_AUTH_TYPE_SCHANNEL;
+        p->auth.auth_;
+        p->auth.auth_type = _AUTH_TYPE_SCHANNEL;
 
         p->pipe_bound = True;
@@ -1512 +566 @@
 *******************************************************************/
 
-static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
-                                        RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
-{
-        RPC_HDR_AUTH auth_info;
-        DATA_BLOB blob;
-        DATA_BLOB response;
+static bool pipe_ntlmssp_auth_bind(p,
+                                
+                                   struct dcerpc_auth *auth_info,
+        
+{
+        ;
         NTSTATUS status;
-        AUTH_NTLMSSP_STATE *a = NULL;
-
-        ZERO_STRUCT(blob);
-        ZERO_STRUCT(response);
-
-        /* Grab the NTLMSSP blob. */
-        blob = data_blob(NULL,p->hdr.auth_len);
-
-        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 ));
+
+        if (strncmp((char *)auth_info->credentials.data, "NTLMSSP", 7) != 0) {
+                DEBUG(0, ("Failed to read NTLMSSP in blob\n"));
+                return false;
+        }
+
+        /* We have an NTLMSSP blob. */
+        status = ntlmssp_server_auth_start(p,
+                                           (auth_info->auth_level ==
+                                                DCERPC_AUTH_LEVEL_INTEGRITY),
+                                           (auth_info->auth_level ==
+                                                DCERPC_AUTH_LEVEL_PRIVACY),
+                                           true,
+                                           &auth_info->credentials,
+                                           response,
+                                           &ntlmssp_state);
+        if (!NT_STATUS_EQUAL(status, NT_STATUS_OK)) {
+                DEBUG(0, (__location__ ": auth_ntlmssp_start failed: %s\n",
+                          nt_errstr(status)));
+                return false;
+        }
+
+        /* Make sure data is bound to the memctx, to be freed the caller */
+        talloc_steal(mem_ctx, response->data);
+
+        p->auth.auth_ctx = ntlmssp_state;
+        p->auth.auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
+
+        DEBUG(10, (__location__ ": NTLMSSP auth started\n"));
+
+        return true;
+}
+
+/*******************************************************************
+ Process an NTLMSSP authentication response.
+ If this function succeeds, the user has been authenticated
+ and their domain, name and calling workstation stored in
+ the pipe struct.
+*******************************************************************/
+
+static bool pipe_ntlmssp_verify_final(TALLOC_CTX *mem_ctx,
+                                struct auth_ntlmssp_state *ntlmssp_ctx,
+                                enum dcerpc_AuthLevel auth_level,
+                                struct client_address *client_id,
+                                struct ndr_syntax_id *syntax,
+                                struct auth_serversupplied_info **session_info)
+{
+        NTSTATUS status;
+        bool ret;
+
+        DEBUG(5, (__location__ ": pipe %s checking user details\n",
+                 get_pipe_name_from_syntax(talloc_tos(), syntax)));
+
+        /* Finally - if the pipe negotiated integrity (sign) or privacy (seal)
+           ensure the underlying NTLMSSP flags are also set. If not we should
+           refuse the bind. */
+
+        status = ntlmssp_server_check_flags(ntlmssp_ctx,
+                                            (auth_level ==
+                                                DCERPC_AUTH_LEVEL_INTEGRITY),
+                                            (auth_level ==
+                                                DCERPC_AUTH_LEVEL_PRIVACY));
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, (__location__ ": Client failed to negotatie proper "
+                          "security for pipe %s\n",
+                          get_pipe_name_from_syntax(talloc_tos(), syntax)));
+                return false;
+        }
+
+        TALLOC_FREE(*session_info);
+
+        status = ntlmssp_server_get_user_info(ntlmssp_ctx,
+                                                mem_ctx, session_info);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, (__location__ ": failed to obtain the server info "
+                          "for authenticated user: %s\n", nt_errstr(status)));
+                return false;
+        }
+
+        if ((*session_info)->security_token == NULL) {
+                DEBUG(1, ("Auth module failed to provide nt_user_token\n"));
+                return false;
+        }
+
+        /*
+         * We're an authenticated bind over smb, so the session key needs to
+         * be set to "SystemLibraryDTC". Weird, but this is what Windows
+         * does. See the RPC-SAMBA3SESSIONKEY.
+         */
+
+        ret = session_info_set_session_key((*session_info), generic_session_key());
+        if (!ret) {
+                DEBUG(0, ("Failed to set session key!\n"));
+                return false;
+        }
+
+        return true;
+}
+
+/*******************************************************************
+ Handle a GSSAPI bind auth.
+*******************************************************************/
+
+static bool pipe_gssapi_auth_bind(struct pipes_struct *p,
+                                  TALLOC_CTX *mem_ctx,
+                                  struct dcerpc_auth *auth_info,
+                                  DATA_BLOB *response)
+{
+        NTSTATUS status;
+        struct gse_context *gse_ctx = NULL;
+
+        status = gssapi_server_auth_start(p,
+                                          (auth_info->auth_level ==
+                                                DCERPC_AUTH_LEVEL_INTEGRITY),
+                                          (auth_info->auth_level ==
+                                                DCERPC_AUTH_LEVEL_PRIVACY),
+                                          true,
+                                          &auth_info->credentials,
+                                          response,
+                                          &gse_ctx);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("Failed to init dcerpc gssapi server (%s)\n",
+                          nt_errstr(status)));
                 goto err;
         }
 
-        if (strncmp((char *)blob.data, "NTLMSSP", 7) != 0) {
-                DEBUG(0,("pipe_ntlmssp_auth_bind: Failed to read NTLMSSP in blob\n"));
-                goto err;
-        }
-
-        /* We have an NTLMSSP blob. */
-        status = auth_ntlmssp_start(&a);
+        /* Make sure data is bound to the memctx, to be freed the caller */
+        talloc_steal(mem_ctx, response->data);
+
+        p->auth.auth_ctx = gse_ctx;
+        p->auth.auth_type = DCERPC_AUTH_TYPE_KRB5;
+
+        DEBUG(10, ("KRB5 auth started\n"));
+
+        return true;
+
+err:
+        TALLOC_FREE(gse_ctx);
+        return false;
+}
+
+static NTSTATUS pipe_gssapi_verify_final(TALLOC_CTX *mem_ctx,
+                                         struct gse_context *gse_ctx,
+                                         struct client_address *client_id,
+                                         struct auth_serversupplied_info **session_info)
+{
+        NTSTATUS status;
+        bool bret;
+
+        /* Finally - if the pipe negotiated integrity (sign) or privacy (seal)
+           ensure the underlying flags are also set. If not we should
+           refuse the bind. */
+
+        status = gssapi_server_check_flags(gse_ctx);
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(0,("pipe_ntlmssp_auth_bind: auth_ntlmssp_start failed: %s\n",
-                        nt_errstr(status) ));
-                goto err;
-        }
-
-        status = auth_ntlmssp_update(a, blob, &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, RPC_HDR_AUTH_LEN, 1);
-        if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-                DEBUG(0,("pipe_ntlmssp_auth_bind: marshalling of RPC_HDR_AUTH failed.\n"));
-                goto err;
-        }
-
-        if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
-                DEBUG(0,("pipe_ntlmssp_auth_bind: marshalling of data blob failed.\n"));
-                goto err;
-        }
-
-        p->auth.a_u.auth_ntlmssp_state = a;
-        p->auth.auth_data_free_func = &free_pipe_ntlmssp_auth_data;
-        p->auth.auth_type = PIPE_AUTH_TYPE_NTLMSSP;
-
-        data_blob_free(&blob);
-        data_blob_free(&response);
-
-        DEBUG(10,("pipe_ntlmssp_auth_bind: NTLMSSP auth started\n"));
-
-        /* We can't set pipe_bound True yet - we need an DCERPC_PKT_AUTH3 response packet... */
-        return True;
-
-  err:
-
-        data_blob_free(&blob);
-        data_blob_free(&response);
-
-        free_pipe_ntlmssp_auth_data(&p->auth);
-        p->auth.a_u.auth_ntlmssp_state = NULL;
-        return False;
+                DEBUG(0, ("Requested Security Layers not honored!\n"));
+                return status;
+        }
+
+        status = gssapi_server_get_user_info(gse_ctx, mem_ctx,
+                                             client_id, session_info);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, (__location__ ": failed to obtain the server info "
+                          "for authenticated user: %s\n", nt_errstr(status)));
+                return status;
+        }
+
+        if ((*session_info)->security_token == NULL) {
+                status = create_local_token(*session_info);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(1, ("Failed to create local user token (%s)\n",
+                                  nt_errstr(status)));
+                        status = NT_STATUS_ACCESS_DENIED;
+                        return status;
+                }
+        }
+
+        /* TODO: this is what the ntlmssp code does with the session_key, check
+         * it is ok with gssapi too */
+        /*
+         * We're an authenticated bind over smb, so the session key needs to
+         * be set to "SystemLibraryDTC". Weird, but this is what Windows
+         * does. See the RPC-SAMBA3SESSIONKEY.
+         */
+
+        bret = session_info_set_session_key((*session_info), generic_session_key());
+        if (!bret) {
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
+        return NT_STATUS_OK;
+}
+
+static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p)
+{
+        enum spnego_mech auth_type;
+        struct auth_ntlmssp_state *ntlmssp_ctx;
+        struct spnego_context *spnego_ctx;
+        struct gse_context *gse_ctx;
+        void *mech_ctx;
+        NTSTATUS status;
+
+        switch (p->auth.auth_type) {
+        case DCERPC_AUTH_TYPE_NTLMSSP:
+                ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                    struct auth_ntlmssp_state);
+                if (!pipe_ntlmssp_verify_final(p, ntlmssp_ctx,
+                                                p->auth.auth_level,
+                                                p->client_id, &p->syntax,
+                                                &p->session_info)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+                break;
+        case DCERPC_AUTH_TYPE_KRB5:
+                gse_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                struct gse_context);
+                status = pipe_gssapi_verify_final(p, gse_ctx,
+                                                  p->client_id,
+                                                  &p->session_info);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(1, ("gssapi bind failed with: %s",
+                                  nt_errstr(status)));
+                        return status;
+                }
+                break;
+        case DCERPC_AUTH_TYPE_SPNEGO:
+                spnego_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                   struct spnego_context);
+                status = spnego_get_negotiated_mech(spnego_ctx,
+                                                    &auth_type, &mech_ctx);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0, ("Bad SPNEGO state (%s)\n",
+                                  nt_errstr(status)));
+                        return status;
+                }
+                switch(auth_type) {
+                case SPNEGO_KRB5:
+                        gse_ctx = talloc_get_type_abort(mech_ctx,
+                                                        struct gse_context);
+                        status = pipe_gssapi_verify_final(p, gse_ctx,
+                                                          p->client_id,
+                                                          &p->session_info);
+                        if (!NT_STATUS_IS_OK(status)) {
+                                DEBUG(1, ("gssapi bind failed with: %s",
+                                          nt_errstr(status)));
+                                return status;
+                        }
+                        break;
+                case SPNEGO_NTLMSSP:
+                        ntlmssp_ctx = talloc_get_type_abort(mech_ctx,
+                                                struct auth_ntlmssp_state);
+                        if (!pipe_ntlmssp_verify_final(p, ntlmssp_ctx,
+                                                        p->auth.auth_level,
+                                                        p->client_id,
+                                                        &p->syntax,
+                                                        &p->session_info)) {
+                                return NT_STATUS_ACCESS_DENIED;
+                        }
+                        break;
+                default:
+                        DEBUG(0, (__location__ ": incorrect spnego type "
+                                  "(%d).\n", auth_type));
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+                break;
+        default:
+                DEBUG(0, (__location__ ": incorrect auth type (%u).\n",
+                          (unsigned int)p->auth.auth_type));
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
+        p->pipe_bound = true;
+
+        return NT_STATUS_OK;
 }
 
@@ -1593 +853 @@
 *******************************************************************/
 
-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;
+static bool api_pipe_bind_req(struct pipes_struct *p,
+                                struct ncacn_packet *pkt)
+{
+        struct dcerpc_auth auth_info;
         uint16 assoc_gid;
-        fstring ack_pipe_name;
-        prs_struct out_hdr_ba;
-        prs_struct out_auth;
-        int i = 0;
-        int auth_len = 0;
         unsigned int auth_type = DCERPC_AUTH_TYPE_NONE;
+
+
+
+
+
+
 
         /* No rebinds on a bound pipe - use alter context. */
@@ -1611 +871 @@
                          "pipe %s.\n",
                          get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
-                return setup_bind_nak(p);
-        }
-
-        prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL);
-
-        /* 
-         * Marshall directly into the outgoing PDU space. We
-         * must do this as we need to set to the bind response
-         * header and are never sending more than one PDU here.
-         */
-
-        /*
-         * Setup the memory to marshall the ba header, and the
-         * auth footers.
-         */
-
-        if(!prs_init(&out_hdr_ba, 1024, p->mem_ctx, MARSHALL)) {
-                DEBUG(0,("api_pipe_bind_req: malloc out_hdr_ba failed.\n"));
-                prs_mem_free(&p->out_data.frag);
-                return False;
-        }
-
-        if(!prs_init(&out_auth, 1024, p->mem_ctx, MARSHALL)) {
-                DEBUG(0,("api_pipe_bind_req: malloc out_auth failed.\n"));
-                prs_mem_free(&p->out_data.frag);
-                prs_mem_free(&out_hdr_ba);
-                return False;
-        }
-
-        DEBUG(5,("api_pipe_bind_req: decode request. %d\n", __LINE__));
-
-        ZERO_STRUCT(hdr_rb);
-
-        /* decode the bind request */
-
-        if(!smb_io_rpc_hdr_rb("", &hdr_rb, rpc_in_p, 0))  {
-                DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_RB "
-                         "struct.\n"));
-                goto err_exit;
-        }
-
-        if (hdr_rb.num_contexts == 0) {
+                return setup_bind_nak(p, pkt);
+        }
+
+        if (pkt->u.bind.num_contexts == 0) {
                 DEBUG(0, ("api_pipe_bind_req: no rpc contexts around\n"));
                 goto err_exit;
@@ -1661 +883 @@
          * that this is a pipe name we support.
          */
-
-        for (i = 0; i < rpc_lookup_size; i++) {
-                if (ndr_syntax_id_equal(&rpc_lookup[i].rpc_interface,
-                                        &hdr_rb.rpc_context[0].abstract)) {
-                        DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
-                                rpc_lookup[i].pipe.clnt, rpc_lookup[i].pipe.srv));
-                        break;
-                }
-        }
-
-        if (i == rpc_lookup_size) {
-                NTSTATUS status;
-
+        id = pkt->u.bind.ctx_list[0].abstract_syntax;
+        if (rpc_srv_pipe_exists_by_id(&id)) {
+                DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
+                        rpc_srv_get_pipe_cli_name(&id),
+                        rpc_srv_get_pipe_srv_name(&id)));
+        } else {
                 status = smb_probe_module(
                         "rpc", get_pipe_name_from_syntax(
                                 talloc_tos(),
-                                &hdr_rb.rpc_context[0].abstract));
+                                &));
 
                 if (NT_STATUS_IS_ERR(status)) {
@@ -1683 +898 @@
                                 get_pipe_name_from_syntax(
                                         talloc_tos(),
-                                        &hdr_rb.rpc_context[0].abstract)));
-                        prs_mem_free(&p->out_data.frag);
-                        prs_mem_free(&out_hdr_ba);
-                        prs_mem_free(&out_auth);
-
-                        return setup_bind_nak(p);
-                }
-
-                for (i = 0; i < rpc_lookup_size; i++) {
-                       if (strequal(rpc_lookup[i].pipe.clnt,
-                                    get_pipe_name_from_syntax(talloc_tos(),
-                                                              &p->syntax))) {
-                               DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
-                                         rpc_lookup[i].pipe.clnt, rpc_lookup[i].pipe.srv));
-                               break;
-                       }
-                }
-
-                if (i == rpc_lookup_size) {
+                                        &pkt->u.bind.ctx_list[0].abstract_syntax)));
+
+                        return setup_bind_nak(p, pkt);
+                }
+
+                if (rpc_srv_get_pipe_interface_by_cli_name(
+                                get_pipe_name_from_syntax(talloc_tos(),
+                                                          &p->syntax),
+                                &id)) {
+                        DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
+                                rpc_srv_get_pipe_cli_name(&id),
+                                rpc_srv_get_pipe_srv_name(&id)));
+                } else {
                         DEBUG(0, ("module %s doesn't provide functions for "
                                   "pipe %s!\n",
@@ -1708 +917 @@
                                   get_pipe_name_from_syntax(talloc_tos(),
                                                             &p->syntax)));
-                        goto err_exit;
-                }
-        }
-
-        /* name has to be \PIPE\xxxxx */
-        fstrcpy(ack_pipe_name, "\\PIPE\\");
-        fstrcat(ack_pipe_name, rpc_lookup[i].pipe.srv);
+                        return setup_bind_nak(p, pkt);
+                }
+        }
 
         DEBUG(5,("api_pipe_bind_req: make response. %d\n", __LINE__));
 
-        /*
-         * Check if this is an authenticated bind request.
-         */
-
-        if (p->hdr.auth_len) {
-                /* 
-                 * Decode the authentication verifier.
-                 */
-
-                if(!smb_io_rpc_hdr_auth("", &auth_info, rpc_in_p, 0)) {
-                        DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_AUTH struct.\n"));
-                        goto err_exit;
-                }
-
-                auth_type = auth_info.auth_type;
-
-                /* 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;
-                }
+        if (pkt->u.bind.assoc_group_id != 0) {
+                assoc_gid = pkt->u.bind.assoc_group_id;
         } else {
-                ZERO_STRUCT(auth_info);
-        }
-
-        assoc_gid = hdr_rb.bba.assoc_gid ? hdr_rb.bba.assoc_gid : 0x53f0;
-
-        switch(auth_type) {
-                case DCERPC_AUTH_TYPE_NTLMSSP:
-                        if (!pipe_ntlmssp_auth_bind(p, rpc_in_p, &auth_info, &out_auth)) {
-                                goto err_exit;
-                        }
-                        assoc_gid = 0x7a77;
-                        break;
-
-                case DCERPC_AUTH_TYPE_SCHANNEL:
-                        if (!pipe_schannel_auth_bind(p, rpc_in_p, &auth_info, &out_auth)) {
-                                goto err_exit;
-                        }
-                        break;
-
-                case DCERPC_AUTH_TYPE_SPNEGO:
-                        if (!pipe_spnego_auth_bind_negotiate(p, rpc_in_p, &auth_info, &out_auth)) {
-                                goto err_exit;
-                        }
-                        break;
-
-                case DCERPC_AUTH_TYPE_NONE:
-                        /* Unauthenticated bind request. */
-                        /* We're finished - no more packets. */
-                        p->auth.auth_type = PIPE_AUTH_TYPE_NONE;
-                        /* We must set the pipe auth_level here also. */
-                        p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE;
-                        p->pipe_bound = True;
-                        /* The session key was initialized from the SMB
-                         * session in make_internal_rpc_pipe_p */
-                        break;
-
-                default:
-                        DEBUG(0,("api_pipe_bind_req: unknown auth type %x requested.\n", auth_type ));
-                        goto err_exit;
+                assoc_gid = 0x53f0;
         }
 
@@ -1799 +939 @@
                 Needed when adding entries to a DACL from NT5 - SK */
 
-        if(check_bind_req(p, &hdr_rb.rpc_context[0].abstract, &hdr_rb.rpc_context[0].transfer[0],
-                                hdr_rb.rpc_context[0].context_id )) {
-                init_rpc_hdr_ba(&hdr_ba,
-                        RPC_MAX_PDU_FRAG_LEN,
-                        RPC_MAX_PDU_FRAG_LEN,
-                        assoc_gid,
-                        ack_pipe_name,
-                        0x1, 0x0, 0x0,
-                        &hdr_rb.rpc_context[0].transfer[0]);
+        if (check_bind_req(p,
+                        &pkt->u.bind.ctx_list[0].abstract_syntax,
+                        &pkt->u.bind.ctx_list[0].transfer_syntaxes[0],
+                        pkt->u.bind.ctx_list[0].context_id)) {
+
+                bind_ack_ctx.result = 0;
+                bind_ack_ctx.reason = 0;
+                bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0];
         } else {
+
                 /* Rejection reason: abstract syntax not supported */
-                init_rpc_hdr_ba(&hdr_ba, RPC_MAX_PDU_FRAG_LEN,
-                                        RPC_MAX_PDU_FRAG_LEN, assoc_gid,
-                                        ack_pipe_name, 0x1, 0x2, 0x1,
-                                        &null_ndr_syntax_id);
-                p->pipe_bound = False;
-        }
-
-        /*
-         * and marshall it.
-         */
-
-        if(!smb_io_rpc_hdr_ba("", &hdr_ba, &out_hdr_ba, 0)) {
-                DEBUG(0,("api_pipe_bind_req: marshalling of RPC_HDR_BA failed.\n"));
+                bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT;
+                bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX;
+                bind_ack_ctx.syntax = null_ndr_syntax_id;
+        }
+
+        /*
+         * Check if this is an authenticated bind request.
+         */
+        if (pkt->auth_length) {
+                /* Quick length check. Won't catch a bad auth footer,
+                 * prevents overrun. */
+
+                if (pkt->frag_length < RPC_HEADER_LEN +
+                                        DCERPC_AUTH_TRAILER_LENGTH +
+                                        pkt->auth_length) {
+                        DEBUG(0,("api_pipe_bind_req: auth_len (%u) "
+                                "too long for fragment %u.\n",
+                                (unsigned int)pkt->auth_length,
+                                (unsigned int)pkt->frag_length));
+                        goto err_exit;
+                }
+
+                /*
+                 * Decode the authentication verifier.
+                 */
+                status = dcerpc_pull_dcerpc_auth(pkt,
+                                                 &pkt->u.bind.auth_info,
+                                                 &auth_info, p->endian);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n"));
+                        goto err_exit;
+                }
+
+                auth_type = auth_info.auth_type;
+
+                /* 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;
+                case DCERPC_AUTH_LEVEL_CONNECT:
+                        p->auth.auth_level = DCERPC_AUTH_LEVEL_CONNECT;
+                        break;
+                default:
+                        DEBUG(0, ("Unexpected auth level (%u).\n",
+                                (unsigned int)auth_info.auth_level ));
+                        goto err_exit;
+                }
+
+                switch (auth_type) {
+                case DCERPC_AUTH_TYPE_NTLMSSP:
+                        if (!pipe_ntlmssp_auth_bind(p, pkt,
+                                                &auth_info, &auth_resp)) {
+                                goto err_exit;
+                        }
+                        assoc_gid = 0x7a77;
+                        break;
+
+                case DCERPC_AUTH_TYPE_SCHANNEL:
+                        if (!pipe_schannel_auth_bind(p, pkt,
+                                                &auth_info, &auth_resp)) {
+                                goto err_exit;
+                        }
+                        break;
+
+                case DCERPC_AUTH_TYPE_SPNEGO:
+                        if (!pipe_spnego_auth_bind(p, pkt,
+                                                &auth_info, &auth_resp)) {
+                                goto err_exit;
+                        }
+                        break;
+
+                case DCERPC_AUTH_TYPE_KRB5:
+                        if (!pipe_gssapi_auth_bind(p, pkt,
+                                                &auth_info, &auth_resp)) {
+                                goto err_exit;
+                        }
+                        break;
+
+                case DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM:
+                        if (p->transport == NCALRPC && p->ncalrpc_as_system) {
+                                TALLOC_FREE(p->session_info);
+
+                                status = make_session_info_system(p,
+                                                                  &p->session_info);
+                                if (!NT_STATUS_IS_OK(status)) {
+                                        goto err_exit;
+                                }
+
+                                auth_resp = data_blob_talloc(pkt,
+                                                             "NCALRPC_AUTH_OK",
+                                                             15);
+
+                                p->auth.auth_type = DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM;
+                                p->pipe_bound = true;
+                        } else {
+                                goto err_exit;
+                        }
+                        break;
+
+                case DCERPC_AUTH_TYPE_NONE:
+                        break;
+
+                default:
+                        DEBUG(0, ("Unknown auth type %x requested.\n", auth_type));
+                        goto err_exit;
+                }
+        }
+
+        if (auth_type == DCERPC_AUTH_TYPE_NONE) {
+                /* Unauthenticated bind request. */
+                /* We're finished - no more packets. */
+                p->auth.auth_type = DCERPC_AUTH_TYPE_NONE;
+                /* We must set the pipe auth_level here also. */
+                p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE;
+                p->pipe_bound = True;
+                /* The session key was initialized from the SMB
+                 * session in make_internal_rpc_pipe_p */
+        }
+
+        ZERO_STRUCT(u.bind_ack);
+        u.bind_ack.max_xmit_frag = RPC_MAX_PDU_FRAG_LEN;
+        u.bind_ack.max_recv_frag = RPC_MAX_PDU_FRAG_LEN;
+        u.bind_ack.assoc_group_id = assoc_gid;
+
+        /* name has to be \PIPE\xxxxx */
+        u.bind_ack.secondary_address =
+                        talloc_asprintf(pkt, "\\PIPE\\%s",
+                                        rpc_srv_get_pipe_srv_name(&id));
+        if (!u.bind_ack.secondary_address) {
+                DEBUG(0, ("Out of memory!\n"));
                 goto err_exit;
         }
-
-        /*
-         * Create the header, now we know the length.
-         */
-
-        if (prs_offset(&out_auth)) {
-                auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
-        }
-
-        init_rpc_hdr(&p->hdr, DCERPC_PKT_BIND_ACK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
-                        p->hdr.call_id,
-                        RPC_HEADER_LEN + prs_offset(&out_hdr_ba) + prs_offset(&out_auth),
-                        auth_len);
-
-        /*
-         * Marshall the header into the outgoing PDU.
-         */
-
-        if(!smb_io_rpc_hdr("", &p->hdr, &p->out_data.frag, 0)) {
-                DEBUG(0,("api_pipe_bind_req: marshalling of RPC_HDR failed.\n"));
-                goto err_exit;
-        }
-
-        /*
-         * Now add the RPC_HDR_BA and any auth needed.
-         */
-
-        if(!prs_append_prs_data(&p->out_data.frag, &out_hdr_ba)) {
-                DEBUG(0,("api_pipe_bind_req: append of RPC_HDR_BA failed.\n"));
-                goto err_exit;
-        }
-
-        if (auth_len && !prs_append_prs_data( &p->out_data.frag, &out_auth)) {
-                DEBUG(0,("api_pipe_bind_req: append of auth info failed.\n"));
-                goto err_exit;
+        u.bind_ack.secondary_address_size =
+                                strlen(u.bind_ack.secondary_address) + 1;
+
+        u.bind_ack.num_results = 1;
+        u.bind_ack.ctx_list = &bind_ack_ctx;
+
+        /* NOTE: We leave the auth_info empty so we can calculate the padding
+         * later and then append the auth_info --simo */
+
+        /*
+         * 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,
+                                          &p->out_data.frag);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("Failed to marshall bind_ack packet. (%s)\n",
+                          nt_errstr(status)));
+        }
+
+        if (auth_resp.length) {
+
+                status = dcerpc_push_dcerpc_auth(pkt,
+                                                 auth_type,
+                                                 auth_info.auth_level,
+                                                 0,
+                                                 1, /* auth_context_id */
+                                                 &auth_resp,
+                                                 &auth_blob);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0, ("Marshalling of dcerpc_auth failed.\n"));
+                        goto err_exit;
+                }
+        }
+
+        /* Now that we have the auth len store it into the right place in
+         * the dcerpc header */
+        dcerpc_set_frag_length(&p->out_data.frag,
+                                p->out_data.frag.length + auth_blob.length);
+
+        if (auth_blob.length) {
+
+                if (!data_blob_append(p->mem_ctx, &p->out_data.frag,
+                                        auth_blob.data, auth_blob.length)) {
+                        DEBUG(0, ("Append of auth info failed.\n"));
+                        goto err_exit;
+                }
         }
 
@@ -1869 +1150 @@
         p->out_data.current_pdu_sent = 0;
 
-        prs_mem_free(&out_hdr_ba);
-        prs_mem_free(&out_auth);
-
+        TALLOC_FREE(auth_blob.data);
         return True;
 
   err_exit:
 
-        prs_mem_free(&p->out_data.frag);
-        prs_mem_free(&out_hdr_ba);
-        prs_mem_free(&out_auth);
-        return setup_bind_nak(p);
+        data_blob_free(&p->out_data.frag);
+        TALLOC_FREE(auth_blob.data);
+        return setup_bind_nak(p, pkt);
+}
+
+/*******************************************************************
+ This is the "stage3" response after a bind request and reply.
+*******************************************************************/
+
+bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt)
+{
+        struct dcerpc_auth auth_info;
+        DATA_BLOB response = data_blob_null;
+        struct auth_ntlmssp_state *ntlmssp_ctx;
+        struct spnego_context *spnego_ctx;
+        struct gse_context *gse_ctx;
+        NTSTATUS status;
+
+        DEBUG(5, ("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
+
+        if (pkt->auth_length == 0) {
+                DEBUG(0, ("No auth field sent for bind request!\n"));
+                goto err;
+        }
+
+        /* Ensure there's enough data for an authenticated request. */
+        if (pkt->frag_length < RPC_HEADER_LEN
+                                + DCERPC_AUTH_TRAILER_LENGTH
+                                + pkt->auth_length) {
+                        DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_len "
+                                "%u is too large.\n",
+                        (unsigned int)pkt->auth_length));
+                goto err;
+        }
+
+        /*
+         * Decode the authentication verifier response.
+         */
+
+        status = dcerpc_pull_dcerpc_auth(pkt,
+                                         &pkt->u.auth3.auth_info,
+                                         &auth_info, p->endian);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("Failed to unmarshall dcerpc_auth.\n"));
+                goto err;
+        }
+
+        /* We must NEVER look at auth_info->auth_pad_len here,
+         * as old Samba client code gets it wrong and sends it
+         * as zero. JRA.
+         */
+
+        if (auth_info.auth_type != p->auth.auth_type) {
+                DEBUG(0, ("Auth type mismatch! Client sent %d, "
+                          "but auth was started as type %d!\n",
+                          auth_info.auth_type, p->auth.auth_type));
+                goto err;
+        }
+
+        switch (auth_info.auth_type) {
+        case DCERPC_AUTH_TYPE_NTLMSSP:
+                ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                    struct auth_ntlmssp_state);
+                status = ntlmssp_server_step(ntlmssp_ctx,
+                                             pkt, &auth_info.credentials,
+                                             &response);
+                break;
+        case DCERPC_AUTH_TYPE_KRB5:
+                gse_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                struct gse_context);
+                status = gssapi_server_step(gse_ctx,
+                                            pkt, &auth_info.credentials,
+                                            &response);
+                break;
+        case DCERPC_AUTH_TYPE_SPNEGO:
+                spnego_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                   struct spnego_context);
+                status = spnego_server_step(spnego_ctx,
+                                            pkt, &auth_info.credentials,
+                                            &response);
+                break;
+        default:
+                DEBUG(0, (__location__ ": incorrect auth type (%u).\n",
+                          (unsigned int)auth_info.auth_type));
+                return false;
+        }
+
+        if (NT_STATUS_EQUAL(status,
+                            NT_STATUS_MORE_PROCESSING_REQUIRED) ||
+            response.length) {
+                DEBUG(0, (__location__ ": This was supposed to be the final "
+                          "leg, but crypto machinery claims a response is "
+                          "needed, aborting auth!\n"));
+                data_blob_free(&response);
+                goto err;
+        }
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("Auth failed (%s)\n", nt_errstr(status)));
+                goto err;
+        }
+
+        /* Now verify auth was indeed successful and extract server info */
+        status = pipe_auth_verify_final(p);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("Auth Verify failed (%s)\n", nt_errstr(status)));
+                goto err;
+        }
+
+        return true;
+
+err:
+
+        TALLOC_FREE(p->auth.auth_ctx);
+        return false;
 }
 
@@ -1887 +1276 @@
 ****************************************************************************/
 
-bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
-{
-        RPC_HDR_BA hdr_ba;
-        RPC_HDR_RB hdr_rb;
-        RPC_HDR_AUTH auth_info;
+static bool api_pipe_alter_context(struct pipes_struct *p,
+                                        struct ncacn_packet *pkt)
+{
+        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;
-
-        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;
-        }
-
-        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"));
-                goto err_exit;
-        }
-
-        /* secondary address CAN be NULL
-         * as the specs say it's ignored.
-         * It MUST be NULL to have the spoolss working.
-         */
-        fstrcpy(ack_pipe_name,"");
+        NTSTATUS status;
+        union dcerpc_payload u;
+        struct dcerpc_ack_ctx bind_ack_ctx;
+        DATA_BLOB auth_resp = data_blob_null;
+        DATA_BLOB auth_blob = data_blob_null;
+        int pad_len = 0;
+        struct auth_ntlmssp_state *ntlmssp_ctx;
+        struct spnego_context *spnego_ctx;
+        struct gse_context *gse_ctx;
 
         DEBUG(5,("api_pipe_alter_context: make response. %d\n", __LINE__));
 
-        /*
-         * Check if this is an authenticated alter context request.
-         */
-
-        if (p->hdr.auth_len != 0) {
-                /* 
-                 * Decode the authentication verifier.
-                 */
-
-                if(!smb_io_rpc_hdr_auth("", &auth_info, rpc_in_p, 0)) {
-                        DEBUG(0,("api_pipe_alter_context: unable to unmarshall RPC_HDR_AUTH struct.\n"));
-                        goto err_exit;
-                }
-
-                /*
-                 * Currently only the SPNEGO auth type uses the alter ctx
-                 * response in place of the NTLMSSP auth3 type.
-                 */
-
-                if (auth_info.auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
-                        /* We can only finish if the pipe is unbound. */
-                        if (!p->pipe_bound) {
-                                if (!pipe_spnego_auth_bind_continue(p, rpc_in_p, &auth_info, &out_auth)) {
-                                        goto err_exit;
-                                }
-                        } else {
-                                goto err_exit;
-                        }
-                }
+        if (pkt->u.bind.assoc_group_id != 0) {
+                assoc_gid = pkt->u.bind.assoc_group_id;
         } else {
-                ZERO_STRUCT(auth_info);
-        }
-
-        assoc_gid = hdr_rb.bba.assoc_gid ? hdr_rb.bba.assoc_gid : 0x53f0;
+                assoc_gid = 0x53f0;
+        }
 
         /*
@@ -1987 +1309 @@
                 Needed when adding entries to a DACL from NT5 - SK */
 
-        if(check_bind_req(p, &hdr_rb.rpc_context[0].abstract, &hdr_rb.rpc_context[0].transfer[0],
-                                hdr_rb.rpc_context[0].context_id )) {
-                init_rpc_hdr_ba(&hdr_ba,
-                        RPC_MAX_PDU_FRAG_LEN,
-                        RPC_MAX_PDU_FRAG_LEN,
-                        assoc_gid,
-                        ack_pipe_name,
-                        0x1, 0x0, 0x0,
-                        &hdr_rb.rpc_context[0].transfer[0]);
+        if (check_bind_req(p,
+                        &pkt->u.bind.ctx_list[0].abstract_syntax,
+                        &pkt->u.bind.ctx_list[0].transfer_syntaxes[0],
+                        pkt->u.bind.ctx_list[0].context_id)) {
+
+                bind_ack_ctx.result = 0;
+                bind_ack_ctx.reason = 0;
+                bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0];
         } else {
+
                 /* Rejection reason: abstract syntax not supported */
-                init_rpc_hdr_ba(&hdr_ba, RPC_MAX_PDU_FRAG_LEN,
-                                        RPC_MAX_PDU_FRAG_LEN, assoc_gid,
-                                        ack_pipe_name, 0x1, 0x2, 0x1,
-                                        &null_ndr_syntax_id);
-                p->pipe_bound = False;
-        }
-
-        /*
-         * and marshall it.
-         */
-
-        if(!smb_io_rpc_hdr_ba("", &hdr_ba, &out_hdr_ba, 0)) {
-                DEBUG(0,("api_pipe_alter_context: marshalling of RPC_HDR_BA failed.\n"));
-                goto err_exit;
-        }
-
-        /*
-         * Create the header, now we know the length.
-         */
-
-        if (prs_offset(&out_auth)) {
-                auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
-        }
-
-        init_rpc_hdr(&p->hdr, DCERPC_PKT_ALTER_RESP, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
-                        p->hdr.call_id,
-                        RPC_HEADER_LEN + prs_offset(&out_hdr_ba) + prs_offset(&out_auth),
-                        auth_len);
-
-        /*
-         * Marshall the header into the outgoing PDU.
-         */
-
-        if(!smb_io_rpc_hdr("", &p->hdr, &p->out_data.frag, 0)) {
-                DEBUG(0,("api_pipe_alter_context: marshalling of RPC_HDR failed.\n"));
-                goto err_exit;
-        }
-
-        /*
-         * Now add the RPC_HDR_BA and any auth needed.
-         */
-
-        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;
-        }
-
-        if (auth_len && !prs_append_prs_data(&p->out_data.frag, &out_auth)) {
-                DEBUG(0,("api_pipe_alter_context: append of auth info failed.\n"));
-                goto err_exit;
+                bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT;
+                bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX;
+                bind_ack_ctx.syntax = null_ndr_syntax_id;
+        }
+
+        /*
+         * Check if this is an authenticated alter context request.
+         */
+        if (pkt->auth_length) {
+                /* Quick length check. Won't catch a bad auth footer,
+                 * prevents overrun. */
+
+                if (pkt->frag_length < RPC_HEADER_LEN +
+                                        DCERPC_AUTH_TRAILER_LENGTH +
+                                        pkt->auth_length) {
+                        DEBUG(0,("api_pipe_alter_context: auth_len (%u) "
+                                "too long for fragment %u.\n",
+                                (unsigned int)pkt->auth_length,
+                                (unsigned int)pkt->frag_length ));
+                        goto err_exit;
+                }
+
+                status = dcerpc_pull_dcerpc_auth(pkt,
+                                                 &pkt->u.bind.auth_info,
+                                                 &auth_info, p->endian);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n"));
+                        goto err_exit;
+                }
+
+                /* We can only finish if the pipe is unbound for now */
+                if (p->pipe_bound) {
+                        DEBUG(0, (__location__ ": Pipe already bound, "
+                                  "Altering Context not yet supported!\n"));
+                        goto err_exit;
+                }
+
+                if (auth_info.auth_type != p->auth.auth_type) {
+                        DEBUG(0, ("Auth type mismatch! Client sent %d, "
+                                  "but auth was started as type %d!\n",
+                                  auth_info.auth_type, p->auth.auth_type));
+                        goto err_exit;
+                }
+
+
+                switch (auth_info.auth_type) {
+                case DCERPC_AUTH_TYPE_SPNEGO:
+                        spnego_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                        struct spnego_context);
+                        status = spnego_server_step(spnego_ctx,
+                                                    pkt,
+                                                    &auth_info.credentials,
+                                                    &auth_resp);
+                        break;
+
+                case DCERPC_AUTH_TYPE_KRB5:
+                        gse_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                        struct gse_context);
+                        status = gssapi_server_step(gse_ctx,
+                                                    pkt,
+                                                    &auth_info.credentials,
+                                                    &auth_resp);
+                        break;
+                case DCERPC_AUTH_TYPE_NTLMSSP:
+                        ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                    struct auth_ntlmssp_state);
+                        status = ntlmssp_server_step(ntlmssp_ctx,
+                                                     pkt,
+                                                     &auth_info.credentials,
+                                                     &auth_resp);
+                        break;
+
+                default:
+                        DEBUG(3, (__location__ ": Usupported auth type (%d) "
+                                  "in alter-context call\n",
+                                  auth_info.auth_type));
+                        goto err_exit;
+                }
+
+                if (NT_STATUS_IS_OK(status)) {
+                        /* third leg of auth, verify auth info */
+                        status = pipe_auth_verify_final(p);
+                        if (!NT_STATUS_IS_OK(status)) {
+                                DEBUG(0, ("Auth Verify failed (%s)\n",
+                                          nt_errstr(status)));
+                                goto err_exit;
+                        }
+                } else if (NT_STATUS_EQUAL(status,
+                                        NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+                        DEBUG(10, ("More auth legs required.\n"));
+                } else {
+                        DEBUG(0, ("Auth step returned an error (%s)\n",
+                                  nt_errstr(status)));
+                        goto err_exit;
+                }
+        }
+
+        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;
+
+        u.alter_resp.num_results = 1;
+        u.alter_resp.ctx_list = &bind_ack_ctx;
+
+        /* NOTE: We leave the auth_info empty so we can calculate the padding
+         * later and then append the auth_info --simo */
+
+        /*
+         * 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_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)));
+        }
+
+        if (auth_resp.length) {
+
+                /* Work out any padding needed before the auth footer. */
+                pad_len = p->out_data.frag.length % SERVER_NDR_PADDING_SIZE;
+                if (pad_len) {
+                        pad_len = SERVER_NDR_PADDING_SIZE - pad_len;
+                        DEBUG(10, ("auth pad_len = %u\n",
+                                   (unsigned int)pad_len));
+                }
+
+                status = dcerpc_push_dcerpc_auth(pkt,
+                                                 auth_info.auth_type,
+                                                 auth_info.auth_level,
+                                                 pad_len,
+                                                 1, /* auth_context_id */
+                                                 &auth_resp,
+                                                 &auth_blob);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0, ("Marshalling of dcerpc_auth failed.\n"));
+                        goto err_exit;
+                }
+        }
+
+        /* Now that we have the auth len store it into the right place in
+         * the dcerpc header */
+        dcerpc_set_frag_length(&p->out_data.frag,
+                                p->out_data.frag.length +
+                                        pad_len + auth_blob.length);
+
+        if (auth_resp.length) {
+                if (pad_len) {
+                        char pad[SERVER_NDR_PADDING_SIZE];
+                        memset(pad, '\0', SERVER_NDR_PADDING_SIZE);
+                        if (!data_blob_append(p->mem_ctx,
+                                                &p->out_data.frag,
+                                                pad, pad_len)) {
+                                DEBUG(0, ("api_pipe_bind_req: failed to add "
+                                          "%u bytes of pad data.\n",
+                                          (unsigned int)pad_len));
+                                goto err_exit;
+                        }
+                }
+
+                if (!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;
+                }
         }
 
@@ -2057 +1511 @@
         p->out_data.current_pdu_sent = 0;
 
-        prs_mem_free(&out_hdr_ba);
-        prs_mem_free(&out_auth);
-
+        TALLOC_FREE(auth_blob.data);
         return True;
 
   err_exit:
 
-        prs_mem_free(&p->out_data.frag);
-        prs_mem_free(&out_hdr_ba);
-        prs_mem_free(&out_auth);
-        return setup_bind_nak(p);
-}
-
-/****************************************************************************
- Deal with NTLMSSP sign & seal processing on an RPC request.
-****************************************************************************/
-
-bool api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
-                                        uint32 *p_ss_padding_len, NTSTATUS *pstatus)
-{
-        RPC_HDR_AUTH auth_info;
-        uint32 auth_len = p->hdr.auth_len;
-        uint32 save_offset = prs_offset(rpc_in);
-        AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
-        unsigned char *data = NULL;
-        size_t data_len;
-        unsigned char *full_packet_data = NULL;
-        size_t full_packet_data_len;
-        DATA_BLOB auth_blob;
-
-        *pstatus = NT_STATUS_OK;
-
-        if (p->auth.auth_level == DCERPC_AUTH_LEVEL_NONE || p->auth.auth_level == DCERPC_AUTH_LEVEL_CONNECT) {
-                return True;
-        }
-
-        if (!a) {
-                *pstatus = NT_STATUS_INVALID_PARAMETER;
-                return False;
-        }
-
-        /* Ensure there's enough data for an authenticated request. */
-        if ((auth_len > RPC_MAX_SIGN_SIZE) ||
-                        (RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_HDR_AUTH_LEN + auth_len > p->hdr.frag_len)) {
-                DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_len %u is too large.\n",
-                        (unsigned int)auth_len ));
-                *pstatus = NT_STATUS_INVALID_PARAMETER;
-                return False;
-        }
-
-        /*
-         * We need the full packet data + length (minus auth stuff) as well as the packet data + length
-         * after the RPC header. 
-         * We need to pass in the full packet (minus auth len) to the NTLMSSP sign and check seal
-         * functions as NTLMv2 checks the rpc headers also.
-         */
-
-        data = (unsigned char *)(prs_data_p(rpc_in) + RPC_HDR_REQ_LEN);
-        data_len = (size_t)(p->hdr.frag_len - RPC_HEADER_LEN - RPC_HDR_REQ_LEN - RPC_HDR_AUTH_LEN - auth_len);
-
-        full_packet_data = p->in_data.current_in_pdu;
-        full_packet_data_len = p->hdr.frag_len - auth_len;
-
-        /* Pull the auth header and the following data into a blob. */
-        if(!prs_set_offset(rpc_in, RPC_HDR_REQ_LEN + data_len)) {
-                DEBUG(0,("api_pipe_ntlmssp_auth_process: cannot move offset to %u.\n",
-                        (unsigned int)RPC_HDR_REQ_LEN + (unsigned int)data_len ));
-                *pstatus = NT_STATUS_INVALID_PARAMETER;
-                return False;
-        }
-
-        if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, rpc_in, 0)) {
-                DEBUG(0,("api_pipe_ntlmssp_auth_process: failed to unmarshall RPC_HDR_AUTH.\n"));
-                *pstatus = NT_STATUS_INVALID_PARAMETER;
-                return False;
-        }
-
-        auth_blob.data = (unsigned char *)prs_data_p(rpc_in) + prs_offset(rpc_in);
-        auth_blob.length = auth_len;
-
-        switch (p->auth.auth_level) {
-                case DCERPC_AUTH_LEVEL_PRIVACY:
-                        /* Data is encrypted. */
-                        *pstatus = ntlmssp_unseal_packet(a->ntlmssp_state,
-                                                        data, data_len,
-                                                        full_packet_data,
-                                                        full_packet_data_len,
-                                                        &auth_blob);
-                        if (!NT_STATUS_IS_OK(*pstatus)) {
-                                return False;
-                        }
-                        break;
-                case DCERPC_AUTH_LEVEL_INTEGRITY:
-                        /* Data is signed. */
-                        *pstatus = ntlmssp_check_packet(a->ntlmssp_state,
-                                                        data, data_len,
-                                                        full_packet_data,
-                                                        full_packet_data_len,
-                                                        &auth_blob);
-                        if (!NT_STATUS_IS_OK(*pstatus)) {
-                                return False;
-                        }
-                        break;
-                default:
-                        *pstatus = NT_STATUS_INVALID_PARAMETER;
-                        return False;
-        }
-
-        /*
-         * Return the current pointer to the data offset.
-         */
-
-        if(!prs_set_offset(rpc_in, save_offset)) {
-                DEBUG(0,("api_pipe_auth_process: failed to set offset back to %u\n",
-                        (unsigned int)save_offset ));
-                *pstatus = NT_STATUS_INVALID_PARAMETER;
-                return False;
-        }
-
-        /*
-         * Remember the padding length. We must remove it from the real data
-         * stream once the sign/seal is done.
-         */
-
-        *p_ss_padding_len = auth_info.auth_pad_len;
-
-        return True;
-}
-
-/****************************************************************************
- Deal with schannel processing on an RPC request.
-****************************************************************************/
-
-bool api_pipe_schannel_process(pipes_struct *p, prs_struct *rpc_in, uint32 *p_ss_padding_len)
-{
-        uint32 data_len;
-        uint32 auth_len;
-        uint32 save_offset = prs_offset(rpc_in);
-        RPC_HDR_AUTH auth_info;
-        DATA_BLOB blob;
-        NTSTATUS status;
-        uint8_t *data;
-
-        auth_len = p->hdr.auth_len;
-
-        if (auth_len < RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN ||
-                        auth_len > RPC_HEADER_LEN +
-                                        RPC_HDR_REQ_LEN +
-                                        RPC_HDR_AUTH_LEN +
-                                        auth_len) {
-                DEBUG(0,("Incorrect auth_len %u.\n", (unsigned int)auth_len ));
-                return False;
-        }
-
-        /*
-         * The following is that length of the data we must verify or unseal.
-         * This doesn't include the RPC headers or the auth_len or the RPC_HDR_AUTH_LEN
-         * preceeding the auth_data.
-         */
-
-        if (p->hdr.frag_len < RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_HDR_AUTH_LEN + auth_len) {
-                DEBUG(0,("Incorrect frag %u, auth %u.\n",
-                        (unsigned int)p->hdr.frag_len,
-                        (unsigned int)auth_len ));
-                return False;
-        }
-
-        data_len = p->hdr.frag_len - RPC_HEADER_LEN - RPC_HDR_REQ_LEN - 
-                RPC_HDR_AUTH_LEN - auth_len;
-
-        DEBUG(5,("data %d auth %d\n", data_len, auth_len));
-
-        if(!prs_set_offset(rpc_in, RPC_HDR_REQ_LEN + data_len)) {
-                DEBUG(0,("cannot move offset to %u.\n",
-                         (unsigned int)RPC_HDR_REQ_LEN + data_len ));
-                return False;
-        }
-
-        if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, rpc_in, 0)) {
-                DEBUG(0,("failed to unmarshall RPC_HDR_AUTH.\n"));
-                return False;
-        }
-
-        if (auth_info.auth_type != DCERPC_AUTH_TYPE_SCHANNEL) {
-                DEBUG(0,("Invalid auth info %d on schannel\n",
-                         auth_info.auth_type));
-                return False;
-        }
-
-        blob = data_blob_const(prs_data_p(rpc_in) + prs_offset(rpc_in), auth_len);
-
-        if (DEBUGLEVEL >= 10) {
-                dump_NL_AUTH_SIGNATURE(talloc_tos(), &blob);
-        }
-
-        data = (uint8_t *)prs_data_p(rpc_in)+RPC_HDR_REQ_LEN;
-
-        switch (auth_info.auth_level) {
-        case DCERPC_AUTH_LEVEL_PRIVACY:
-                status = netsec_incoming_packet(p->auth.a_u.schannel_auth,
-                                                talloc_tos(),
-                                                true,
-                                                data,
-                                                data_len,
-                                                &blob);
-                break;
-        case DCERPC_AUTH_LEVEL_INTEGRITY:
-                status = netsec_incoming_packet(p->auth.a_u.schannel_auth,
-                                                talloc_tos(),
-                                                false,
-                                                data,
-                                                data_len,
-                                                &blob);
-                break;
-        default:
-                status = NT_STATUS_INTERNAL_ERROR;
-                break;
-        }
-
-        if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(0,("failed to unseal packet: %s\n", nt_errstr(status)));
-                return false;
-        }
-
-        /*
-         * Return the current pointer to the data offset.
-         */
-
-        if(!prs_set_offset(rpc_in, save_offset)) {
-                DEBUG(0,("failed to set offset back to %u\n",
-                         (unsigned int)save_offset ));
-                return False;
-        }
-
-        /*
-         * Remember the padding length. We must remove it from the real data
-         * stream once the sign/seal is done.
-         */
-
-        *p_ss_padding_len = auth_info.auth_pad_len;
-
-        return True;
+        data_blob_free(&p->out_data.frag);
+        TALLOC_FREE(auth_blob.data);
+        return setup_bind_nak(p, pkt);
 }
 
@@ -2321 +1541 @@
 }
 
-/****************************************************************************
- Memory cleanup.
-****************************************************************************/
-
-void free_pipe_rpc_context( PIPE_RPC_FNS *list )
-{
-        PIPE_RPC_FNS *tmp = list;
-        PIPE_RPC_FNS *tmp2;
-
-        while (tmp) {
-                tmp2 = tmp->next;
-                SAFE_FREE(tmp);
-                tmp = tmp2;
-        }
-
-        return; 
-}
-
-static bool api_rpcTNP(pipes_struct *p,
+static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
                        const struct api_struct *api_rpc_cmds, int n_cmds);
 
@@ -2348 +1550 @@
 ****************************************************************************/
 
-bool api_pipe_request(pipes_struct *p)
+static bool api_pipe_request(struct pipes_struct *p,
+                                struct ncacn_packet *pkt)
 {
         bool ret = False;
@@ -2355 +1558 @@
 
         if (p->pipe_bound &&
-                        ((p->auth.auth_type == PIPE_AUTH_TYPE_NTLMSSP) ||
-                         (p->auth.auth_type == PIPE_AUTH_TYPE_SPNEGO_NTLMSSP))) {
-                if(!become_authenticated_pipe_user(p)) {
-                        prs_mem_free(&p->out_data.rdata);
+            ((p->auth.auth_type == DCERPC_AUTH_TYPE_NTLMSSP) ||
+             (p->auth.auth_type == DCERPC_AUTH_TYPE_KRB5) ||
+             (p->auth.auth_type == DCERPC_AUTH_TYPE_SPNEGO))) {
+                if(!become_authenticated_pipe_user(p->session_info)) {
+                        data_blob_free(&p->out_data.rdata);
                         return False;
                 }
@@ -2369 +1573 @@
         /* get the set of RPC functions for this context */
 
-        pipe_fns = find_pipe_fns_by_context(p->contexts, p->hdr_req.context_id);
+        pipe_fns = find_pipe_fns_by_context(p->contexts,
+                                            pkt->u.request.context_id);
 
         if ( pipe_fns ) {
                 TALLOC_CTX *frame = talloc_stackframe();
-                ret = api_rpcTNP(p, pipe_fns->cmds, pipe_fns->n_cmds);
+                ret = api_rpcTNP(p, pipe_fns->cmds, pipe_fns->n_cmds);
                 TALLOC_FREE(frame);
         }
         else {
-                DEBUG(0,("api_pipe_request: No rpc function table associated with context [%d] on pipe [%s]\n",
-                        p->hdr_req.context_id,
-                         get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
+                DEBUG(0, ("No rpc function table associated with context "
+                          "[%d] on pipe [%s]\n",
+                          pkt->u.request.context_id,
+                          get_pipe_name_from_syntax(talloc_tos(),
+                                                    &p->syntax)));
         }
 
@@ -2393 +1600 @@
  ********************************************************************/
 
-static bool api_rpcTNP(pipes_struct *p,
+static bool api_rpcTNP(,
                        const struct api_struct *api_rpc_cmds, int n_cmds)
 {
         int fn_num;
-        uint32 offset1, offset2;
+        uint32;
 
         /* interpret the command */
         DEBUG(4,("api_rpcTNP: %s op 0x%x - ",
                  get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
-                 p->hdr_req.opnum));
+                 p.opnum));
 
         if (DEBUGLEVEL >= 50) {
@@ -2408 +1615 @@
                 slprintf(name, sizeof(name)-1, "in_%s",
                          get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
-                prs_dump(name, p->hdr_req.opnum, &p->in_data.data);
+                dump_pdu_region(name, pkt->u.request.opnum,
+                                &p->in_data.data, 0,
+                                p->in_data.data.length);
         }
 
         for (fn_num = 0; fn_num < n_cmds; fn_num++) {
-                if (api_rpc_cmds[fn_num].opnum == p->hdr_req.opnum && api_rpc_cmds[fn_num].fn != NULL) {
-                        DEBUG(3,("api_rpcTNP: rpc command: %s\n", api_rpc_cmds[fn_num].name));
+                if (api_rpc_cmds[fn_num].opnum == pkt->u.request.opnum &&
+                    api_rpc_cmds[fn_num].fn != NULL) {
+                        DEBUG(3, ("api_rpcTNP: rpc command: %s\n",
+                                  api_rpc_cmds[fn_num].name));
                         break;
                 }
@@ -2429 +1640 @@
         }
 
-        offset1 = prs_offset(&p->out_data.rdata);
+        offset1 = p;
 
         DEBUG(6, ("api_rpc_cmds[%d].fn == %p\n", 
@@ -2438 +1649 @@
                          get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
                          api_rpc_cmds[fn_num].name));
-                prs_mem_free(&p->out_data.rdata);
+                _free(&p->out_data.rdata);
                 return False;
         }
@@ -2456 +1667 @@
         }
 
-        offset2 = prs_offset(&p->out_data.rdata);
-        prs_set_offset(&p->out_data.rdata, offset1);
         if (DEBUGLEVEL >= 50) {
                 fstring name;
                 slprintf(name, sizeof(name)-1, "out_%s",
                          get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
-                prs_dump(name, p->hdr_req.opnum, &p->out_data.rdata);
-        }
-        prs_set_offset(&p->out_data.rdata, offset2);
+                dump_pdu_region(name, pkt->u.request.opnum,
+                                &p->out_data.rdata, offset1,
+                                p->out_data.rdata.length);
+        }
 
         DEBUG(5,("api_rpcTNP: called %s successfully\n",
@@ -2470 +1680 @@
 
         /* Check for buffer underflow in rpc parsing */
-
-        if ((DEBUGLEVEL >= 10) && 
-            (prs_offset(&p->in_data.data) != prs_data_size(&p->in_data.data))) {
-                size_t data_len = prs_data_size(&p->in_data.data) - prs_offset(&p->in_data.data);
-                char *data = (char *)SMB_MALLOC(data_len);
-
+        if ((DEBUGLEVEL >= 10) &&
+            (pkt->frag_length < p->in_data.data.length)) {
                 DEBUG(10, ("api_rpcTNP: rpc input buffer underflow (parse error?)\n"));
-                if (data) {
-                        prs_uint8s(False, "", &p->in_data.data, 0, (unsigned char *)data, (uint32)data_len);
-                        SAFE_FREE(data);
-                }
-
+                dump_data(10, p->in_data.data.data + pkt->frag_length,
+                              p->in_data.data.length - pkt->frag_length);
         }
 
         return True;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+