s3-dcerpc: Use dcerpc_pull_dcerpc_auth in api_pipe_bind_auth3()
[kamenim/samba.git] / source3 / rpc_server / srv_pipe.c
index a246b6db50d6d795c37d893825d73c352975fe40..7a6261613f8a0773731d4e8247668c9e3cbc0c7e 100644 (file)
@@ -1,7 +1,7 @@
 /* 
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
- *  Almost completely rewritten by (C) Jeremy Allison 2005.
+ *  Almost completely rewritten by (C) Jeremy Allison 2005 - 2010
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  */
 
 #include "includes.h"
-#include "../libcli/auth/libcli_auth.h"
+#include "srv_pipe_internal.h"
 #include "../librpc/gen_ndr/ndr_schannel.h"
 #include "../libcli/auth/schannel.h"
-#include "../libcli/auth/schannel_proto.h"
 #include "../libcli/auth/spnego.h"
-
-extern struct current_user current_user;
+#include "../libcli/auth/ntlmssp.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
 static void free_pipe_ntlmssp_auth_data(struct pipe_auth_data *auth)
 {
-       AUTH_NTLMSSP_STATE *a = auth->a_u.auth_ntlmssp_state;
+       struct auth_ntlmssp_state *a = auth->a_u.auth_ntlmssp_state;
 
        if (a) {
                auth_ntlmssp_end(&a);
@@ -70,7 +68,8 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
        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;
+       struct auth_ntlmssp_state *a = p->auth.a_u.auth_ntlmssp_state;
+       TALLOC_CTX *frame;
 
        /*
         * If we're in the fault state, keep returning fault PDU's until
@@ -109,8 +108,9 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
                return False;
        }
 
-       data_space_available = RPC_MAX_PDU_FRAG_LEN - RPC_HEADER_LEN
-               - RPC_HDR_RESP_LEN - RPC_HDR_AUTH_LEN - NTLMSSP_SIG_SIZE;
+       /* Space available - not including padding. */
+       data_space_available = RPC_MAX_PDU_FRAG_LEN - RPC_HEADER_LEN -
+               RPC_HDR_RESP_LEN - RPC_HDR_AUTH_LEN - NTLMSSP_SIG_SIZE;
 
        /*
         * The amount we send is the minimum of the available
@@ -119,6 +119,19 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
 
        data_len = MIN(data_len_left, data_space_available);
 
+       /* Work out any padding alignment requirements. */
+       if ((RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len) % SERVER_NDR_PADDING_SIZE) {
+               ss_padding_len = SERVER_NDR_PADDING_SIZE -
+                       ((RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len) % SERVER_NDR_PADDING_SIZE);
+               DEBUG(10,("create_next_pdu_ntlmssp: adding sign/seal padding of %u\n",
+                       ss_padding_len ));
+               /* If we're over filling the packet, we need to make space
+                * for the padding at the end of the data. */
+               if (data_len + ss_padding_len > data_space_available) {
+                       data_len -= SERVER_NDR_PADDING_SIZE;
+               }
+       }
+
        /*
         * Set up the alloc hint. This should be the data left to
         * send.
@@ -132,11 +145,6 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
 
        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 ));
-               }
        }
 
        /*
@@ -180,9 +188,9 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
 
        /* Copy the sign/seal padding data. */
        if (ss_padding_len) {
-               char pad[8];
+               char pad[SERVER_NDR_PADDING_SIZE];
 
-               memset(pad, '\0', 8);
+               memset(pad, '\0', SERVER_NDR_PADDING_SIZE);
                if (!prs_copy_data_in(&p->out_data.frag, pad,
                                      ss_padding_len)) {
                        DEBUG(0,("create_next_pdu_ntlmssp: failed to add %u bytes of pad data.\n",
@@ -206,8 +214,9 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
        }
 
        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)) {
+
+       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;
@@ -215,11 +224,12 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
 
        /* Generate the sign blob. */
 
+       frame = talloc_stackframe();
        switch (p->auth.auth_level) {
                case DCERPC_AUTH_LEVEL_PRIVACY:
                        /* Data portion is encrypted. */
-                       status = ntlmssp_seal_packet(
-                               a->ntlmssp_state,
+                       status = auth_ntlmssp_seal_packet(
+                               a, frame,
                                (uint8_t *)prs_data_p(&p->out_data.frag)
                                + RPC_HEADER_LEN + RPC_HDR_RESP_LEN,
                                data_len + ss_padding_len,
@@ -227,15 +237,15 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
                                (size_t)prs_offset(&p->out_data.frag),
                                &auth_blob);
                        if (!NT_STATUS_IS_OK(status)) {
-                               data_blob_free(&auth_blob);
+                               talloc_free(frame);
                                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,
+                       status = auth_ntlmssp_sign_packet(
+                               a, frame,
                                (unsigned char *)prs_data_p(&p->out_data.frag)
                                + RPC_HEADER_LEN + RPC_HDR_RESP_LEN,
                                data_len + ss_padding_len,
@@ -243,12 +253,13 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
                                (size_t)prs_offset(&p->out_data.frag),
                                &auth_blob);
                        if (!NT_STATUS_IS_OK(status)) {
-                               data_blob_free(&auth_blob);
+                               talloc_free(frame);
                                prs_mem_free(&p->out_data.frag);
                                return False;
                        }
                        break;
                default:
+                       talloc_free(frame);
                        prs_mem_free(&p->out_data.frag);
                        return False;
        }
@@ -258,12 +269,11 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
                              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);
+               talloc_free(frame);
                prs_mem_free(&p->out_data.frag);
                return False;
        }
-
-       data_blob_free(&auth_blob);
+       talloc_free(frame);
 
        /*
         * Setup the counts for this PDU.
@@ -327,6 +337,7 @@ static bool create_next_pdu_schannel(pipes_struct *p)
                return False;
        }
 
+       /* Space available - not including padding. */
        data_space_available = RPC_MAX_PDU_FRAG_LEN - RPC_HEADER_LEN
                - RPC_HDR_RESP_LEN - RPC_HDR_AUTH_LEN
                - RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN;
@@ -338,6 +349,19 @@ static bool create_next_pdu_schannel(pipes_struct *p)
 
        data_len = MIN(data_len_left, data_space_available);
 
+       /* Work out any padding alignment requirements. */
+       if ((RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len) % SERVER_NDR_PADDING_SIZE) {
+               ss_padding_len = SERVER_NDR_PADDING_SIZE -
+                       ((RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len) % SERVER_NDR_PADDING_SIZE);
+               DEBUG(10,("create_next_pdu_schannel: adding sign/seal padding of %u\n",
+                       ss_padding_len ));
+               /* If we're over filling the packet, we need to make space
+                * for the padding at the end of the data. */
+               if (data_len + ss_padding_len > data_space_available) {
+                       data_len -= SERVER_NDR_PADDING_SIZE;
+               }
+       }
+
        /*
         * Set up the alloc hint. This should be the data left to
         * send.
@@ -351,11 +375,6 @@ static bool create_next_pdu_schannel(pipes_struct *p)
 
        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 +
@@ -396,8 +415,8 @@ static bool create_next_pdu_schannel(pipes_struct *p)
 
        /* Copy the sign/seal padding data. */
        if (ss_padding_len) {
-               char pad[8];
-               memset(pad, '\0', 8);
+               char pad[SERVER_NDR_PADDING_SIZE];
+               memset(pad, '\0', SERVER_NDR_PADDING_SIZE);
                if (!prs_copy_data_in(&p->out_data.frag, pad,
                                      ss_padding_len)) {
                        DEBUG(0,("create_next_pdu_schannel: failed to add %u bytes of pad data.\n", (unsigned int)ss_padding_len));
@@ -422,7 +441,7 @@ static bool create_next_pdu_schannel(pipes_struct *p)
                                        DCERPC_AUTH_LEVEL_PRIVACY : DCERPC_AUTH_LEVEL_INTEGRITY,
                                ss_padding_len, 1);
 
-               if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info,
+               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);
@@ -643,11 +662,11 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
 {
        DATA_BLOB session_key, reply;
        NTSTATUS status;
-       AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
+       struct auth_ntlmssp_state *a = p->auth.a_u.auth_ntlmssp_state;
        bool ret;
 
        DEBUG(5,("pipe_ntlmssp_verify_final: pipe %s checking user details\n",
-                get_pipe_name_from_iface(&p->syntax)));
+                get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
 
        ZERO_STRUCT(reply);
 
@@ -668,39 +687,43 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
           refuse the bind. */
 
        if (p->auth.auth_level == DCERPC_AUTH_LEVEL_INTEGRITY) {
-               if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
+               if (!auth_ntlmssp_negotiated_sign(a)) {
                        DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet integrity requested "
                                "but client declined signing.\n",
-                               get_pipe_name_from_iface(&p->syntax)));
+                                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)) {
+               if (!auth_ntlmssp_negotiated_seal(a)) {
                        DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet privacy requested "
                                "but client declined sealing.\n",
-                               get_pipe_name_from_iface(&p->syntax)));
+                                get_pipe_name_from_syntax(talloc_tos(),
+                                                          &p->syntax)));
                        return False;
                }
        }
 
        DEBUG(5, ("pipe_ntlmssp_verify_final: OK: user: %s domain: %s "
-                 "workstation: %s\n", a->ntlmssp_state->user,
-                 a->ntlmssp_state->domain, a->ntlmssp_state->workstation));
-
-       if (a->server_info->ptok == NULL) {
-               DEBUG(1,("Error: Authmodule failed to provide nt_user_token\n"));
-               return False;
-       }
+                 "workstation: %s\n",
+                 auth_ntlmssp_get_username(a),
+                 auth_ntlmssp_get_domain(a),
+                 auth_ntlmssp_get_client(a)));
 
        TALLOC_FREE(p->server_info);
 
-       p->server_info = copy_serverinfo(p, a->server_info);
+       p->server_info = auth_ntlmssp_server_info(p, a);
        if (p->server_info == NULL) {
-               DEBUG(0, ("copy_serverinfo failed\n"));
+               DEBUG(0, ("auth_ntlmssp_server_info failed to obtain the server info for authenticated user\n"));
                return false;
        }
 
+       if (p->server_info->ptok == NULL) {
+               DEBUG(1,("Error: Authmodule failed to provide nt_user_token\n"));
+               return False;
+       }
+
        /*
         * We're an authenticated bind over smb, so the session key needs to
         * be set to "SystemLibraryDTC". Weird, but this is what Windows
@@ -719,38 +742,21 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
        return True;
 }
 
-/*******************************************************************
- The switch table for the pipe names and the functions to handle them.
-*******************************************************************/
-
-struct rpc_table {
-       struct {
-               const char *clnt;
-               const char *srv;
-       } pipe;
-       struct ndr_syntax_id rpc_interface;
-       const struct api_struct *cmds;
-       int n_cmds;
-};
-
-static struct rpc_table *rpc_lookup;
-static int rpc_lookup_size;
-
 /*******************************************************************
  This is the "stage3" NTLMSSP response after a bind request and reply.
 *******************************************************************/
 
 bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
 {
-       RPC_HDR_AUTH auth_info;
+       struct dcerpc_auth auth_info;
        uint32 pad = 0;
-       DATA_BLOB blob;
-
-       ZERO_STRUCT(blob);
+       DATA_BLOB auth_blob;
+       uint32_t auth_len = p->hdr.auth_len;
+       NTSTATUS status;
 
        DEBUG(5,("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
 
-       if (p->hdr.auth_len == 0) {
+       if (auth_len == 0) {
                DEBUG(0,("api_pipe_bind_auth3: No auth field sent !\n"));
                goto err;
        }
@@ -761,47 +767,72 @@ bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
                goto err;
        }
 
+       /* Ensure there's enough data for an authenticated request. */
+       if (RPC_HEADER_LEN + RPC_HDR_AUTH_LEN + auth_len >
+                               p->hdr.frag_len) {
+                       DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_len "
+                               "%u is too large.\n",
+                        (unsigned int)auth_len ));
+               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"));
+       /* Pull the auth header and the following data into a blob. */
+       /* NB. The offset of the auth_header is relative to the *end*
+        * of the packet, not the start. Also, the length of the
+        * data in rpc_in_p is p->hdr.frag_len - RPC_HEADER_LEN,
+        * as the RPC header isn't included in rpc_in_p. */
+       if(!prs_set_offset(rpc_in_p,
+                       p->hdr.frag_len - RPC_HEADER_LEN -
+                       RPC_HDR_AUTH_LEN - auth_len)) {
+               DEBUG(0,("api_pipe_bind_auth3: cannot move "
+                       "offset to %u.\n",
+                       (unsigned int)(p->hdr.frag_len -
+                               RPC_HDR_AUTH_LEN - auth_len) ));
                goto err;
        }
 
+       auth_blob = data_blob_const(prs_data_p(rpc_in_p)
+                                       + prs_offset(rpc_in_p),
+                                   prs_data_size(rpc_in_p)
+                                       - prs_offset(rpc_in_p));
+
+       status = dcerpc_pull_dcerpc_auth(prs_get_mem_context(rpc_in_p),
+                                        &auth_blob, &auth_info);
+       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 != DCERPC_AUTH_TYPE_NTLMSSP) {
                DEBUG(0,("api_pipe_bind_auth3: incorrect auth type (%u).\n",
                        (unsigned int)auth_info.auth_type ));
                return False;
        }
 
-       blob = data_blob(NULL,p->hdr.auth_len);
-
-       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
-               DEBUG(0,("api_pipe_bind_auth3: Failed to pull %u bytes - the response blob.\n",
-                       (unsigned int)p->hdr.auth_len ));
-               goto err;
-       }
-
        /*
         * The following call actually checks the challenge/response data.
         * for correctness against the given DOMAIN\user name.
         */
 
-       if (!pipe_ntlmssp_verify_final(p, &blob)) {
+       if (!pipe_ntlmssp_verify_final(p, &auth_info.credentials)) {
                goto err;
        }
 
-       data_blob_free(&blob);
-
        p->pipe_bound = True;
 
        return True;
 
  err:
 
-       data_blob_free(&blob);
        free_pipe_ntlmssp_auth_data(&p->auth);
        p->auth.a_u.auth_ntlmssp_state = NULL;
 
@@ -814,8 +845,9 @@ bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
 
 static bool setup_bind_nak(pipes_struct *p)
 {
-       RPC_HDR nak_hdr;
-       uint16 zero = 0;
+       NTSTATUS status;
+       union dcerpc_payload u;
+       DATA_BLOB blob;
 
        /* Free any memory in the current return data buffer. */
        prs_mem_free(&p->out_data.rdata);
@@ -832,24 +864,25 @@ static bool setup_bind_nak(pipes_struct *p)
         * Initialize a bind_nak header.
         */
 
-       init_rpc_hdr(&nak_hdr, DCERPC_PKT_BIND_NAK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
-               p->hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
+       ZERO_STRUCT(u);
 
-       /*
-        * Marshall the header into the outgoing PDU.
-        */
+       u.bind_nak.reject_reason  = 0;
 
-       if(!smb_io_rpc_hdr("", &nak_hdr, &p->out_data.frag, 0)) {
-               DEBUG(0,("setup_bind_nak: marshalling of RPC_HDR failed.\n"));
+       status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                         DCERPC_PKT_BIND_NAK,
+                                         DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
+                                         RPC_HEADER_LEN + sizeof(uint16_t) /* FIXME - gd */,
+                                         0,
+                                         p->hdr.call_id,
+                                         u,
+                                         &blob);
+       if (!NT_STATUS_IS_OK(status)) {
                prs_mem_free(&p->out_data.frag);
                return False;
        }
 
-       /*
-        * Now add the reject reason.
-        */
-
-       if(!prs_uint16("reject code", &p->out_data.frag, 0, &zero)) {
+       if (!prs_copy_data_in(&p->out_data.frag,
+                             (char *)blob.data, blob.length)) {
                prs_mem_free(&p->out_data.frag);
                return False;
        }
@@ -871,11 +904,11 @@ static bool setup_bind_nak(pipes_struct *p)
  Marshall a fault pdu.
 *******************************************************************/
 
-bool setup_fault_pdu(pipes_struct *p, NTSTATUS status)
+bool setup_fault_pdu(pipes_struct *p, NTSTATUS fault_status)
 {
-       RPC_HDR fault_hdr;
-       RPC_HDR_RESP hdr_resp;
-       RPC_HDR_FAULT fault_resp;
+       NTSTATUS status;
+       union dcerpc_payload u;
+       DATA_BLOB blob;
 
        /* Free any memory in the current return data buffer. */
        prs_mem_free(&p->out_data.rdata);
@@ -892,36 +925,26 @@ bool setup_fault_pdu(pipes_struct *p, NTSTATUS status)
         * Initialize a fault header.
         */
 
-       init_rpc_hdr(&fault_hdr, DCERPC_PKT_FAULT, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST | DCERPC_PFC_FLAG_DID_NOT_EXECUTE,
-            p->hdr.call_id, RPC_HEADER_LEN + RPC_HDR_RESP_LEN + RPC_HDR_FAULT_LEN, 0);
+       ZERO_STRUCT(u);
 
-       /*
-        * Initialize the HDR_RESP and FAULT parts of the PDU.
-        */
+       u.fault.status          = NT_STATUS_V(fault_status);
+       u.fault._pad            = data_blob_talloc_zero(p->mem_ctx, 4);
 
-       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"));
+       status = dcerpc_push_ncacn_packet(p->mem_ctx,
+                                         DCERPC_PKT_FAULT,
+                                         DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST | DCERPC_PFC_FLAG_DID_NOT_EXECUTE,
+                                         RPC_HEADER_LEN + RPC_HDR_RESP_LEN + RPC_HDR_FAULT_LEN /* FIXME - gd */,
+                                         0,
+                                         p->hdr.call_id,
+                                         u,
+                                         &blob);
+       if (!NT_STATUS_IS_OK(status)) {
                prs_mem_free(&p->out_data.frag);
                return False;
        }
 
-       if(!smb_io_rpc_hdr_fault("fault", &fault_resp, &p->out_data.frag, 0)) {
-               DEBUG(0,("setup_fault_pdu: failed to marshall RPC_HDR_FAULT.\n"));
+       if (!prs_copy_data_in(&p->out_data.frag,
+                             (char *)blob.data, blob.length)) {
                prs_mem_free(&p->out_data.frag);
                return False;
        }
@@ -932,55 +955,6 @@ bool setup_fault_pdu(pipes_struct *p, NTSTATUS status)
        return True;
 }
 
-#if 0
-/*******************************************************************
- Marshall a cancel_ack pdu.
- We should probably check the auth-verifier here.
-*******************************************************************/
-
-bool setup_cancel_ack_reply(pipes_struct *p, prs_struct *rpc_in_p)
-{
-       prs_struct outgoing_pdu;
-       RPC_HDR ack_reply_hdr;
-
-       /* Free any memory in the current return data buffer. */
-       prs_mem_free(&p->out_data.rdata);
-
-       /*
-        * Marshall directly into the outgoing PDU space. We
-        * must do this as we need to set to the bind response
-        * header and are never sending more than one PDU here.
-        */
-
-       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
-       prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
-
-       /*
-        * Initialize a cancel_ack header.
-        */
-
-       init_rpc_hdr(&ack_reply_hdr, DCERPC_PKT_CANCEL_ACK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
-                       p->hdr.call_id, RPC_HEADER_LEN, 0);
-
-       /*
-        * Marshall the header into the outgoing PDU.
-        */
-
-       if(!smb_io_rpc_hdr("", &ack_reply_hdr, &outgoing_pdu, 0)) {
-               DEBUG(0,("setup_cancel_ack_reply: marshalling of RPC_HDR failed.\n"));
-               prs_mem_free(&outgoing_pdu);
-               return False;
-       }
-
-       p->out_data.data_sent_length = 0;
-       p->out_data.current_pdu_len = prs_offset(&outgoing_pdu);
-       p->out_data.current_pdu_sent = 0;
-
-       prs_mem_free(&outgoing_pdu);
-       return True;
-}
-#endif
-
 /*******************************************************************
  Ensure a bind request has the correct abstract & transfer interface.
  Used to reject unknown binds from Win2k.
@@ -991,25 +965,18 @@ static bool check_bind_req(struct pipes_struct *p,
                           struct ndr_syntax_id* transfer,
                           uint32 context_id)
 {
-       int i=0;
        struct pipe_rpc_fns *context_fns;
 
        DEBUG(3,("check_bind_req for %s\n",
-                get_pipe_name_from_iface(&p->syntax)));
+                get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
 
        /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */
-
-       for (i=0; i<rpc_lookup_size; i++) {
-               DEBUGADD(10, ("checking %s\n", rpc_lookup[i].pipe.clnt));
-               if (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;
        }
 
@@ -1019,8 +986,8 @@ static bool check_bind_req(struct pipes_struct *p,
                return False;
        }
 
-       context_fns->cmds = rpc_lookup[i].cmds;
-       context_fns->n_cmds = rpc_lookup[i].n_cmds;
+       context_fns->n_cmds = rpc_srv_get_pipe_num_cmds(abstract);
+       context_fns->cmds = rpc_srv_get_pipe_cmds(abstract);
        context_fns->context_id = context_id;
 
        /* add to the list of open contexts */
@@ -1030,59 +997,6 @@ static bool check_bind_req(struct pipes_struct *p,
        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;
-}
-
 /**
  * Is a named pipe known?
  * @param[in] cli_filename     The pipe name requested by the client
@@ -1091,7 +1005,6 @@ NTSTATUS rpc_srv_register(int version, const char *clnt, const char *srv,
 bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax)
 {
        const char *pipename = cli_filename;
-       int i;
        NTSTATUS status;
 
        if (strnequal(pipename, "\\PIPE\\", 6)) {
@@ -1107,11 +1020,8 @@ bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax)
                return false;
        }
 
-       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;
        }
 
        status = smb_probe_module("rpc", pipename);
@@ -1124,12 +1034,8 @@ bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax)
        /*
         * 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;
        }
 
        DEBUG(10, ("is_known_pipename: pipe %s did not register itself!\n",
@@ -1142,8 +1048,11 @@ bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax)
  Handle a SPNEGO krb5 bind auth.
 *******************************************************************/
 
-static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info,
-               DATA_BLOB *psecblob, prs_struct *pout_auth)
+static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p,
+                                          prs_struct *rpc_in_p,
+                                          struct dcerpc_auth *pauth_info,
+                                          DATA_BLOB *psecblob,
+                                          prs_struct *pout_auth)
 {
        return False;
 }
@@ -1152,8 +1061,11 @@ static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p
  Handle the first part of a SPNEGO bind auth.
 *******************************************************************/
 
-static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_p,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p,
+                                           prs_struct *rpc_in_p,
+                                           uint32_t ss_padding_len,
+                                           struct dcerpc_auth *pauth_info,
+                                           prs_struct *pout_auth)
 {
        DATA_BLOB blob;
        DATA_BLOB secblob;
@@ -1163,28 +1075,18 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
         int i;
        NTSTATUS status;
         bool got_kerberos_mechanism = false;
-       AUTH_NTLMSSP_STATE *a = NULL;
-       RPC_HDR_AUTH auth_info;
+       struct auth_ntlmssp_state *a = NULL;
 
        ZERO_STRUCT(secblob);
        ZERO_STRUCT(chal);
        ZERO_STRUCT(response);
 
-       /* Grab the SPNEGO blob. */
-       blob = data_blob(NULL,p->hdr.auth_len);
-
-       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
-               DEBUG(0,("pipe_spnego_auth_bind_negotiate: Failed to pull %u bytes - the SPNEGO auth header.\n",
-                       (unsigned int)p->hdr.auth_len ));
-               goto err;
-       }
-
-       if (blob.data[0] != ASN1_APPLICATION(0)) {
+       if (pauth_info->credentials.data[0] != ASN1_APPLICATION(0)) {
                goto err;
        }
 
        /* parse out the OIDs and the first sec blob */
-       if (!parse_negTokenTarg(blob, OIDs, &secblob)) {
+       if (!parse_negTokenTarg(pauth_info->credentials, OIDs, &secblob)) {
                DEBUG(0,("pipe_spnego_auth_bind_negotiate: Failed to parse the security blob.\n"));
                goto err;
         }
@@ -1202,7 +1104,6 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
        if ( got_kerberos_mechanism && ((lp_security()==SEC_ADS) || USE_KERBEROS_KEYTAB) ) {
                bool ret = pipe_spnego_auth_bind_kerberos(p, rpc_in_p, pauth_info, &secblob, pout_auth);
                data_blob_free(&secblob);
-               data_blob_free(&blob);
                return ret;
        }
 
@@ -1218,6 +1119,16 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
                        goto err;
                }
 
+               switch (pauth_info->auth_level) {
+                       case DCERPC_AUTH_LEVEL_INTEGRITY:
+                               auth_ntlmssp_want_sign(a);
+                               break;
+                       case DCERPC_AUTH_LEVEL_PRIVACY:
+                               auth_ntlmssp_want_seal(a);
+                               break;
+                       default:
+                               break;
+               }
                /*
                 * Pass the first security blob of data to it.
                 * This can return an error or NT_STATUS_MORE_PROCESSING_REQUIRED
@@ -1244,14 +1155,22 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
                                        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"));
+       /* auth_pad_len will be handled by the caller */
+
+       status = dcerpc_push_dcerpc_auth(prs_get_mem_context(pout_auth),
+                                        DCERPC_AUTH_TYPE_SPNEGO,
+                                        pauth_info->auth_level,
+                                        ss_padding_len,
+                                        1, /* auth_context_id */
+                                        &response,
+                                        &blob);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Marshalling of dcerpc_auth failed.\n"));
                goto err;
        }
 
-       if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
+       /* Copy the blob into the pout_auth parse struct */
+       if (!prs_copy_data_in(pout_auth, (char *)blob.data, blob.length)) {
                DEBUG(0,("pipe_spnego_auth_bind_negotiate: marshalling of data blob failed.\n"));
                goto err;
        }
@@ -1260,7 +1179,6 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
        p->auth.auth_data_free_func = &free_pipe_ntlmssp_auth_data;
        p->auth.auth_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
 
-       data_blob_free(&blob);
        data_blob_free(&secblob);
        data_blob_free(&chal);
        data_blob_free(&response);
@@ -1270,7 +1188,6 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
 
  err:
 
-       data_blob_free(&blob);
        data_blob_free(&secblob);
        data_blob_free(&chal);
        data_blob_free(&response);
@@ -1285,14 +1202,15 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
 *******************************************************************/
 
 static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+                               uint32_t ss_padding_len,
+                               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;
+       struct auth_ntlmssp_state *a = p->auth.a_u.auth_ntlmssp_state;
 
        ZERO_STRUCT(spnego_blob);
        ZERO_STRUCT(auth_blob);
@@ -1342,8 +1260,11 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
        /* Generate the spnego "accept completed" blob - no incoming data. */
        response = spnego_gen_auth_response(&auth_reply, NT_STATUS_OK, OID_NTLMSSP);
 
+       /* FIXME - add auth_pad_len here ! */
+
        /* Copy the blob into the pout_auth parse struct */
-       init_rpc_hdr_auth(&auth_info, DCERPC_AUTH_TYPE_SPNEGO, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
+       init_rpc_hdr_auth(&auth_info, DCERPC_AUTH_TYPE_SPNEGO,
+                       pauth_info->auth_level, ss_padding_len, 1);
        if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
                DEBUG(0,("pipe_spnego_auth_bind_continue: marshalling of RPC_HDR_AUTH failed.\n"));
                goto err;
@@ -1378,10 +1299,13 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
  Handle an schannel bind auth.
 *******************************************************************/
 
-static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+static bool pipe_schannel_auth_bind(pipes_struct *p,
+                                       prs_struct *rpc_in_p,
+                                       uint32_t ss_padding_len,
+                                       struct dcerpc_auth *auth_info,
+                                       prs_struct *pout_auth)
 {
-       RPC_HDR_AUTH auth_info;
+       DATA_BLOB auth_blob;
        struct NL_AUTH_MESSAGE neg;
        struct NL_AUTH_MESSAGE reply;
        bool ret;
@@ -1391,11 +1315,10 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
        enum ndr_err_code ndr_err;
        DATA_BLOB blob;
 
-       blob = data_blob_const(prs_data_p(rpc_in_p) + prs_offset(rpc_in_p),
-                              prs_data_size(rpc_in_p));
-
-       ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), NULL, &neg,
-                              (ndr_pull_flags_fn_t)ndr_pull_NL_AUTH_MESSAGE);
+       ndr_err = ndr_pull_struct_blob(
+                       &auth_info->credentials,
+                       prs_get_mem_context(pout_auth), &neg,
+                       (ndr_pull_flags_fn_t)ndr_pull_NL_AUTH_MESSAGE);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                DEBUG(0,("pipe_schannel_auth_bind: Could not unmarshal SCHANNEL auth neg\n"));
                return false;
@@ -1417,9 +1340,8 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
         */
 
        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();
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -1465,12 +1387,6 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                return false;
        }
 
-       init_rpc_hdr_auth(&auth_info, DCERPC_AUTH_TYPE_SCHANNEL, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
-       if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
-               DEBUG(0,("pipe_schannel_auth_bind: marshalling of RPC_HDR_AUTH failed.\n"));
-               return False;
-       }
-
        /*** SCHANNEL verifier ***/
 
        reply.MessageType                       = NL_NEGOTIATE_RESPONSE;
@@ -1479,7 +1395,7 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                                                      * this has any meaning
                                                      * here - gd */
 
-       ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), NULL, &reply,
+       ndr_err = ndr_push_struct_blob(&auth_blob, talloc_tos(), &reply,
                       (ndr_push_flags_fn_t)ndr_push_NL_AUTH_MESSAGE);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                DEBUG(0,("Failed to marshall NL_AUTH_MESSAGE.\n"));
@@ -1490,6 +1406,18 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                NDR_PRINT_DEBUG(NL_AUTH_MESSAGE, &reply);
        }
 
+       status = dcerpc_push_dcerpc_auth(prs_get_mem_context(pout_auth),
+                                        DCERPC_AUTH_TYPE_SCHANNEL,
+                                        auth_info->auth_level,
+                                        ss_padding_len,
+                                        1, /* auth_context_id */
+                                        &auth_blob,
+                                        &blob);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Marshalling of dcerpc_auth failed.\n"));
+               return False;
+       }
+
        if (!prs_copy_data_in(pout_auth, (const char *)blob.data, blob.length)) {
                return false;
        }
@@ -1510,29 +1438,21 @@ static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
  Handle an NTLMSSP bind auth.
 *******************************************************************/
 
-static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
-                                       RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
+static bool pipe_ntlmssp_auth_bind(pipes_struct *p,
+                                       prs_struct *rpc_in_p,
+                                       uint32_t ss_padding_len,
+                                       struct dcerpc_auth *auth_info,
+                                       prs_struct *pout_auth)
 {
-       RPC_HDR_AUTH auth_info;
         DATA_BLOB blob;
        DATA_BLOB response;
         NTSTATUS status;
-       AUTH_NTLMSSP_STATE *a = NULL;
+       struct auth_ntlmssp_state *a = NULL;
 
-       ZERO_STRUCT(blob);
        ZERO_STRUCT(response);
 
-       /* Grab the NTLMSSP blob. */
-       blob = data_blob(NULL,p->hdr.auth_len);
-
-       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: Failed to pull %u bytes - the NTLM auth header.\n",
-                       (unsigned int)p->hdr.auth_len ));
-               goto err;
-       }
-
-       if (strncmp((char *)blob.data, "NTLMSSP", 7) != 0) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: Failed to read NTLMSSP in blob\n"));
+       if (strncmp((char *)auth_info->credentials.data, "NTLMSSP", 7) != 0) {
+               DEBUG(0, ("Failed to read NTLMSSP in blob\n"));
                 goto err;
         }
 
@@ -1544,23 +1464,38 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                goto err;
        }
 
-       status = auth_ntlmssp_update(a, blob, &response);
+       switch (auth_info->auth_level) {
+       case DCERPC_AUTH_LEVEL_INTEGRITY:
+               auth_ntlmssp_want_sign(a);
+               break;
+       case DCERPC_AUTH_LEVEL_PRIVACY:
+               auth_ntlmssp_want_seal(a);
+               break;
+       default:
+               break;
+       }
+
+       status = auth_ntlmssp_update(a, auth_info->credentials, &response);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
                DEBUG(0,("pipe_ntlmssp_auth_bind: auth_ntlmssp_update failed: %s\n",
                        nt_errstr(status) ));
                goto err;
        }
 
-       data_blob_free(&blob);
-
-       /* Copy the blob into the pout_auth parse struct */
-       init_rpc_hdr_auth(&auth_info, 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"));
+       status = dcerpc_push_dcerpc_auth(prs_get_mem_context(pout_auth),
+                                        DCERPC_AUTH_TYPE_NTLMSSP,
+                                        auth_info->auth_level,
+                                        ss_padding_len,
+                                        1, /* auth_context_id */
+                                        &response,
+                                        &blob);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Marshalling of dcerpc_auth failed.\n"));
                goto err;
        }
 
-       if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
+       /* Copy the blob into the pout_auth parse struct */
+       if (!prs_copy_data_in(pout_auth, (char *)blob.data, blob.length)) {
                DEBUG(0,("pipe_ntlmssp_auth_bind: marshalling of data blob failed.\n"));
                goto err;
        }
@@ -1569,7 +1504,6 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
        p->auth.auth_data_free_func = &free_pipe_ntlmssp_auth_data;
        p->auth.auth_type = PIPE_AUTH_TYPE_NTLMSSP;
 
-       data_blob_free(&blob);
        data_blob_free(&response);
 
        DEBUG(10,("pipe_ntlmssp_auth_bind: NTLMSSP auth started\n"));
@@ -1579,7 +1513,6 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
 
   err:
 
-       data_blob_free(&blob);
        data_blob_free(&response);
 
        free_pipe_ntlmssp_auth_data(&p->auth);
@@ -1594,20 +1527,25 @@ static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
 bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 {
        RPC_HDR_BA hdr_ba;
-       RPC_HDR_RB hdr_rb;
-       RPC_HDR_AUTH auth_info;
+       struct dcerpc_bind rpc_bind;
+       DATA_BLOB blob_rb;
+       struct dcerpc_auth auth_info;
+       DATA_BLOB auth_blob;
        uint16 assoc_gid;
        fstring ack_pipe_name;
        prs_struct out_hdr_ba;
        prs_struct out_auth;
-       int i = 0;
        int auth_len = 0;
        unsigned int auth_type = DCERPC_AUTH_TYPE_NONE;
+       uint32_t ss_padding_len = 0;
+       NTSTATUS status;
+       struct ndr_syntax_id id;
 
        /* No rebinds on a bound pipe - use alter context. */
        if (p->pipe_bound) {
                DEBUG(2,("api_pipe_bind_req: rejecting bind request on bound "
-                        "pipe %s.\n", get_pipe_name_from_iface(&p->syntax)));
+                        "pipe %s.\n",
+                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
                return setup_bind_nak(p);
        }
 
@@ -1639,17 +1577,15 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
        DEBUG(5,("api_pipe_bind_req: decode request. %d\n", __LINE__));
 
-       ZERO_STRUCT(hdr_rb);
-
        /* decode the bind request */
-
-       if(!smb_io_rpc_hdr_rb("", &hdr_rb, rpc_in_p, 0))  {
-               DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_RB "
-                        "struct.\n"));
+       blob_rb = data_blob_const(prs_data_p(rpc_in_p),
+                                 prs_data_size(rpc_in_p));
+       status = dcerpc_pull_dcerpc_bind(talloc_tos(), &blob_rb, &rpc_bind);
+       if (!NT_STATUS_IS_OK(status)) {
                goto err_exit;
        }
 
-       if (hdr_rb.num_contexts == 0) {
+       if (rpc_bind.num_contexts == 0) {
                DEBUG(0, ("api_pipe_bind_req: no rpc contexts around\n"));
                goto err_exit;
        }
@@ -1658,57 +1594,99 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
         * Try and find the correct pipe name to ensure
         * that this is a pipe name we support.
         */
-
-       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 = rpc_bind.ctx_list[0].abstract_syntax;
+       if (rpc_srv_pipe_exists_by_id(&id)) {
+               DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
+                       rpc_srv_get_pipe_cli_name(&id),
+                       rpc_srv_get_pipe_srv_name(&id)));
+       } else {
                status = smb_probe_module(
-                       "rpc", get_pipe_name_from_iface(
-                               &hdr_rb.rpc_context[0].abstract));
+                       "rpc", get_pipe_name_from_syntax(
+                               talloc_tos(),
+                               &rpc_bind.ctx_list[0].abstract_syntax));
 
                if (NT_STATUS_IS_ERR(status)) {
                        DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in bind request.\n",
-                                get_pipe_name_from_iface(&hdr_rb.rpc_context[0].abstract)));
+                                get_pipe_name_from_syntax(
+                                       talloc_tos(),
+                                       &rpc_bind.ctx_list[0].abstract_syntax)));
                        prs_mem_free(&p->out_data.frag);
                        prs_mem_free(&out_hdr_ba);
                        prs_mem_free(&out_auth);
 
                        return setup_bind_nak(p);
-                }
-
-                for (i = 0; i < rpc_lookup_size; i++) {
-                       if (strequal(rpc_lookup[i].pipe.clnt,
-                                   get_pipe_name_from_iface(&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) {
+               }
+
+               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",
-                                 get_pipe_name_from_iface(&p->syntax),
-                                 get_pipe_name_from_iface(&p->syntax)));
+                                 get_pipe_name_from_syntax(talloc_tos(),
+                                                           &p->syntax),
+                                 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);
+       fstrcat(ack_pipe_name, rpc_srv_get_pipe_srv_name(&id));
 
        DEBUG(5,("api_pipe_bind_req: make response. %d\n", __LINE__));
 
+       if (rpc_bind.assoc_group_id != 0) {
+               assoc_gid = rpc_bind.assoc_group_id;
+       } else {
+               assoc_gid = 0x53f0;
+       }
+
+
+       /*
+        * Create the bind response struct.
+        */
+
+       /* If the requested abstract synt uuid doesn't match our client pipe,
+               reject the bind_ack & set the transfer interface synt to all 0's,
+               ver 0 (observed when NT5 attempts to bind to abstract interfaces
+               unknown to NT4)
+               Needed when adding entries to a DACL from NT5 - SK */
+
+       if (check_bind_req(p,
+                       &rpc_bind.ctx_list[0].abstract_syntax,
+                       &rpc_bind.ctx_list[0].transfer_syntaxes[0],
+                       rpc_bind.ctx_list[0].context_id)) {
+               init_rpc_hdr_ba(&hdr_ba,
+                       RPC_MAX_PDU_FRAG_LEN,
+                       RPC_MAX_PDU_FRAG_LEN,
+                       assoc_gid,
+                       ack_pipe_name,
+                       0x1, 0x0, 0x0,
+                       &rpc_bind.ctx_list[0].transfer_syntaxes[0]);
+       } else {
+               /* Rejection reason: abstract syntax not supported */
+               init_rpc_hdr_ba(&hdr_ba, RPC_MAX_PDU_FRAG_LEN,
+                                       RPC_MAX_PDU_FRAG_LEN, assoc_gid,
+                                       ack_pipe_name, 0x1, 0x2, 0x1,
+                                       &null_ndr_syntax_id);
+               p->pipe_bound = False;
+       }
+
+       /*
+        * and marshall it.
+        */
+
+       if(!smb_io_rpc_hdr_ba("", &hdr_ba, &out_hdr_ba, 0)) {
+               DEBUG(0,("api_pipe_bind_req: marshalling of RPC_HDR_BA failed.\n"));
+               goto err_exit;
+       }
+
        /*
         * Check if this is an authenticated bind request.
         */
@@ -1718,8 +1696,49 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                 * 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"));
+               /* Work out any padding needed before the auth footer. */
+               if ((RPC_HEADER_LEN + prs_offset(&out_hdr_ba)) % SERVER_NDR_PADDING_SIZE) {
+                       ss_padding_len = SERVER_NDR_PADDING_SIZE -
+                               ((RPC_HEADER_LEN + prs_offset(&out_hdr_ba)) % SERVER_NDR_PADDING_SIZE);
+                       DEBUG(10,("api_pipe_bind_req: auth pad_len = %u\n",
+                               (unsigned int)ss_padding_len ));
+               }
+
+               /* Quick length check. Won't catch a bad auth footer,
+                * prevents overrun. */
+
+               if (p->hdr.frag_len < RPC_HEADER_LEN + RPC_HDR_AUTH_LEN + p->hdr.auth_len) {
+                       DEBUG(0,("api_pipe_bind_req: auth_len (%u) "
+                               "too long for fragment %u.\n",
+                               (unsigned int)p->hdr.auth_len,
+                               (unsigned int)p->hdr.frag_len ));
+                       goto err_exit;
+               }
+
+               /* Pull the auth header and the following data into a blob. */
+               /* NB. The offset of the auth_header is relative to the *end*
+                * of the packet, not the start. Also, the length of the
+                * data in rpc_in_p is p->hdr.frag_len - RPC_HEADER_LEN,
+                * as the RPC header isn't included in rpc_in_p. */
+               if(!prs_set_offset(rpc_in_p,
+                               p->hdr.frag_len - RPC_HEADER_LEN -
+                               RPC_HDR_AUTH_LEN - p->hdr.auth_len)) {
+                       DEBUG(0,("api_pipe_bind_req: cannot move "
+                               "offset to %u.\n",
+                               (unsigned int)(p->hdr.frag_len -
+                               RPC_HDR_AUTH_LEN - p->hdr.auth_len) ));
+                       goto err_exit;
+               }
+
+               auth_blob = data_blob_const(prs_data_p(rpc_in_p)
+                                               + prs_offset(rpc_in_p),
+                                           prs_data_size(rpc_in_p)
+                                               - prs_offset(rpc_in_p));
+
+               status = dcerpc_pull_dcerpc_auth(prs_get_mem_context(rpc_in_p),
+                                                &auth_blob, &auth_info);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n"));
                        goto err_exit;
                }
 
@@ -1727,39 +1746,40 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
                /* Work out if we have to sign or seal etc. */
                switch (auth_info.auth_level) {
-                       case DCERPC_AUTH_LEVEL_INTEGRITY:
-                               p->auth.auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
-                               break;
-                       case DCERPC_AUTH_LEVEL_PRIVACY:
-                               p->auth.auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
-                               break;
-                       default:
-                               DEBUG(0,("api_pipe_bind_req: unexpected auth level (%u).\n",
-                                       (unsigned int)auth_info.auth_level ));
-                               goto err_exit;
+               case DCERPC_AUTH_LEVEL_INTEGRITY:
+                       p->auth.auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+                       break;
+               case DCERPC_AUTH_LEVEL_PRIVACY:
+                       p->auth.auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
+                       break;
+               default:
+                       DEBUG(0, ("Unexpected auth level (%u).\n",
+                               (unsigned int)auth_info.auth_level ));
+                       goto err_exit;
                }
        } else {
                ZERO_STRUCT(auth_info);
        }
 
-       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)) {
+                       if (!pipe_ntlmssp_auth_bind(p, rpc_in_p,
+                                       ss_padding_len, &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)) {
+                       if (!pipe_schannel_auth_bind(p, rpc_in_p,
+                                       ss_padding_len, &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)) {
+                       if (!pipe_spnego_auth_bind_negotiate(p, rpc_in_p,
+                                       ss_padding_len, &auth_info, &out_auth)) {
                                goto err_exit;
                        }
                        break;
@@ -1773,50 +1793,13 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                        p->pipe_bound = True;
                        /* The session key was initialized from the SMB
                         * session in make_internal_rpc_pipe_p */
+                       ss_padding_len = 0;
                        break;
 
                default:
                        DEBUG(0,("api_pipe_bind_req: unknown auth type %x requested.\n", auth_type ));
                        goto err_exit;
        }
-
-       /*
-        * Create the bind response struct.
-        */
-
-       /* If the requested abstract synt uuid doesn't match our client pipe,
-               reject the bind_ack & set the transfer interface synt to all 0's,
-               ver 0 (observed when NT5 attempts to bind to abstract interfaces
-               unknown to NT4)
-               Needed when adding entries to a DACL from NT5 - SK */
-
-       if(check_bind_req(p, &hdr_rb.rpc_context[0].abstract, &hdr_rb.rpc_context[0].transfer[0],
-                               hdr_rb.rpc_context[0].context_id )) {
-               init_rpc_hdr_ba(&hdr_ba,
-                       RPC_MAX_PDU_FRAG_LEN,
-                       RPC_MAX_PDU_FRAG_LEN,
-                       assoc_gid,
-                       ack_pipe_name,
-                       0x1, 0x0, 0x0,
-                       &hdr_rb.rpc_context[0].transfer[0]);
-       } else {
-               /* Rejection reason: abstract syntax not supported */
-               init_rpc_hdr_ba(&hdr_ba, RPC_MAX_PDU_FRAG_LEN,
-                                       RPC_MAX_PDU_FRAG_LEN, assoc_gid,
-                                       ack_pipe_name, 0x1, 0x2, 0x1,
-                                       &null_ndr_syntax_id);
-               p->pipe_bound = False;
-       }
-
-       /*
-        * and marshall it.
-        */
-
-       if(!smb_io_rpc_hdr_ba("", &hdr_ba, &out_hdr_ba, 0)) {
-               DEBUG(0,("api_pipe_bind_req: marshalling of RPC_HDR_BA failed.\n"));
-               goto err_exit;
-       }
-
        /*
         * Create the header, now we know the length.
         */
@@ -1827,7 +1810,8 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
        init_rpc_hdr(&p->hdr, DCERPC_PKT_BIND_ACK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
                        p->hdr.call_id,
-                       RPC_HEADER_LEN + prs_offset(&out_hdr_ba) + prs_offset(&out_auth),
+                       RPC_HEADER_LEN + prs_offset(&out_hdr_ba) +
+                               ss_padding_len + prs_offset(&out_auth),
                        auth_len);
 
        /*
@@ -1848,9 +1832,23 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                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;
+       if (auth_len) {
+               if (ss_padding_len) {
+                       char pad[SERVER_NDR_PADDING_SIZE];
+                       memset(pad, '\0', SERVER_NDR_PADDING_SIZE);
+                       if (!prs_copy_data_in(&p->out_data.frag, pad,
+                                       ss_padding_len)) {
+                               DEBUG(0,("api_pipe_bind_req: failed to add %u "
+                                       "bytes of pad data.\n",
+                                       (unsigned int)ss_padding_len));
+                               goto err_exit;
+                       }
+               }
+
+               if (!prs_append_prs_data( &p->out_data.frag, &out_auth)) {
+                       DEBUG(0,("api_pipe_bind_req: append of auth info failed.\n"));
+                       goto err_exit;
+               }
        }
 
        /*
@@ -1881,13 +1879,16 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
 {
        RPC_HDR_BA hdr_ba;
-       RPC_HDR_RB hdr_rb;
+       struct dcerpc_bind rpc_bind;
+       DATA_BLOB blob_rb;
        RPC_HDR_AUTH auth_info;
        uint16 assoc_gid;
        fstring ack_pipe_name;
        prs_struct out_hdr_ba;
        prs_struct out_auth;
        int auth_len = 0;
+       uint32_t ss_padding_len = 0;
+       NTSTATUS status;
 
        prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL);
 
@@ -1915,13 +1916,13 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
                return False;
        }
 
-       ZERO_STRUCT(hdr_rb);
-
        DEBUG(5,("api_pipe_alter_context: decode request. %d\n", __LINE__));
 
        /* decode the alter context request */
-       if(!smb_io_rpc_hdr_rb("", &hdr_rb, rpc_in_p, 0))  {
-               DEBUG(0,("api_pipe_alter_context: unable to unmarshall RPC_HDR_RB struct.\n"));
+       blob_rb = data_blob_const(prs_data_p(rpc_in_p),
+                                 prs_data_size(rpc_in_p));
+       status = dcerpc_pull_dcerpc_bind(talloc_tos(), &blob_rb, &rpc_bind);
+       if (!NT_STATUS_IS_OK(status)) {
                goto err_exit;
        }
 
@@ -1933,41 +1934,12 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
 
        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 (rpc_bind.assoc_group_id != 0) {
+               assoc_gid = rpc_bind.assoc_group_id;
        } else {
-               ZERO_STRUCT(auth_info);
+               assoc_gid = 0x53f0;
        }
 
-       assoc_gid = hdr_rb.bba.assoc_gid ? hdr_rb.bba.assoc_gid : 0x53f0;
-
        /*
         * Create the bind response struct.
         */
@@ -1978,15 +1950,17 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
                unknown to NT4)
                Needed when adding entries to a DACL from NT5 - SK */
 
-       if(check_bind_req(p, &hdr_rb.rpc_context[0].abstract, &hdr_rb.rpc_context[0].transfer[0],
-                               hdr_rb.rpc_context[0].context_id )) {
+       if (check_bind_req(p,
+                       &rpc_bind.ctx_list[0].abstract_syntax,
+                       &rpc_bind.ctx_list[0].transfer_syntaxes[0],
+                       rpc_bind.ctx_list[0].context_id)) {
                init_rpc_hdr_ba(&hdr_ba,
                        RPC_MAX_PDU_FRAG_LEN,
                        RPC_MAX_PDU_FRAG_LEN,
                        assoc_gid,
                        ack_pipe_name,
                        0x1, 0x0, 0x0,
-                       &hdr_rb.rpc_context[0].transfer[0]);
+                       &rpc_bind.ctx_list[0].transfer_syntaxes[0]);
        } else {
                /* Rejection reason: abstract syntax not supported */
                init_rpc_hdr_ba(&hdr_ba, RPC_MAX_PDU_FRAG_LEN,
@@ -2005,6 +1979,74 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
                goto err_exit;
        }
 
+
+       /*
+        * Check if this is an authenticated alter context request.
+        */
+
+       if (p->hdr.auth_len != 0) {
+               /* 
+                * Decode the authentication verifier.
+                */
+
+               /* Work out any padding needed before the auth footer. */
+               if ((RPC_HEADER_LEN + prs_offset(&out_hdr_ba)) % SERVER_NDR_PADDING_SIZE) {
+                       ss_padding_len = SERVER_NDR_PADDING_SIZE -
+                               ((RPC_HEADER_LEN + prs_offset(&out_hdr_ba)) % SERVER_NDR_PADDING_SIZE);
+                       DEBUG(10,("api_pipe_alter_context: auth pad_len = %u\n",
+                               (unsigned int)ss_padding_len ));
+               }
+
+               /* Quick length check. Won't catch a bad auth footer,
+                * prevents overrun. */
+
+               if (p->hdr.frag_len < RPC_HEADER_LEN + RPC_HDR_AUTH_LEN + p->hdr.auth_len) {
+                       DEBUG(0,("api_pipe_alter_context: auth_len (%u) "
+                               "too long for fragment %u.\n",
+                               (unsigned int)p->hdr.auth_len,
+                               (unsigned int)p->hdr.frag_len ));
+                       goto err_exit;
+               }
+
+               /* Pull the auth header and the following data into a blob. */
+               /* NB. The offset of the auth_header is relative to the *end*
+                * of the packet, not the start. Also, the length of the
+                * data in rpc_in_p is p->hdr.frag_len - RPC_HEADER_LEN,
+                * as the RPC header isn't included in rpc_in_p. */
+               if(!prs_set_offset(rpc_in_p,
+                               p->hdr.frag_len - RPC_HEADER_LEN -
+                               RPC_HDR_AUTH_LEN - p->hdr.auth_len)) {
+                       DEBUG(0,("api_alter_context: cannot move "
+                               "offset to %u.\n",
+                               (unsigned int)(p->hdr.frag_len -
+                               RPC_HDR_AUTH_LEN - p->hdr.auth_len) ));
+                       goto err_exit;
+               }
+
+               if(!smb_io_rpc_hdr_auth("", &auth_info, rpc_in_p, 0)) {
+                       DEBUG(0,("api_pipe_alter_context: unable to unmarshall RPC_HDR_AUTH struct.\n"));
+                       goto err_exit;
+               }
+
+               /*
+                * Currently only the SPNEGO auth type uses the alter ctx
+                * 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,
+                                               ss_padding_len, &auth_info, &out_auth)) {
+                                       goto err_exit;
+                               }
+                       } else {
+                               goto err_exit;
+                       }
+               }
+       } else {
+               ZERO_STRUCT(auth_info);
+       }
        /*
         * Create the header, now we know the length.
         */
@@ -2036,9 +2078,23 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
                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;
+       if (auth_len) {
+               if (ss_padding_len) {
+                       char pad[SERVER_NDR_PADDING_SIZE];
+                       memset(pad, '\0', SERVER_NDR_PADDING_SIZE);
+                       if (!prs_copy_data_in(&p->out_data.frag, pad,
+                                       ss_padding_len)) {
+                               DEBUG(0,("api_pipe_alter_context: failed to add %u "
+                                       "bytes of pad data.\n",
+                                       (unsigned int)ss_padding_len));
+                               goto err_exit;
+                       }
+               }
+
+               if (!prs_append_prs_data( &p->out_data.frag, &out_auth)) {
+                       DEBUG(0,("api_pipe_alter_context: append of auth info failed.\n"));
+                       goto err_exit;
+               }
        }
 
        /*
@@ -2050,7 +2106,6 @@ bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
 
        prs_mem_free(&out_hdr_ba);
        prs_mem_free(&out_auth);
-
        return True;
 
   err_exit:
@@ -2071,7 +2126,7 @@ bool api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
        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;
+       struct auth_ntlmssp_state *a = p->auth.a_u.auth_ntlmssp_state;
        unsigned char *data = NULL;
        size_t data_len;
        unsigned char *full_packet_data = NULL;
@@ -2090,8 +2145,8 @@ bool api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
        }
 
        /* 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)) {
+       if (RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_HDR_AUTH_LEN
+                       + auth_len > p->hdr.frag_len) {
                DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_len %u is too large.\n",
                        (unsigned int)auth_len ));
                *pstatus = NT_STATUS_INVALID_PARAMETER;
@@ -2100,9 +2155,10 @@ bool api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
 
        /*
         * We need the full packet data + length (minus auth stuff) as well as the packet data + length
-        * after the RPC header. 
+        * after the RPC header.
         * We need to pass in the full packet (minus auth len) to the NTLMSSP sign and check seal
         * functions as NTLMv2 checks the rpc headers also.
+        * Both of these values include any auth_pad_len bytes.
         */
 
        data = (unsigned char *)(prs_data_p(rpc_in) + RPC_HDR_REQ_LEN);
@@ -2112,15 +2168,36 @@ bool api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
        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 ));
+       /* NB. The offset of the auth_header is relative to the *end*
+        * of the packet, not the start. Also, the length of the
+        * data in rpc_in_p is p->hdr.frag_len - RPC_HEADER_LEN,
+        * as the RPC header isn't included in rpc_in_p. */
+       if(!prs_set_offset(rpc_in,
+                       p->hdr.frag_len - RPC_HEADER_LEN -
+                       RPC_HDR_AUTH_LEN - auth_len)) {
+               DEBUG(0,("api_pipe_ntlmssp_auth_process: cannot move "
+                       "offset to %u.\n",
+                       (unsigned int)(p->hdr.frag_len -
+                               RPC_HDR_AUTH_LEN - auth_len) ));
                *pstatus = NT_STATUS_INVALID_PARAMETER;
                return False;
        }
 
        if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, rpc_in, 0)) {
-               DEBUG(0,("api_pipe_ntlmssp_auth_process: failed to unmarshall RPC_HDR_AUTH.\n"));
+               DEBUG(0,("api_pipe_ntlmssp_auth_process: failed to "
+                       "unmarshall RPC_HDR_AUTH.\n"));
+               *pstatus = NT_STATUS_INVALID_PARAMETER;
+               return False;
+       }
+
+       /* Ensure auth_pad_len fits into the packet. */
+       if (RPC_HEADER_LEN + RPC_HDR_REQ_LEN + auth_info.auth_pad_len +
+                       RPC_HDR_AUTH_LEN + auth_len > p->hdr.frag_len) {
+               DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_info.auth_pad_len "
+                       "too large (%u), auth_len (%u), frag_len = (%u).\n",
+                       (unsigned int)auth_info.auth_pad_len,
+                       (unsigned int)auth_len,
+                       (unsigned int)p->hdr.frag_len ));
                *pstatus = NT_STATUS_INVALID_PARAMETER;
                return False;
        }
@@ -2131,22 +2208,22 @@ bool api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
        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);
+                       *pstatus = auth_ntlmssp_unseal_packet(a,
+                                                             data, data_len,
+                                                             full_packet_data,
+                                                             full_packet_data_len,
+                                                             &auth_blob);
                        if (!NT_STATUS_IS_OK(*pstatus)) {
                                return False;
                        }
                        break;
                case DCERPC_AUTH_LEVEL_INTEGRITY:
                        /* Data is signed. */
-                       *pstatus = ntlmssp_check_packet(a->ntlmssp_state,
-                                                       data, data_len,
-                                                       full_packet_data,
-                                                       full_packet_data_len,
-                                                       &auth_blob);
+                       *pstatus = auth_ntlmssp_check_packet(a,
+                                                            data, data_len,
+                                                            full_packet_data,
+                                                            full_packet_data_len,
+                                                            &auth_blob);
                        if (!NT_STATUS_IS_OK(*pstatus)) {
                                return False;
                        }
@@ -2205,7 +2282,7 @@ bool api_pipe_schannel_process(pipes_struct *p, prs_struct *rpc_in, uint32 *p_ss
        /*
         * 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.
+        * preceeding the auth_data, but does include the auth_pad_len bytes.
         */
 
        if (p->hdr.frag_len < RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_HDR_AUTH_LEN + auth_len) {
@@ -2220,14 +2297,35 @@ bool api_pipe_schannel_process(pipes_struct *p, prs_struct *rpc_in, uint32 *p_ss
 
        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 ));
+       /* Pull the auth header and the following data into a blob. */
+       /* NB. The offset of the auth_header is relative to the *end*
+        * of the packet, not the start. Also, the length of the
+        * data in rpc_in_p is p->hdr.frag_len - RPC_HEADER_LEN,
+        * as the RPC header isn't included in rpc_in_p. */
+       if(!prs_set_offset(rpc_in,
+                       p->hdr.frag_len - RPC_HEADER_LEN -
+                       RPC_HDR_AUTH_LEN - auth_len)) {
+               DEBUG(0,("api_pipe_schannel_process: cannot move "
+                       "offset to %u.\n",
+                       (unsigned int)(p->hdr.frag_len -
+                               RPC_HDR_AUTH_LEN - auth_len) ));
                return False;
        }
 
        if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, rpc_in, 0)) {
-               DEBUG(0,("failed to unmarshall RPC_HDR_AUTH.\n"));
+               DEBUG(0,("api_pipe_schannel_process: failed to "
+                       "unmarshall RPC_HDR_AUTH.\n"));
+               return False;
+       }
+
+       /* Ensure auth_pad_len fits into the packet. */
+       if (RPC_HEADER_LEN + RPC_HDR_REQ_LEN + auth_info.auth_pad_len +
+                       RPC_HDR_AUTH_LEN + auth_len > p->hdr.frag_len) {
+               DEBUG(0,("api_pipe_schannel_process: auth_info.auth_pad_len "
+                       "too large (%u), auth_len (%u), frag_len = (%u).\n",
+                       (unsigned int)auth_info.auth_pad_len,
+                       (unsigned int)auth_len,
+                       (unsigned int)p->hdr.frag_len ));
                return False;
        }
 
@@ -2356,7 +2454,7 @@ bool api_pipe_request(pipes_struct *p)
        }
 
        DEBUG(5, ("Requested \\PIPE\\%s\n",
-                 get_pipe_name_from_iface(&p->syntax)));
+                 get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
 
        /* get the set of RPC functions for this context */
 
@@ -2370,7 +2468,7 @@ bool api_pipe_request(pipes_struct *p)
        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_iface(&p->syntax)));
+                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
        }
 
        if (changed_user) {
@@ -2392,12 +2490,13 @@ static bool api_rpcTNP(pipes_struct *p,
 
        /* interpret the command */
        DEBUG(4,("api_rpcTNP: %s op 0x%x - ",
-                get_pipe_name_from_iface(&p->syntax), p->hdr_req.opnum));
+                get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
+                p->hdr_req.opnum));
 
        if (DEBUGLEVEL >= 50) {
                fstring name;
                slprintf(name, sizeof(name)-1, "in_%s",
-                        get_pipe_name_from_iface(&p->syntax));
+                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
                prs_dump(name, p->hdr_req.opnum, &p->in_data.data);
        }
 
@@ -2426,7 +2525,7 @@ static bool api_rpcTNP(pipes_struct *p,
        /* do the actual command */
        if(!api_rpc_cmds[fn_num].fn(p)) {
                DEBUG(0,("api_rpcTNP: %s: %s failed.\n",
-                        get_pipe_name_from_iface(&p->syntax),
+                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
                         api_rpc_cmds[fn_num].name));
                prs_mem_free(&p->out_data.rdata);
                return False;
@@ -2451,13 +2550,13 @@ static bool api_rpcTNP(pipes_struct *p,
        if (DEBUGLEVEL >= 50) {
                fstring name;
                slprintf(name, sizeof(name)-1, "out_%s",
-                        get_pipe_name_from_iface(&p->syntax));
+                        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);
 
        DEBUG(5,("api_rpcTNP: called %s successfully\n",
-                get_pipe_name_from_iface(&p->syntax)));
+                get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
 
        /* Check for buffer underflow in rpc parsing */