s3:rpc_server: pass everything but AUTH_TYPE_{NONE,NCALRPC_AS_SYSTEM} to gensec
[obnox/samba/samba-obnox.git] / source3 / rpc_server / srv_pipe.c
index 3f8855de3a229955068836ea271fa51551eb25fd..d85751d84680ee299665dbf8386af08eff212c57 100644 (file)
  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "srv_pipe_internal.h"
-#include "../librpc/gen_ndr/ndr_schannel.h"
-#include "../libcli/auth/schannel.h"
-#include "../libcli/auth/spnego.h"
-#include "../libcli/auth/ntlmssp.h"
-#include "ntlmssp_wrap.h"
+#include "../librpc/gen_ndr/dcerpc.h"
+#include "../librpc/rpc/rpc_common.h"
+#include "dcesrv_auth_generic.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"
+#include "rpc_server/rpc_contexts.h"
+#include "lib/param/param.h"
+#include "librpc/ndr/ndr_table.h"
+#include "auth/gensec/gensec.h"
+#include "librpc/ndr/ndr_dcerpc.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
+static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p);
+
 /**
  * Dump everything from the start of the end up of the provided data
  * into a file, but only at debug level >= 50
@@ -84,89 +95,32 @@ static void dump_pdu_region(const char *name, int v,
        TALLOC_FREE(fname);
 }
 
-static void free_pipe_ntlmssp_auth_data(struct pipe_auth_data *auth)
-{
-       TALLOC_FREE(auth->a_u.auth_ntlmssp_state);
-}
-
-static void free_pipe_schannel_auth_data(struct pipe_auth_data *auth)
-{
-       TALLOC_FREE(auth->a_u.schannel_auth);
-}
-
-static void free_pipe_auth_data(struct pipe_auth_data *auth)
-{
-       if (auth->auth_data_free_func) {
-               (*auth->auth_data_free_func)(auth);
-               auth->auth_data_free_func = NULL;
-       }
-}
-
 static DATA_BLOB generic_session_key(void)
 {
-       return data_blob("SystemLibraryDTC", 16);
+       return data_blob_const("SystemLibraryDTC", 16);
 }
 
 /*******************************************************************
  Generate the next PDU to be returned from the data.
 ********************************************************************/
 
-static bool 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)
+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_len_left;
-       size_t data_len;
-       size_t max_len;
+       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;
 
-       switch (auth->auth_level) {
-       case DCERPC_AUTH_LEVEL_NONE:
-       case DCERPC_AUTH_LEVEL_CONNECT:
-               /* This is incorrect for auth level connect. Fixme. JRA */
-
-               /* No authentication done. */
-               break;
-
-       case DCERPC_AUTH_LEVEL_CALL:
-       case DCERPC_AUTH_LEVEL_PACKET:
-       case DCERPC_AUTH_LEVEL_INTEGRITY:
-       case DCERPC_AUTH_LEVEL_PRIVACY:
-
-               switch(auth->auth_type) {
-               case DCERPC_AUTH_TYPE_NTLMSSP:
-                       auth_len = NTLMSSP_SIG_SIZE;
-                       break;
-               case DCERPC_AUTH_TYPE_SPNEGO:
-                       if (auth->spnego_type !=
-                                       PIPE_AUTH_TYPE_SPNEGO_NTLMSSP) {
-                               return false;
-                       }
-                       auth_len = NTLMSSP_SIG_SIZE;
-                       break;
-
-               case DCERPC_AUTH_TYPE_SCHANNEL:
-                       auth_len = NL_AUTH_SIGNATURE_SIZE;
-                       break;
-
-               default:
-                       return false;
-               }
-
-               break;
-
-       default:
-               return false;
-       }
-
        ZERO_STRUCT(u.response);
 
        /* Set up rpc packet pfc flags. */
@@ -177,56 +131,36 @@ static bool create_next_packet(TALLOC_CTX *mem_ctx,
        }
 
        /* Work out how much we can fit in a single PDU. */
-       data_len_left = rdata->length - data_sent_length;
+       data_left = rdata->length - data_sent_length;
 
        /* Ensure there really is data left to send. */
-       if (!data_len_left) {
+       if (!data_left) {
                DEBUG(0, ("No data left to send !\n"));
-               return false;
-       }
-
-       /* Max space available - not including padding. */
-       if (auth_len) {
-               max_len = RPC_MAX_PDU_FRAG_LEN
-                               - DCERPC_RESPONSE_LENGTH
-                               - DCERPC_AUTH_TRAILER_LENGTH
-                               - auth_len;
-       } else {
-               max_len = RPC_MAX_PDU_FRAG_LEN - DCERPC_RESPONSE_LENGTH;
+               return NT_STATUS_BUFFER_TOO_SMALL;
        }
 
-       /*
-        * The amount we send is the minimum of the max_len
-        * and the amount left to send.
-        */
-       data_len = MIN(data_len_left, max_len);
-
-       if (auth_len) {
-               /* Work out any padding alignment requirements. */
-               pad_len = (DCERPC_RESPONSE_LENGTH + data_len) %
-                                               SERVER_NDR_PADDING_SIZE;
-               if (pad_len) {
-                       pad_len = SERVER_NDR_PADDING_SIZE - pad_len;
-                       DEBUG(10, ("Padding size is: %d\n", (int)pad_len));
-                       /* If we're over filling the packet, we need to make
-                        * space for the padding at the end of the data. */
-                       if (data_len + pad_len > max_len) {
-                               data_len -= SERVER_NDR_PADDING_SIZE;
-                       }
-               }
+       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_len_left;
+       u.response.alloc_hint = data_left;
 
        /* Work out if this PDU will be the last. */
-       if (data_sent_length + data_len >= rdata->length) {
+       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_len);
+               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,
@@ -234,7 +168,7 @@ static bool create_next_packet(TALLOC_CTX *mem_ctx,
                                          &u, frag);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("Failed to marshall RPC Packet.\n"));
-               return false;
+               return status;
        }
 
        if (auth_len) {
@@ -250,12 +184,12 @@ static bool create_next_packet(TALLOC_CTX *mem_ctx,
                status = dcerpc_add_auth_footer(auth, pad_len, frag);
                if (!NT_STATUS_IS_OK(status)) {
                        data_blob_free(frag);
-                       return false;
+                       return status;
                }
        }
 
-       *pdu_size = data_len;
-       return true;
+       *pdu_size = data_to_send;
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
@@ -264,24 +198,26 @@ static bool create_next_packet(TALLOC_CTX *mem_ctx,
 
 bool create_next_pdu(struct pipes_struct *p)
 {
-       size_t pdu_size;
-       bool ret;
+       size_t pdu_size = 0;
+       NTSTATUS status;
 
        /*
         * If we're in the fault state, keep returning fault PDU's until
         * the pipe gets closed. JRA.
         */
        if (p->fault_state) {
-               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
+               setup_fault_pdu(p, NT_STATUS(p->fault_state));
                return true;
        }
 
-       ret = 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 (!ret) {
-               DEBUG(0, ("Invalid internal auth level %u / type %u\n",
+       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)) {
+               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;
@@ -293,167 +229,6 @@ bool create_next_pdu(struct pipes_struct *p)
        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(struct pipes_struct *p,
-                                     DATA_BLOB *p_resp_blob)
-{
-       DATA_BLOB session_key, reply;
-       NTSTATUS status;
-       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_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 (!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 (!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_syntax(talloc_tos(),
-                                                          &p->syntax)));
-                       return False;
-               }
-       }
-       if (p->auth.auth_level == DCERPC_AUTH_LEVEL_PRIVACY) {
-               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_syntax(talloc_tos(),
-                                                          &p->syntax)));
-                       return False;
-               }
-       }
-
-       DEBUG(5, ("pipe_ntlmssp_verify_final: OK: user: %s domain: %s "
-                 "workstation: %s\n",
-                 auth_ntlmssp_get_username(a),
-                 auth_ntlmssp_get_domain(a),
-                 auth_ntlmssp_get_client(a)));
-
-       TALLOC_FREE(p->server_info);
-
-       status = auth_ntlmssp_steal_server_info(p, a, &p->server_info);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("auth_ntlmssp_server_info failed to obtain the server info for authenticated user: %s\n",
-                         nt_errstr(status)));
-               return false;
-       }
-
-       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
-        * 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;
-}
-
-/*******************************************************************
- This is the "stage3" NTLMSSP 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;
-       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 != DCERPC_AUTH_TYPE_NTLMSSP) {
-               DEBUG(0,("api_pipe_bind_auth3: incorrect auth type (%u).\n",
-                       (unsigned int)auth_info.auth_type ));
-               return False;
-       }
-
-       /*
-        * The following call actually checks the challenge/response data.
-        * for correctness against the given DOMAIN\user name.
-        */
-
-       if (!pipe_ntlmssp_verify_final(p, &auth_info.credentials)) {
-               goto err;
-       }
-
-       p->pipe_bound = True;
-
-       return True;
-
- err:
-
-       free_pipe_auth_data(&p->auth);
-
-       return False;
-}
 
 static bool pipe_init_outgoing_data(struct pipes_struct *p);
 
@@ -498,10 +273,9 @@ static bool setup_bind_nak(struct pipes_struct *p, struct ncacn_packet *pkt)
        p->out_data.data_sent_length = 0;
        p->out_data.current_pdu_sent = 0;
 
-       free_pipe_auth_data(&p->auth);
+       TALLOC_FREE(p->auth.auth_ctx);
        p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE;
        p->auth.auth_type = DCERPC_AUTH_TYPE_NONE;
-       p->auth.spnego_type = PIPE_AUTH_TYPE_SPNEGO_NONE;
        p->pipe_bound = False;
 
        return True;
@@ -561,32 +335,42 @@ bool setup_fault_pdu(struct pipes_struct *p, NTSTATUS fault_status)
 static bool check_bind_req(struct pipes_struct *p,
                           struct ndr_syntax_id* abstract,
                           struct ndr_syntax_id* transfer,
-                          uint32 context_id)
+                          uint32_t context_id)
 {
        struct pipe_rpc_fns *context_fns;
+       bool ok;
 
        DEBUG(3,("check_bind_req for %s\n",
-                get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
+                ndr_interface_name(&abstract->uuid,
+                                   abstract->if_version)));
 
        /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */
        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)));
+          ndr_syntax_id_equal(transfer, &ndr_transfer_syntax_ndr)) {
+               DEBUG(3, ("check_bind_req: %s -> %s rpc service\n",
+                         rpc_srv_get_pipe_cli_name(abstract),
+                         rpc_srv_get_pipe_srv_name(abstract)));
        } else {
                return false;
        }
 
-       context_fns = SMB_MALLOC_P(struct pipe_rpc_fns);
+       ok = init_pipe_handles(p, abstract);
+       if (!ok) {
+               DEBUG(1, ("Failed to init pipe handles!\n"));
+               return false;
+       }
+
+       context_fns = talloc(p, struct pipe_rpc_fns);
        if (context_fns == NULL) {
-               DEBUG(0,("check_bind_req: malloc() failed!\n"));
-               return False;
+               DEBUG(0,("check_bind_req: talloc() failed!\n"));
+               return false;
        }
 
+       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;
+       context_fns->syntax = *abstract;
 
        /* add to the list of open contexts */
 
@@ -597,22 +381,13 @@ static bool check_bind_req(struct pipes_struct *p,
 
 /**
  * Is a named pipe known?
- * @param[in] cli_filename     The pipe name requested by the client
+ * @param[in] pipename         Just the filename
  * @result                     Do we want to serve this?
  */
-bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax)
+bool is_known_pipename(const char *pipename, struct ndr_syntax_id *syntax)
 {
-       const char *pipename = cli_filename;
        NTSTATUS status;
 
-       if (strnequal(pipename, "\\PIPE\\", 6)) {
-               pipename += 5;
-       }
-
-       if (*pipename == '\\') {
-               pipename += 1;
-       }
-
        if (lp_disable_spoolss() && strequal(pipename, "spoolss")) {
                DEBUG(10, ("refusing spoolss access\n"));
                return false;
@@ -624,7 +399,7 @@ bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax)
 
        status = smb_probe_module("rpc", pipename);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("is_known_pipename: %s unknown\n", cli_filename));
+               DEBUG(10, ("is_known_pipename: %s unknown\n", pipename));
                return false;
        }
        DEBUG(10, ("is_known_pipename: %s loaded dynamically\n", pipename));
@@ -643,418 +418,181 @@ 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(struct pipes_struct *p,
-                                          TALLOC_CTX *mem_ctx,
-                                          struct dcerpc_auth *pauth_info,
-                                          DATA_BLOB *psecblob,
-                                          DATA_BLOB *response)
-{
-       return False;
-}
-
-/*******************************************************************
- Handle the first part of a SPNEGO bind auth.
+ Handle an NTLMSSP bind auth.
 *******************************************************************/
 
-static bool pipe_spnego_auth_bind_negotiate(struct pipes_struct *p,
-                                           TALLOC_CTX *mem_ctx,
-                                           struct dcerpc_auth *pauth_info,
-                                           DATA_BLOB *response)
+static bool pipe_auth_generic_bind(struct pipes_struct *p,
+                                  struct ncacn_packet *pkt,
+                                  struct dcerpc_auth *auth_info,
+                                  DATA_BLOB *response)
 {
-       DATA_BLOB secblob;
-       DATA_BLOB chal;
-       char *OIDs[ASN1_MAX_OIDS];
-        int i;
-       NTSTATUS status;
-        bool got_kerberos_mechanism = false;
-       struct auth_ntlmssp_state *a = NULL;
-
-       ZERO_STRUCT(secblob);
-       ZERO_STRUCT(chal);
-
-       if (pauth_info->credentials.data[0] != ASN1_APPLICATION(0)) {
-               goto err;
-       }
-
-       /* parse out the OIDs and the first sec blob */
-       if (!spnego_parse_negTokenInit(talloc_tos(),
-                       pauth_info->credentials, OIDs, NULL, &secblob)) {
-               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;
-               ret = pipe_spnego_auth_bind_kerberos(p, mem_ctx, pauth_info,
-                                                    &secblob, response);
-               data_blob_free(&secblob);
-               return ret;
-       }
-
-       /* Free any previous auth type. */
-       free_pipe_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;
-               }
-
-               /* Clear flags,
-                * then set them according to requested Auth Level */
-               auth_ntlmssp_and_flags(a, ~(NTLMSSP_NEGOTIATE_SIGN |
-                                               NTLMSSP_NEGOTIATE_SEAL));
-               switch (pauth_info->auth_level) {
-                       case DCERPC_AUTH_LEVEL_INTEGRITY:
-                               auth_ntlmssp_or_flags(a,
-                                               NTLMSSP_NEGOTIATE_SIGN);
-                               break;
-                       case DCERPC_AUTH_LEVEL_PRIVACY:
-                               /* Privacy always implies both sign and seal
-                                * for ntlmssp */
-                               auth_ntlmssp_or_flags(a,
-                                               NTLMSSP_NEGOTIATE_SIGN |
-                                               NTLMSSP_NEGOTIATE_SEAL);
-                               break;
-                       default:
-                               break;
-               }
-               /*
-                * 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;
-               }
+       TALLOC_CTX *mem_ctx = pkt;
+       struct gensec_security *gensec_security = NULL;
+        NTSTATUS status;
 
-               /* Generate the response blob we need for step 2 of the bind. */
-               *response = spnego_gen_auth_response(mem_ctx, &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(mem_ctx, NULL,
-                                       NT_STATUS_MORE_PROCESSING_REQUIRED,
-                                       OID_NTLMSSP);
+       status = auth_generic_server_authtype_start(p,
+                                                   auth_info->auth_type,
+                                                   auth_info->auth_level,
+                                                   &auth_info->credentials,
+                                                   response,
+                                                   p->remote_address,
+                                                   &gensec_security);
+       if (!NT_STATUS_IS_OK(status) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED))
+       {
+               DEBUG(0, (__location__ ": auth_generic_server_authtype_start[%u/%u] failed: %s\n",
+                         auth_info->auth_type, auth_info->auth_level, nt_errstr(status)));
+               return false;
        }
 
-       /* auth_pad_len will be handled by the caller */
-
-       p->auth.a_u.auth_ntlmssp_state = a;
-       p->auth.auth_data_free_func = &free_pipe_ntlmssp_auth_data;
-       p->auth.auth_type = DCERPC_AUTH_TYPE_SPNEGO;
-       p->auth.spnego_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
-
-       data_blob_free(&secblob);
-       data_blob_free(&chal);
-
-       /* We can't set pipe_bound True yet - we need an RPC_ALTER_CONTEXT response packet... */
-       return True;
-
- err:
-
-       data_blob_free(&secblob);
-       data_blob_free(&chal);
-
-       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(struct pipes_struct *p,
-                                          TALLOC_CTX *mem_ctx,
-                                          struct dcerpc_auth *pauth_info,
-                                          DATA_BLOB *response)
-{
-       DATA_BLOB auth_blob;
-       DATA_BLOB auth_reply;
-       struct auth_ntlmssp_state *a = p->auth.a_u.auth_ntlmssp_state;
+       /* Make sure data is bound to the memctx, to be freed the caller */
+       talloc_steal(mem_ctx, response->data);
 
-       ZERO_STRUCT(auth_blob);
-       ZERO_STRUCT(auth_reply);
+       p->auth.auth_ctx = gensec_security;
+       p->auth.auth_type = auth_info->auth_type;
 
-       /*
-        * NB. If we've negotiated down from krb5 to NTLMSSP we'll currently
-        * fail here as 'a' == NULL.
-        */
-       if (p->auth.auth_type != DCERPC_AUTH_TYPE_SPNEGO ||
-           p->auth.spnego_type != PIPE_AUTH_TYPE_SPNEGO_NTLMSSP || !a) {
-               DEBUG(0,("pipe_spnego_auth_bind_continue: not in NTLMSSP auth state.\n"));
-               goto err;
+       if (pkt->pfc_flags & DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN) {
+               p->auth.client_hdr_signing = true;
+               p->auth.hdr_signing = gensec_have_feature(gensec_security,
+                                               GENSEC_FEATURE_SIGN_PKT_HEADER);
        }
 
-       if (pauth_info->credentials.data[0] != ASN1_CONTEXT(1)) {
-               DEBUG(0,("pipe_spnego_auth_bind_continue: invalid SPNEGO blob type.\n"));
-               goto err;
+       if (p->auth.hdr_signing) {
+               gensec_want_feature(gensec_security,
+                                   GENSEC_FEATURE_SIGN_PKT_HEADER);
        }
 
-       if (!spnego_parse_auth(talloc_tos(), pauth_info->credentials, &auth_blob)) {
-               DEBUG(0,("pipe_spnego_auth_bind_continue: invalid SPNEGO blob.\n"));
-               goto err;
+       if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               return true;
        }
 
-       /*
-        * 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;
+       status = pipe_auth_verify_final(p);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("pipe_auth_verify_final failed: %s\n",
+                         nt_errstr(status)));
+               return false;
        }
 
-       data_blob_free(&auth_blob);
-
-       /* Generate the spnego "accept completed" blob - no incoming data. */
-       *response = spnego_gen_auth_response(mem_ctx, &auth_reply, NT_STATUS_OK, OID_NTLMSSP);
-
-       data_blob_free(&auth_reply);
-
-       p->pipe_bound = True;
-
-       return True;
-
- err:
-
-       data_blob_free(&auth_blob);
-       data_blob_free(&auth_reply);
-
-       free_pipe_auth_data(&p->auth);
-
-       return False;
+       return true;
 }
 
 /*******************************************************************
- Handle an schannel bind auth.
+ 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_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;
-       bool ret;
-       NTSTATUS status;
-       struct netlogon_creds_CredentialState *creds;
-       DATA_BLOB session_key;
-       enum ndr_err_code ndr_err;
-
-       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"));
-               return false;
-       }
-
-       if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_DEBUG(NL_AUTH_MESSAGE, &neg);
-       }
-
-       if (!(neg.Flags & NL_FLAG_OEM_NETBIOS_COMPUTER_NAME)) {
-               DEBUG(0,("pipe_schannel_auth_bind: Did not receive netbios computer name\n"));
-               return false;
-       }
-
-       /*
-        * The neg.oem_netbios_computer.a key here must match the remote computer name
-        * given in the DOM_CLNT_SRV.uni_comp_name used on all netlogon pipe
-        * operations that use credentials.
-        */
-
-       become_root();
-       status = schannel_get_creds_state(p, lp_private_dir(),
-                                           neg.oem_netbios_computer.a, &creds);
-       unbecome_root();
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("pipe_schannel_auth_bind: Attempt to bind using schannel without successful serverauth2\n"));
-               return False;
-       }
-
-       p->auth.a_u.schannel_auth = talloc(p, struct schannel_state);
-       if (!p->auth.a_u.schannel_auth) {
-               TALLOC_FREE(creds);
-               return False;
-       }
+static bool pipe_auth_generic_verify_final(TALLOC_CTX *mem_ctx,
+                               struct gensec_security *gensec_security,
+                               enum dcerpc_AuthLevel auth_level,
+                               struct auth_session_info **session_info)
+{
+       NTSTATUS status;
+       bool ret;
 
-       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;
+       DEBUG(5, (__location__ ": checking user details\n"));
 
-       /*
-        * JRA. Should we also copy the schannel session key into the pipe session key p->session_key
-        * here ? We do that for NTLMSSP, but the session key is already set up from the vuser
-        * struct of the person who opened the pipe. I need to test this further. JRA.
-        *
-        * VL. As we are mapping this to guest set the generic key
-        * "SystemLibraryDTC" key here. It's a bit difficult to test against
-        * W2k3, as it does not allow schannel binds against SAMR and LSA
-        * anymore.
-        */
+       /* 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. */
 
-       session_key = generic_session_key();
-       if (session_key.data == NULL) {
-               DEBUG(0, ("pipe_schannel_auth_bind: Could not alloc session"
-                         " key\n"));
+       status = auth_generic_server_check_flags(gensec_security,
+                                           (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 rpc connection\n"));
                return false;
        }
 
-       ret = server_info_set_session_key(p->server_info, session_key);
-
-       data_blob_free(&session_key);
+       TALLOC_FREE(*session_info);
 
-       if (!ret) {
-               DEBUG(0, ("server_info_set_session_key failed\n"));
+       status = auth_generic_server_get_user_info(gensec_security,
+                                               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;
        }
 
-       /*** SCHANNEL verifier ***/
-
-       reply.MessageType                       = NL_NEGOTIATE_RESPONSE;
-       reply.Flags                             = 0;
-       reply.Buffer.dummy                      = 5; /* ??? actually I don't think
-                                                     * this has any meaning
-                                                     * here - gd */
-
-       ndr_err = ndr_push_struct_blob(response, mem_ctx, &reply,
-                      (ndr_push_flags_fn_t)ndr_push_NL_AUTH_MESSAGE);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               DEBUG(0,("Failed to marshall NL_AUTH_MESSAGE.\n"));
+       if ((*session_info)->security_token == NULL) {
+               DEBUG(1, ("Auth module failed to provide nt_user_token\n"));
                return false;
        }
 
-       if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_DEBUG(NL_AUTH_MESSAGE, &reply);
+       if ((*session_info)->unix_token == NULL) {
+               DEBUG(1, ("Auth module failed to provide unix_token\n"));
+               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 = &free_pipe_schannel_auth_data;
-       p->auth.auth_type = DCERPC_AUTH_TYPE_SCHANNEL;
+       /*
+        * 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.
+        */
 
-       p->pipe_bound = True;
+       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;
+       return true;
 }
 
-/*******************************************************************
- Handle an NTLMSSP bind auth.
-*******************************************************************/
-
-static bool pipe_ntlmssp_auth_bind(struct pipes_struct *p,
-                                  TALLOC_CTX *mem_ctx,
-                                  struct dcerpc_auth *auth_info,
-                                  DATA_BLOB *response)
+static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p)
 {
-        NTSTATUS status;
-       struct auth_ntlmssp_state *a = NULL;
+       struct gensec_security *gensec_security;
+       bool ok;
 
-       if (strncmp((char *)auth_info->credentials.data, "NTLMSSP", 7) != 0) {
-               DEBUG(0, ("Failed to read NTLMSSP in blob\n"));
-                goto err;
-        }
-
-       /* We have an NTLMSSP blob. */
-       status = auth_ntlmssp_start(&a);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: auth_ntlmssp_start failed: %s\n",
-                       nt_errstr(status) ));
-               goto err;
+       if (p->auth.auth_type == DCERPC_AUTH_TYPE_NONE) {
+               p->pipe_bound = true;
+               return NT_STATUS_OK;
        }
 
-       /* Clear flags, then set them according to requested Auth Level */
-       auth_ntlmssp_and_flags(a, ~(NTLMSSP_NEGOTIATE_SIGN |
-                                       NTLMSSP_NEGOTIATE_SEAL));
-
-       switch (auth_info->auth_level) {
-       case DCERPC_AUTH_LEVEL_INTEGRITY:
-               auth_ntlmssp_or_flags(a, NTLMSSP_NEGOTIATE_SIGN);
-               break;
-       case DCERPC_AUTH_LEVEL_PRIVACY:
-               /* Privacy always implies both sign and seal for ntlmssp */
-               auth_ntlmssp_or_flags(a, NTLMSSP_NEGOTIATE_SIGN |
-                                        NTLMSSP_NEGOTIATE_SEAL);
-               break;
-       default:
-               break;
+       gensec_security = talloc_get_type(p->auth.auth_ctx,
+                                         struct gensec_security);
+       if (gensec_security == NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
        }
 
-       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;
+       ok = pipe_auth_generic_verify_final(p, gensec_security,
+                                           p->auth.auth_level,
+                                           &p->session_info);
+       if (!ok) {
+               return NT_STATUS_ACCESS_DENIED;
        }
 
-       /* Make sure data is bound to the memctx, to be freed the caller */
-       talloc_steal(mem_ctx, response->data);
-
-       p->auth.a_u.auth_ntlmssp_state = a;
-       p->auth.auth_data_free_func = &free_pipe_ntlmssp_auth_data;
-       p->auth.auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
-
-       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:
+       p->pipe_bound = true;
 
-       TALLOC_FREE(a);
-       return False;
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
  Respond to a pipe bind request.
 *******************************************************************/
 
-bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
+static bool api_pipe_bind_req(struct pipes_struct *p,
+                               struct ncacn_packet *pkt)
 {
        struct dcerpc_auth auth_info;
        uint16 assoc_gid;
        unsigned int auth_type = DCERPC_AUTH_TYPE_NONE;
        NTSTATUS status;
        struct ndr_syntax_id id;
+       uint8_t pfc_flags = 0;
        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;
+       const struct ndr_interface_table *table;
 
        /* No rebinds on a bound pipe - use alter context. */
        if (p->pipe_bound) {
-               DEBUG(2,("api_pipe_bind_req: rejecting bind request on bound "
-                        "pipe %s.\n",
-                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
+               DEBUG(2,("Rejecting bind request on bound rpc connection\n"));
                return setup_bind_nak(p, pkt);
        }
 
@@ -1068,39 +606,45 @@ bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
         * that this is a pipe name we support.
         */
        id = pkt->u.bind.ctx_list[0].abstract_syntax;
+
+       table = ndr_table_by_uuid(&id.uuid);
+       if (table == NULL) {
+               DEBUG(0,("unknown interface\n"));
+               return false;
+       }
+
        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)));
+               DEBUG(3, ("api_pipe_bind_req: %s -> %s rpc service\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(),
-                               &pkt->u.bind.ctx_list[0].abstract_syntax));
+                       "rpc", dcerpc_default_transport_endpoint(pkt,
+                               NCACN_NP, table));
 
                if (NT_STATUS_IS_ERR(status)) {
-                       DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in bind request.\n",
-                                get_pipe_name_from_syntax(
-                                       talloc_tos(),
-                                       &pkt->u.bind.ctx_list[0].abstract_syntax)));
+                       DEBUG(3,("api_pipe_bind_req: Unknown rpc service name "
+                                 "%s in bind request.\n",
+                                ndr_interface_name(&id.uuid,
+                                                   id.if_version)));
 
                        return setup_bind_nak(p, pkt);
                }
 
                if (rpc_srv_get_pipe_interface_by_cli_name(
-                               get_pipe_name_from_syntax(talloc_tos(),
-                                                         &p->syntax),
+                               dcerpc_default_transport_endpoint(pkt,
+                                       NCACN_NP, table),
                                &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)));
+                       DEBUG(3, ("api_pipe_bind_req: %s -> %s rpc service\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_syntax(talloc_tos(),
-                                                           &p->syntax),
-                                 get_pipe_name_from_syntax(talloc_tos(),
-                                                           &p->syntax)));
+                                 ndr_interface_name(&id.uuid,
+                                                    id.if_version),
+                                 ndr_interface_name(&id.uuid,
+                                                    id.if_version)));
                        return setup_bind_nak(p, pkt);
                }
        }
@@ -1129,14 +673,14 @@ bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
                        pkt->u.bind.ctx_list[0].context_id)) {
 
                bind_ack_ctx.result = 0;
-               bind_ack_ctx.reason = 0;
+               bind_ack_ctx.reason.value = 0;
                bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0];
        } else {
                p->pipe_bound = False;
                /* Rejection reason: abstract syntax not supported */
                bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT;
-               bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX;
-               bind_ack_ctx.syntax = null_ndr_syntax_id;
+               bind_ack_ctx.reason.value = DCERPC_BIND_REASON_ASYNTAX;
+               bind_ack_ctx.syntax = ndr_syntax_id_null;
        }
 
        /*
@@ -1177,6 +721,9 @@ bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
                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 ));
@@ -1184,34 +731,36 @@ bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
                }
 
                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;
+               case DCERPC_AUTH_TYPE_NONE:
                        break;
 
-               case DCERPC_AUTH_TYPE_SCHANNEL:
-                       if (!pipe_schannel_auth_bind(p, pkt,
-                                               &auth_info, &auth_resp)) {
+               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_SPNEGO:
-                       if (!pipe_spnego_auth_bind_negotiate(p, pkt,
-                                               &auth_info, &auth_resp)) {
+               default:
+                       if (!pipe_auth_generic_bind(p, pkt,
+                                                   &auth_info, &auth_resp)) {
                                goto err_exit;
                        }
                        break;
-
-               case DCERPC_AUTH_TYPE_NONE:
-                       break;
-
-               default:
-                       DEBUG(0, ("Unknown auth type %x requested.\n", auth_type));
-                       goto err_exit;
                }
        }
 
@@ -1219,7 +768,6 @@ bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
                /* Unauthenticated bind request. */
                /* We're finished - no more packets. */
                p->auth.auth_type = DCERPC_AUTH_TYPE_NONE;
-               p->auth.spnego_type = PIPE_AUTH_TYPE_SPNEGO_NONE;
                /* We must set the pipe auth_level here also. */
                p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE;
                p->pipe_bound = True;
@@ -1255,10 +803,15 @@ bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
         * header and are never sending more than one PDU here.
         */
 
+       pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
+
+       if (p->auth.hdr_signing) {
+               pfc_flags |= DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN;
+       }
+
        status = dcerpc_push_ncacn_packet(p->mem_ctx,
                                          DCERPC_PKT_BIND_ACK,
-                                         DCERPC_PFC_FLAG_FIRST |
-                                               DCERPC_PFC_FLAG_LAST,
+                                         pfc_flags,
                                          auth_resp.length,
                                          pkt->call_id,
                                          &u,
@@ -1314,12 +867,101 @@ bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
        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 gensec_security *gensec_security;
+       NTSTATUS status;
+
+       DEBUG(5, ("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
+
+       if (pkt->auth_length == 0) {
+               DEBUG(1, ("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(1,("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(1, ("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(1, ("Auth type mismatch! Client sent %d, "
+                         "but auth was started as type %d!\n",
+                         auth_info.auth_type, p->auth.auth_type));
+               goto err;
+       }
+
+       gensec_security = talloc_get_type(p->auth.auth_ctx,
+                                         struct gensec_security);
+
+       status = auth_generic_server_step(gensec_security,
+                                         pkt, &auth_info.credentials,
+                                         &response);
+
+       if (NT_STATUS_EQUAL(status,
+                           NT_STATUS_MORE_PROCESSING_REQUIRED) ||
+           response.length) {
+               DEBUG(1, (__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(2, ("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(2, ("Auth Verify failed (%s)\n", nt_errstr(status)));
+               goto err;
+       }
+
+       return true;
+
+err:
+
+       TALLOC_FREE(p->auth.auth_ctx);
+       return false;
+}
+
 /****************************************************************************
  Deal with an alter context call. Can be third part of 3 leg auth request for
  SPNEGO calls.
 ****************************************************************************/
 
-bool api_pipe_alter_context(struct pipes_struct *p, struct ncacn_packet *pkt)
+static bool api_pipe_alter_context(struct pipes_struct *p,
+                                       struct ncacn_packet *pkt)
 {
        struct dcerpc_auth auth_info;
        uint16 assoc_gid;
@@ -1329,6 +971,7 @@ bool api_pipe_alter_context(struct pipes_struct *p, struct ncacn_packet *pkt)
        DATA_BLOB auth_resp = data_blob_null;
        DATA_BLOB auth_blob = data_blob_null;
        int pad_len = 0;
+       struct gensec_security *gensec_security;
 
        DEBUG(5,("api_pipe_alter_context: make response. %d\n", __LINE__));
 
@@ -1354,14 +997,14 @@ bool api_pipe_alter_context(struct pipes_struct *p, struct ncacn_packet *pkt)
                        pkt->u.bind.ctx_list[0].context_id)) {
 
                bind_ack_ctx.result = 0;
-               bind_ack_ctx.reason = 0;
+               bind_ack_ctx.reason.value = 0;
                bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0];
        } else {
                p->pipe_bound = False;
                /* Rejection reason: abstract syntax not supported */
                bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT;
-               bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX;
-               bind_ack_ctx.syntax = null_ndr_syntax_id;
+               bind_ack_ctx.reason.value = DCERPC_BIND_REASON_ASYNTAX;
+               bind_ack_ctx.syntax = ndr_syntax_id_null;
        }
 
        /*
@@ -1389,23 +1032,41 @@ bool api_pipe_alter_context(struct pipes_struct *p, struct ncacn_packet *pkt)
                        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;
+               }
 
-               /*
-                * 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, pkt,
-                                               &auth_info, &auth_resp)) {
-                                       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;
+               }
 
-                       } else {
+               gensec_security = talloc_get_type(p->auth.auth_ctx,
+                                                 struct gensec_security);
+               status = auth_generic_server_step(gensec_security,
+                                                 pkt,
+                                                 &auth_info.credentials,
+                                                 &auth_resp);
+               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;
                }
        }
 
@@ -1513,95 +1174,101 @@ bool api_pipe_alter_context(struct pipes_struct *p, struct ncacn_packet *pkt)
        return setup_bind_nak(p, pkt);
 }
 
-/****************************************************************************
- Find the set of RPC functions associated with this context_id
-****************************************************************************/
+static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
+                      const struct api_struct *api_rpc_cmds, int n_cmds,
+                      const struct ndr_syntax_id *syntax);
 
-static PIPE_RPC_FNS* find_pipe_fns_by_context( PIPE_RPC_FNS *list, uint32 context_id )
+static bool srv_pipe_check_verification_trailer(struct pipes_struct *p,
+                                               struct ncacn_packet *pkt,
+                                               struct pipe_rpc_fns *pipe_fns)
 {
-       PIPE_RPC_FNS *fns = NULL;
-
-       if ( !list ) {
-               DEBUG(0,("find_pipe_fns_by_context: ERROR!  No context list for pipe!\n"));
-               return NULL;
-       }
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct dcerpc_sec_verification_trailer *vt = NULL;
+       const uint32_t bitmask1 =
+               p->auth.client_hdr_signing ? DCERPC_SEC_VT_CLIENT_SUPPORTS_HEADER_SIGNING : 0;
+       const struct dcerpc_sec_vt_pcontext pcontext = {
+               .abstract_syntax = pipe_fns->syntax,
+               .transfer_syntax = ndr_transfer_syntax_ndr,
+       };
+       const struct dcerpc_sec_vt_header2 header2 =
+              dcerpc_sec_vt_header2_from_ncacn_packet(pkt);
+       struct ndr_pull *ndr;
+       enum ndr_err_code ndr_err;
+       bool ret = false;
 
-       for (fns=list; fns; fns=fns->next ) {
-               if ( fns->context_id == context_id )
-                       return fns;
+       ndr = ndr_pull_init_blob(&p->in_data.data, frame);
+       if (ndr == NULL) {
+               goto done;
        }
-       return NULL;
-}
-
-/****************************************************************************
- 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;
+       ndr_err = ndr_pop_dcerpc_sec_verification_trailer(ndr, frame, &vt);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               goto done;
        }
 
-       return; 
+       ret = dcerpc_sec_verification_trailer_check(vt, &bitmask1,
+                                                   &pcontext, &header2);
+done:
+       TALLOC_FREE(frame);
+       return ret;
 }
 
-static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
-                      const struct api_struct *api_rpc_cmds, int n_cmds);
-
 /****************************************************************************
  Find the correct RPC function to call for this request.
  If the pipe is authenticated then become the correct UNIX user
  before doing the call.
 ****************************************************************************/
 
-bool api_pipe_request(struct pipes_struct *p, struct ncacn_packet *pkt)
+static bool api_pipe_request(struct pipes_struct *p,
+                               struct ncacn_packet *pkt)
 {
+       TALLOC_CTX *frame = talloc_stackframe();
        bool ret = False;
-       bool changed_user = False;
-       PIPE_RPC_FNS *pipe_fns;
-
-       if (p->pipe_bound &&
-           ((p->auth.auth_type == DCERPC_AUTH_TYPE_NTLMSSP) ||
-            ((p->auth.auth_type == DCERPC_AUTH_TYPE_SPNEGO) &&
-             (p->auth.spnego_type ==  PIPE_AUTH_TYPE_SPNEGO_NTLMSSP)))) {
-               if(!become_authenticated_pipe_user(p)) {
-                       data_blob_free(&p->out_data.rdata);
-                       return False;
-               }
-               changed_user = True;
-       }
+       struct pipe_rpc_fns *pipe_fns;
 
-       DEBUG(5, ("Requested \\PIPE\\%s\n",
-                 get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
+       if (!p->pipe_bound) {
+               DEBUG(1, ("Pipe not bound!\n"));
+               data_blob_free(&p->out_data.rdata);
+               TALLOC_FREE(frame);
+               return false;
+       }
 
        /* get the set of RPC functions for this context */
-
        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, pkt, pipe_fns->cmds, pipe_fns->n_cmds);
+       if (pipe_fns == NULL) {
+               DEBUG(0, ("No rpc function table associated with context "
+                         "[%d]\n",
+                         pkt->u.request.context_id));
+               data_blob_free(&p->out_data.rdata);
                TALLOC_FREE(frame);
+               return false;
        }
-       else {
-               DEBUG(0, ("No rpc function table associated with context "
-                         "[%d] on pipe [%s]\n",
-                         pkt->u.request.context_id,
-                         get_pipe_name_from_syntax(talloc_tos(),
-                                                   &p->syntax)));
+
+       if (!srv_pipe_check_verification_trailer(p, pkt, pipe_fns)) {
+               DEBUG(1, ("srv_pipe_check_verification_trailer: failed\n"));
+               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_ACCESS_DENIED));
+               data_blob_free(&p->out_data.rdata);
+               TALLOC_FREE(frame);
+               return true;
        }
 
-       if (changed_user) {
-               unbecome_authenticated_pipe_user();
+       if (!become_authenticated_pipe_user(p->session_info)) {
+               DEBUG(1, ("Failed to become pipe user!\n"));
+               data_blob_free(&p->out_data.rdata);
+               TALLOC_FREE(frame);
+               return false;
        }
 
+       DEBUG(5, ("Requested %s rpc service\n",
+                 ndr_interface_name(&pipe_fns->syntax.uuid,
+                                    pipe_fns->syntax.if_version)));
+
+       ret = api_rpcTNP(p, pkt, pipe_fns->cmds, pipe_fns->n_cmds,
+                        &pipe_fns->syntax);
+       unbecome_authenticated_pipe_user();
+
+       TALLOC_FREE(frame);
        return ret;
 }
 
@@ -1610,20 +1277,28 @@ bool api_pipe_request(struct pipes_struct *p, struct ncacn_packet *pkt)
  ********************************************************************/
 
 static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
-                      const struct api_struct *api_rpc_cmds, int n_cmds)
+                      const struct api_struct *api_rpc_cmds, int n_cmds,
+                      const struct ndr_syntax_id *syntax)
 {
        int fn_num;
        uint32_t offset1;
+       const struct ndr_interface_table *table;
 
        /* interpret the command */
        DEBUG(4,("api_rpcTNP: %s op 0x%x - ",
-                get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
+                ndr_interface_name(&syntax->uuid, syntax->if_version),
                 pkt->u.request.opnum));
 
+       table = ndr_table_by_uuid(&syntax->uuid);
+       if (table == NULL) {
+               DEBUG(0,("unknown interface\n"));
+               return false;
+       }
+
        if (DEBUGLEVEL >= 50) {
                fstring name;
                slprintf(name, sizeof(name)-1, "in_%s",
-                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
+                        dcerpc_default_transport_endpoint(pkt, NCACN_NP, table));
                dump_pdu_region(name, pkt->u.request.opnum,
                                &p->in_data.data, 0,
                                p->in_data.data.length);
@@ -1656,37 +1331,30 @@ static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
        /* do the actual command */
        if(!api_rpc_cmds[fn_num].fn(p)) {
                DEBUG(0,("api_rpcTNP: %s: %s failed.\n",
-                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
+                        ndr_interface_name(&syntax->uuid, syntax->if_version),
                         api_rpc_cmds[fn_num].name));
                data_blob_free(&p->out_data.rdata);
                return False;
        }
 
-       if (p->bad_handle_fault_state) {
-               DEBUG(4,("api_rpcTNP: bad handle fault return.\n"));
-               p->bad_handle_fault_state = False;
-               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_CONTEXT_MISMATCH));
-               return True;
-       }
-
-       if (p->rng_fault_state) {
-               DEBUG(4, ("api_rpcTNP: rng fault return\n"));
-               p->rng_fault_state = False;
-               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
-               return True;
+       if (p->fault_state) {
+               DEBUG(4,("api_rpcTNP: fault(%d) return.\n", p->fault_state));
+               setup_fault_pdu(p, NT_STATUS(p->fault_state));
+               p->fault_state = 0;
+               return true;
        }
 
        if (DEBUGLEVEL >= 50) {
                fstring name;
                slprintf(name, sizeof(name)-1, "out_%s",
-                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
+                        dcerpc_default_transport_endpoint(pkt, NCACN_NP, table));
                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",
-                get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
+                ndr_interface_name(&syntax->uuid, syntax->if_version)));
 
        /* Check for buffer underflow in rpc parsing */
        if ((DEBUGLEVEL >= 10) &&
@@ -1728,9 +1396,9 @@ void set_incoming_fault(struct pipes_struct *p)
        data_blob_free(&p->in_data.data);
        p->in_data.pdu_needed_len = 0;
        p->in_data.pdu.length = 0;
-       p->fault_state = True;
-       DEBUG(10, ("set_incoming_fault: Setting fault state on pipe %s\n",
-                  get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
+       p->fault_state = DCERPC_FAULT_CANT_PERFORM;
+
+       DEBUG(10, ("Setting fault state\n"));
 }
 
 static NTSTATUS dcesrv_auth_request(struct pipe_auth_data *auth,
@@ -1781,6 +1449,7 @@ static bool process_request_pdu(struct pipes_struct *p, struct ncacn_packet *pkt
 {
        NTSTATUS status;
        DATA_BLOB data;
+       struct dcerpc_sec_vt_header2 hdr2;
 
        if (!p->pipe_bound) {
                DEBUG(0,("process_request_pdu: rpc request with no bind.\n"));
@@ -1788,6 +1457,16 @@ static bool process_request_pdu(struct pipes_struct *p, struct ncacn_packet *pkt
                return False;
        }
 
+       hdr2 = dcerpc_sec_vt_header2_from_ncacn_packet(pkt);
+       if (pkt->pfc_flags & DCERPC_PFC_FLAG_FIRST) {
+               p->header2 = hdr2;
+       } else {
+               if (!dcerpc_sec_vt_header2_equal(&hdr2, &p->header2)) {
+                       set_incoming_fault(p);
+                       return false;
+               }
+       }
+
        /* Store the opnum */
        p->opnum = pkt->u.request.opnum;
 
@@ -1833,91 +1512,43 @@ static bool process_request_pdu(struct pipes_struct *p, struct ncacn_packet *pkt
                }
        }
 
-       if (pkt->pfc_flags & DCERPC_PFC_FLAG_LAST) {
-               bool ret = False;
-               /*
-                * Ok - we finally have a complete RPC stream.
-                * Call the rpc command to process it.
-                */
-
-               /*
-                * Process the complete data stream here.
-                */
-               if (pipe_init_outgoing_data(p)) {
-                       ret = api_pipe_request(p, pkt);
-               }
-
-               return ret;
+       if (!(pkt->pfc_flags & DCERPC_PFC_FLAG_LAST)) {
+               return true;
        }
 
-       return True;
-}
+       /*
+        * Ok - we finally have a complete RPC stream.
+        * Call the rpc command to process it.
+        */
 
-/****************************************************************************
- Processes a finished PDU stored in p->in_data.pdu.
-****************************************************************************/
+       return api_pipe_request(p, pkt);
+}
 
-void process_complete_pdu(struct pipes_struct *p)
+void process_complete_pdu(struct pipes_struct *p, struct ncacn_packet *pkt)
 {
-       struct ncacn_packet *pkt = NULL;
-       NTSTATUS status;
-       bool reply = False;
-
-       if(p->fault_state) {
-               DEBUG(10,("process_complete_pdu: pipe %s in fault state.\n",
-                         get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
-               goto done;
-       }
+       bool reply = false;
 
-       pkt = talloc(p->mem_ctx, struct ncacn_packet);
-       if (!pkt) {
-               DEBUG(0, ("Out of memory!\n"));
-               goto done;
-       }
+       /* Store the call_id */
+       p->call_id = pkt->call_id;
 
-       /*
-        * Ensure we're using the corrent endianness for both the
-        * RPC header flags and the raw data we will be reading from.
-        */
-       if (dcerpc_get_endian_flag(&p->in_data.pdu) & DCERPC_DREP_LE) {
-               p->endian = RPC_LITTLE_ENDIAN;
-       } else {
-               p->endian = RPC_BIG_ENDIAN;
-       }
-       DEBUG(10, ("PDU is in %s Endian format!\n", p->endian?"Big":"Little"));
+       DEBUG(10, ("Processing packet type %u\n", (unsigned int)pkt->ptype));
 
-       status = dcerpc_pull_ncacn_packet(pkt, &p->in_data.pdu,
-                                         pkt, p->endian);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("Failed to unmarshal rpc packet: %s!\n",
-                         nt_errstr(status)));
+       if (!pipe_init_outgoing_data(p)) {
                goto done;
        }
 
-       /* Store the call_id */
-       p->call_id = pkt->call_id;
-
-       DEBUG(10, ("Processing packet type %d\n", (int)pkt->ptype));
-
        switch (pkt->ptype) {
        case DCERPC_PKT_REQUEST:
                reply = process_request_pdu(p, pkt);
                break;
 
        case DCERPC_PKT_PING: /* CL request - ignore... */
-               DEBUG(0, ("process_complete_pdu: Error. "
-                         "Connectionless packet type %d received on "
-                         "pipe %s.\n", (int)pkt->ptype,
-                        get_pipe_name_from_syntax(talloc_tos(),
-                                                  &p->syntax)));
+               DEBUG(0, ("Error - Connectionless packet type %u received\n",
+                         (unsigned int)pkt->ptype));
                break;
 
        case DCERPC_PKT_RESPONSE: /* No responses here. */
-               DEBUG(0, ("process_complete_pdu: Error. "
-                         "DCERPC_PKT_RESPONSE received from client "
-                         "on pipe %s.\n",
-                        get_pipe_name_from_syntax(talloc_tos(),
-                                                  &p->syntax)));
+               DEBUG(0, ("Error - DCERPC_PKT_RESPONSE received from client"));
                break;
 
        case DCERPC_PKT_FAULT:
@@ -1930,30 +1561,22 @@ void process_complete_pdu(struct pipes_struct *p)
        case DCERPC_PKT_CL_CANCEL:
        case DCERPC_PKT_FACK:
        case DCERPC_PKT_CANCEL_ACK:
-               DEBUG(0, ("process_complete_pdu: Error. "
-                         "Connectionless packet type %u received on "
-                         "pipe %s.\n", (unsigned int)pkt->ptype,
-                        get_pipe_name_from_syntax(talloc_tos(),
-                                                  &p->syntax)));
+               DEBUG(0, ("Error - Connectionless packet type %u received\n",
+                         (unsigned int)pkt->ptype));
                break;
 
        case DCERPC_PKT_BIND:
                /*
                 * We assume that a pipe bind is only in one pdu.
                 */
-               if (pipe_init_outgoing_data(p)) {
-                       reply = api_pipe_bind_req(p, pkt);
-               }
+               reply = api_pipe_bind_req(p, pkt);
                break;
 
        case DCERPC_PKT_BIND_ACK:
        case DCERPC_PKT_BIND_NAK:
-               DEBUG(0, ("process_complete_pdu: Error. "
-                         "DCERPC_PKT_BINDACK/DCERPC_PKT_BINDNACK "
-                         "packet type %u received on pipe %s.\n",
-                         (unsigned int)pkt->ptype,
-                        get_pipe_name_from_syntax(talloc_tos(),
-                                                  &p->syntax)));
+               DEBUG(0, ("Error - DCERPC_PKT_BINDACK/DCERPC_PKT_BINDNACK "
+                         "packet type %u received.\n",
+                         (unsigned int)pkt->ptype));
                break;
 
 
@@ -1961,34 +1584,24 @@ void process_complete_pdu(struct pipes_struct *p)
                /*
                 * We assume that a pipe bind is only in one pdu.
                 */
-               if (pipe_init_outgoing_data(p)) {
-                       reply = api_pipe_alter_context(p, pkt);
-               }
+               reply = api_pipe_alter_context(p, pkt);
                break;
 
        case DCERPC_PKT_ALTER_RESP:
-               DEBUG(0, ("process_complete_pdu: Error. "
-                         "DCERPC_PKT_ALTER_RESP on pipe %s: "
-                         "Should only be server -> client.\n",
-                        get_pipe_name_from_syntax(talloc_tos(),
-                                                  &p->syntax)));
+               DEBUG(0, ("Error - DCERPC_PKT_ALTER_RESP received: "
+                         "Should only be server -> client.\n"));
                break;
 
        case DCERPC_PKT_AUTH3:
                /*
-                * The third packet in an NTLMSSP auth exchange.
+                * The third packet in an auth exchange.
                 */
-               if (pipe_init_outgoing_data(p)) {
-                       reply = api_pipe_bind_auth3(p, pkt);
-               }
+               reply = api_pipe_bind_auth3(p, pkt);
                break;
 
        case DCERPC_PKT_SHUTDOWN:
-               DEBUG(0, ("process_complete_pdu: Error. "
-                         "DCERPC_PKT_SHUTDOWN on pipe %s: "
-                         "Should only be server -> client.\n",
-                        get_pipe_name_from_syntax(talloc_tos(),
-                                                  &p->syntax)));
+               DEBUG(0, ("Error - DCERPC_PKT_SHUTDOWN received: "
+                         "Should only be server -> client.\n"));
                break;
 
        case DCERPC_PKT_CO_CANCEL:
@@ -2033,21 +1646,10 @@ void process_complete_pdu(struct pipes_struct *p)
 
 done:
        if (!reply) {
-               DEBUG(3,("process_complete_pdu: DCE/RPC fault sent on "
-                        "pipe %s\n", get_pipe_name_from_syntax(talloc_tos(),
-                                                               &p->syntax)));
+               DEBUG(3,("DCE/RPC fault sent!"));
                set_incoming_fault(p);
                setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
-               TALLOC_FREE(pkt);
-       } else {
-               /*
-                * Reset the lengths. We're ready for a new pdu.
-                */
-               TALLOC_FREE(p->in_data.pdu.data);
-               p->in_data.pdu_needed_len = 0;
-               p->in_data.pdu.length = 0;
        }
-
-       TALLOC_FREE(pkt);
+       /* pkt and p->in_data.pdu.data freed by caller */
 }