s3:libsmb: abstract the incoming dispatch function via a function pointer
[idra/samba.git] / source3 / rpc_server / srv_pipe.c
index 899073b9e471d1e66192f96de7223983ccc2cc2f..058f1b8b14fd6dc07d14a110c4b4ec193f7d8f00 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 "dcesrv_ntlmssp.h"
+#include "dcesrv_gssapi.h"
+#include "dcesrv_spnego.h"
 #include "rpc_server.h"
+#include "rpc_dce.h"
+#include "smbd/smbd.h"
+#include "auth.h"
+#include "ntdomain.h"
+#include "rpc_server/srv_pipe.h"
+#include "rpc_server/rpc_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
@@ -84,27 +92,9 @@ 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);
 }
 
 /*******************************************************************
@@ -205,7 +195,7 @@ static NTSTATUS create_next_packet(TALLOC_CTX *mem_ctx,
 
 bool create_next_pdu(struct pipes_struct *p)
 {
-       size_t pdu_size;
+       size_t pdu_size = 0;
        NTSTATUS status;
 
        /*
@@ -236,167 +226,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);
 
@@ -441,10 +270,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;
@@ -504,32 +332,41 @@ 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)));
+                get_pipe_name_from_syntax(talloc_tos(), abstract)));
 
        /* 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)));
+               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 */
 
@@ -585,210 +422,43 @@ bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax)
        return false;
 }
 
-/*******************************************************************
- 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.
 *******************************************************************/
 
-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_spnego_auth_bind(struct pipes_struct *p,
+                                 TALLOC_CTX *mem_ctx,
+                                 struct dcerpc_auth *auth_info,
+                                 DATA_BLOB *response)
 {
-       DATA_BLOB secblob;
-       DATA_BLOB chal;
-       char *OIDs[ASN1_MAX_OIDS];
-        int i;
+       struct spnego_context *spnego_ctx;
        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;
-               }
-
-               /* 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 = spnego_server_auth_start(p,
+                                         (auth_info->auth_level ==
+                                               DCERPC_AUTH_LEVEL_INTEGRITY),
+                                         (auth_info->auth_level ==
+                                               DCERPC_AUTH_LEVEL_PRIVACY),
+                                         true,
+                                         &auth_info->credentials,
+                                         response,
+                                         p->remote_address,
+                                         &spnego_ctx);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed SPNEGO negotiate (%s)\n",
+                         nt_errstr(status)));
+               return false;
        }
 
-       /* auth_pad_len will be handled by the caller */
+       /* 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_ctx = spnego_ctx;
        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;
-}
+       DEBUG(10, ("SPNEGO auth started\n"));
 
-/*******************************************************************
- 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;
-
-       ZERO_STRUCT(auth_blob);
-       ZERO_STRUCT(auth_reply);
-
-       /*
-        * 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 (pauth_info->credentials.data[0] != ASN1_CONTEXT(1)) {
-               DEBUG(0,("pipe_spnego_auth_bind_continue: invalid SPNEGO blob type.\n"));
-               goto err;
-       }
-
-       if (!spnego_parse_auth(talloc_tos(), pauth_info->credentials, &auth_blob)) {
-               DEBUG(0,("pipe_spnego_auth_bind_continue: invalid SPNEGO blob.\n"));
-               goto err;
-       }
-
-       /*
-        * The following call actually checks the challenge/response data.
-        * for correctness against the given DOMAIN\user name.
-        */
-
-       if (!pipe_ntlmssp_verify_final(p, &auth_blob)) {
-               goto err;
-       }
-
-       data_blob_free(&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;
 }
 
 /*******************************************************************
@@ -805,8 +475,8 @@ static bool pipe_schannel_auth_bind(struct pipes_struct *p,
        bool ret;
        NTSTATUS status;
        struct netlogon_creds_CredentialState *creds;
-       DATA_BLOB session_key;
        enum ndr_err_code ndr_err;
+       struct schannel_state *schannel_auth;
 
        ndr_err = ndr_pull_struct_blob(
                        &auth_info->credentials, mem_ctx, &neg,
@@ -841,16 +511,16 @@ static bool pipe_schannel_auth_bind(struct pipes_struct *p,
                return False;
        }
 
-       p->auth.a_u.schannel_auth = talloc(p, struct schannel_state);
-       if (!p->auth.a_u.schannel_auth) {
+       schannel_auth = talloc(p, struct schannel_state);
+       if (!schannel_auth) {
                TALLOC_FREE(creds);
                return False;
        }
 
-       p->auth.a_u.schannel_auth->state = SCHANNEL_STATE_START;
-       p->auth.a_u.schannel_auth->seq_num = 0;
-       p->auth.a_u.schannel_auth->initiator = false;
-       p->auth.a_u.schannel_auth->creds = creds;
+       schannel_auth->state = SCHANNEL_STATE_START;
+       schannel_auth->seq_num = 0;
+       schannel_auth->initiator = false;
+       schannel_auth->creds = creds;
 
        /*
         * JRA. Should we also copy the schannel session key into the pipe session key p->session_key
@@ -863,19 +533,10 @@ static bool pipe_schannel_auth_bind(struct pipes_struct *p,
         * anymore.
         */
 
-       session_key = generic_session_key();
-       if (session_key.data == NULL) {
-               DEBUG(0, ("pipe_schannel_auth_bind: Could not alloc session"
-                         " key\n"));
-               return false;
-       }
-
-       ret = server_info_set_session_key(p->server_info, session_key);
-
-       data_blob_free(&session_key);
+       ret = session_info_set_session_key(p->session_info, generic_session_key());
 
        if (!ret) {
-               DEBUG(0, ("server_info_set_session_key failed\n"));
+               DEBUG(0, ("session_info_set_session_key failed\n"));
                return false;
        }
 
@@ -902,7 +563,7 @@ static bool pipe_schannel_auth_bind(struct pipes_struct *p,
                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_ctx = schannel_auth;
        p->auth.auth_type = DCERPC_AUTH_TYPE_SCHANNEL;
 
        p->pipe_bound = True;
@@ -919,69 +580,272 @@ static bool pipe_ntlmssp_auth_bind(struct pipes_struct *p,
                                   struct dcerpc_auth *auth_info,
                                   DATA_BLOB *response)
 {
+       struct auth_ntlmssp_state *ntlmssp_state = NULL;
         NTSTATUS status;
-       struct auth_ntlmssp_state *a = NULL;
 
        if (strncmp((char *)auth_info->credentials.data, "NTLMSSP", 7) != 0) {
                DEBUG(0, ("Failed to read NTLMSSP in blob\n"));
-                goto err;
+                return false;
         }
 
        /* We have an NTLMSSP blob. */
-       status = auth_ntlmssp_start(&a);
+       status = ntlmssp_server_auth_start(p,
+                                          (auth_info->auth_level ==
+                                               DCERPC_AUTH_LEVEL_INTEGRITY),
+                                          (auth_info->auth_level ==
+                                               DCERPC_AUTH_LEVEL_PRIVACY),
+                                          true,
+                                          &auth_info->credentials,
+                                          response,
+                                          p->remote_address,
+                                          &ntlmssp_state);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_OK)) {
+               DEBUG(0, (__location__ ": auth_ntlmssp_start failed: %s\n",
+                         nt_errstr(status)));
+               return false;
+       }
+
+       /* Make sure data is bound to the memctx, to be freed the caller */
+       talloc_steal(mem_ctx, response->data);
+
+       p->auth.auth_ctx = ntlmssp_state;
+       p->auth.auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
+
+       DEBUG(10, (__location__ ": NTLMSSP auth started\n"));
+
+       return true;
+}
+
+/*******************************************************************
+ Process an NTLMSSP authentication response.
+ If this function succeeds, the user has been authenticated
+ and their domain, name and calling workstation stored in
+ the pipe struct.
+*******************************************************************/
+
+static bool pipe_ntlmssp_verify_final(TALLOC_CTX *mem_ctx,
+                               struct auth_ntlmssp_state *ntlmssp_ctx,
+                               enum dcerpc_AuthLevel auth_level,
+                               struct auth_session_info **session_info)
+{
+       NTSTATUS status;
+       bool ret;
+
+       DEBUG(5, (__location__ ": checking user details\n"));
+
+       /* Finally - if the pipe negotiated integrity (sign) or privacy (seal)
+          ensure the underlying NTLMSSP flags are also set. If not we should
+          refuse the bind. */
+
+       status = ntlmssp_server_check_flags(ntlmssp_ctx,
+                                           (auth_level ==
+                                               DCERPC_AUTH_LEVEL_INTEGRITY),
+                                           (auth_level ==
+                                               DCERPC_AUTH_LEVEL_PRIVACY));
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("pipe_ntlmssp_auth_bind: auth_ntlmssp_start failed: %s\n",
-                       nt_errstr(status) ));
-               goto err;
+               DEBUG(0, (__location__ ": Client failed to negotatie proper "
+                         "security for rpc connection\n"));
+               return false;
        }
 
-       /* Clear flags, then set them according to requested Auth Level */
-       auth_ntlmssp_and_flags(a, ~(NTLMSSP_NEGOTIATE_SIGN |
-                                       NTLMSSP_NEGOTIATE_SEAL));
+       TALLOC_FREE(*session_info);
 
-       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;
+       status = ntlmssp_server_get_user_info(ntlmssp_ctx,
+                                               mem_ctx, session_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, (__location__ ": failed to obtain the server info "
+                         "for authenticated user: %s\n", nt_errstr(status)));
+               return false;
+       }
+
+       if ((*session_info)->security_token == NULL) {
+               DEBUG(1, ("Auth module failed to provide nt_user_token\n"));
+               return false;
+       }
+
+       /*
+        * We're an authenticated bind over smb, so the session key needs to
+        * be set to "SystemLibraryDTC". Weird, but this is what Windows
+        * does. See the RPC-SAMBA3SESSIONKEY.
+        */
+
+       ret = session_info_set_session_key((*session_info), generic_session_key());
+       if (!ret) {
+               DEBUG(0, ("Failed to set session key!\n"));
+               return false;
        }
 
-       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) ));
+       return true;
+}
+
+/*******************************************************************
+ Handle a GSSAPI bind auth.
+*******************************************************************/
+
+static bool pipe_gssapi_auth_bind(struct pipes_struct *p,
+                                 TALLOC_CTX *mem_ctx,
+                                 struct dcerpc_auth *auth_info,
+                                 DATA_BLOB *response)
+{
+        NTSTATUS status;
+       struct gse_context *gse_ctx = NULL;
+
+       status = gssapi_server_auth_start(p,
+                                         (auth_info->auth_level ==
+                                               DCERPC_AUTH_LEVEL_INTEGRITY),
+                                         (auth_info->auth_level ==
+                                               DCERPC_AUTH_LEVEL_PRIVACY),
+                                         true,
+                                         &auth_info->credentials,
+                                         response,
+                                         &gse_ctx);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed to init dcerpc gssapi server (%s)\n",
+                         nt_errstr(status)));
                goto err;
        }
 
        /* 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;
+       p->auth.auth_ctx = gse_ctx;
+       p->auth.auth_type = DCERPC_AUTH_TYPE_KRB5;
 
-       DEBUG(10,("pipe_ntlmssp_auth_bind: NTLMSSP auth started\n"));
+       DEBUG(10, ("KRB5 auth started\n"));
 
-       /* We can't set pipe_bound True yet - we need an DCERPC_PKT_AUTH3 response packet... */
-       return True;
+       return true;
 
-  err:
+err:
+       TALLOC_FREE(gse_ctx);
+       return false;
+}
+
+static NTSTATUS pipe_gssapi_verify_final(TALLOC_CTX *mem_ctx,
+                                        struct gse_context *gse_ctx,
+                                        const struct tsocket_address *remote_address,
+                                        struct auth_session_info **session_info)
+{
+       NTSTATUS status;
+       bool bret;
+
+       /* Finally - if the pipe negotiated integrity (sign) or privacy (seal)
+          ensure the underlying flags are also set. If not we should
+          refuse the bind. */
 
-       TALLOC_FREE(a);
-       return False;
+       status = gssapi_server_check_flags(gse_ctx);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Requested Security Layers not honored!\n"));
+               return status;
+       }
+
+       status = gssapi_server_get_user_info(gse_ctx, mem_ctx,
+                                            remote_address, session_info);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, (__location__ ": failed to obtain the server info "
+                         "for authenticated user: %s\n", nt_errstr(status)));
+               return status;
+       }
+
+       /*
+        * We're an authenticated bind over smb, so the session key needs to
+        * be set to "SystemLibraryDTC". Weird, but this is what Windows
+        * does. See the RPC-SAMBA3SESSIONKEY.
+        */
+
+       bret = session_info_set_session_key((*session_info), generic_session_key());
+       if (!bret) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p)
+{
+       enum spnego_mech auth_type;
+       struct auth_ntlmssp_state *ntlmssp_ctx;
+       struct spnego_context *spnego_ctx;
+       struct gse_context *gse_ctx;
+       void *mech_ctx;
+       NTSTATUS status;
+
+       switch (p->auth.auth_type) {
+       case DCERPC_AUTH_TYPE_NTLMSSP:
+               ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                   struct auth_ntlmssp_state);
+               if (!pipe_ntlmssp_verify_final(p, ntlmssp_ctx,
+                                               p->auth.auth_level,
+                                               &p->session_info)) {
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+               break;
+       case DCERPC_AUTH_TYPE_KRB5:
+               gse_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                               struct gse_context);
+               status = pipe_gssapi_verify_final(p, gse_ctx,
+                                                 p->remote_address,
+                                                 &p->session_info);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(1, ("gssapi bind failed with: %s",
+                                 nt_errstr(status)));
+                       return status;
+               }
+               break;
+       case DCERPC_AUTH_TYPE_SPNEGO:
+               spnego_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                  struct spnego_context);
+               status = spnego_get_negotiated_mech(spnego_ctx,
+                                                   &auth_type, &mech_ctx);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("Bad SPNEGO state (%s)\n",
+                                 nt_errstr(status)));
+                       return status;
+               }
+               switch(auth_type) {
+               case SPNEGO_KRB5:
+                       gse_ctx = talloc_get_type_abort(mech_ctx,
+                                                       struct gse_context);
+                       status = pipe_gssapi_verify_final(p, gse_ctx,
+                                                         p->remote_address,
+                                                         &p->session_info);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               DEBUG(1, ("gssapi bind failed with: %s",
+                                         nt_errstr(status)));
+                               return status;
+                       }
+                       break;
+               case SPNEGO_NTLMSSP:
+                       ntlmssp_ctx = talloc_get_type_abort(mech_ctx,
+                                               struct auth_ntlmssp_state);
+                       if (!pipe_ntlmssp_verify_final(p, ntlmssp_ctx,
+                                                       p->auth.auth_level,
+                                                       &p->session_info)) {
+                               return NT_STATUS_ACCESS_DENIED;
+                       }
+                       break;
+               default:
+                       DEBUG(0, (__location__ ": incorrect spnego type "
+                                 "(%d).\n", auth_type));
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+               break;
+       default:
+               DEBUG(0, (__location__ ": incorrect auth type (%u).\n",
+                         (unsigned int)p->auth.auth_type));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       p->pipe_bound = true;
+
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
  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;
@@ -995,9 +859,7 @@ bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
 
        /* 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);
        }
 
@@ -1012,38 +874,35 @@ bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
         */
        id = pkt->u.bind.ctx_list[0].abstract_syntax;
        if (rpc_srv_pipe_exists_by_id(&id)) {
-               DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
-                       rpc_srv_get_pipe_cli_name(&id),
-                       rpc_srv_get_pipe_srv_name(&id)));
+               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));
+                               &id));
 
                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",
+                                get_pipe_name_from_syntax(talloc_tos(), &id)));
 
                        return setup_bind_nak(p, pkt);
                }
 
                if (rpc_srv_get_pipe_interface_by_cli_name(
                                get_pipe_name_from_syntax(talloc_tos(),
-                                                         &p->syntax),
+                                                         &id),
                                &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)));
+                                 get_pipe_name_from_syntax(talloc_tos(), &id),
+                                 get_pipe_name_from_syntax(talloc_tos(), &id)));
                        return setup_bind_nak(p, pkt);
                }
        }
@@ -1120,6 +979,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 ));
@@ -1143,12 +1005,40 @@ bool api_pipe_bind_req(struct pipes_struct *p, struct ncacn_packet *pkt)
                        break;
 
                case DCERPC_AUTH_TYPE_SPNEGO:
-                       if (!pipe_spnego_auth_bind_negotiate(p, pkt,
+                       if (!pipe_spnego_auth_bind(p, pkt,
+                                               &auth_info, &auth_resp)) {
+                               goto err_exit;
+                       }
+                       break;
+
+               case DCERPC_AUTH_TYPE_KRB5:
+                       if (!pipe_gssapi_auth_bind(p, pkt,
                                                &auth_info, &auth_resp)) {
                                goto err_exit;
                        }
                        break;
 
+               case DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM:
+                       if (p->transport == NCALRPC && p->ncalrpc_as_system) {
+                               TALLOC_FREE(p->session_info);
+
+                               status = make_session_info_system(p,
+                                                                 &p->session_info);
+                               if (!NT_STATUS_IS_OK(status)) {
+                                       goto err_exit;
+                               }
+
+                               auth_resp = data_blob_talloc(pkt,
+                                                            "NCALRPC_AUTH_OK",
+                                                            15);
+
+                               p->auth.auth_type = DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM;
+                               p->pipe_bound = true;
+                       } else {
+                               goto err_exit;
+                       }
+                       break;
+
                case DCERPC_AUTH_TYPE_NONE:
                        break;
 
@@ -1162,7 +1052,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;
@@ -1257,12 +1146,124 @@ 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 auth_ntlmssp_state *ntlmssp_ctx;
+       struct spnego_context *spnego_ctx;
+       struct gse_context *gse_ctx;
+       NTSTATUS status;
+
+       DEBUG(5, ("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
+
+       if (pkt->auth_length == 0) {
+               DEBUG(0, ("No auth field sent for bind request!\n"));
+               goto err;
+       }
+
+       /* Ensure there's enough data for an authenticated request. */
+       if (pkt->frag_length < RPC_HEADER_LEN
+                               + DCERPC_AUTH_TRAILER_LENGTH
+                               + pkt->auth_length) {
+                       DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_len "
+                               "%u is too large.\n",
+                        (unsigned int)pkt->auth_length));
+               goto err;
+       }
+
+       /*
+        * Decode the authentication verifier response.
+        */
+
+       status = dcerpc_pull_dcerpc_auth(pkt,
+                                        &pkt->u.auth3.auth_info,
+                                        &auth_info, p->endian);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Failed to unmarshall dcerpc_auth.\n"));
+               goto err;
+       }
+
+       /* We must NEVER look at auth_info->auth_pad_len here,
+        * as old Samba client code gets it wrong and sends it
+        * as zero. JRA.
+        */
+
+       if (auth_info.auth_type != p->auth.auth_type) {
+               DEBUG(0, ("Auth type mismatch! Client sent %d, "
+                         "but auth was started as type %d!\n",
+                         auth_info.auth_type, p->auth.auth_type));
+               goto err;
+       }
+
+       switch (auth_info.auth_type) {
+       case DCERPC_AUTH_TYPE_NTLMSSP:
+               ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                   struct auth_ntlmssp_state);
+               status = ntlmssp_server_step(ntlmssp_ctx,
+                                            pkt, &auth_info.credentials,
+                                            &response);
+               break;
+       case DCERPC_AUTH_TYPE_KRB5:
+               gse_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                               struct gse_context);
+               status = gssapi_server_step(gse_ctx,
+                                           pkt, &auth_info.credentials,
+                                           &response);
+               break;
+       case DCERPC_AUTH_TYPE_SPNEGO:
+               spnego_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                  struct spnego_context);
+               status = spnego_server_step(spnego_ctx,
+                                           pkt, &auth_info.credentials,
+                                           &response);
+               break;
+       default:
+               DEBUG(0, (__location__ ": incorrect auth type (%u).\n",
+                         (unsigned int)auth_info.auth_type));
+               return false;
+       }
+
+       if (NT_STATUS_EQUAL(status,
+                           NT_STATUS_MORE_PROCESSING_REQUIRED) ||
+           response.length) {
+               DEBUG(0, (__location__ ": This was supposed to be the final "
+                         "leg, but crypto machinery claims a response is "
+                         "needed, aborting auth!\n"));
+               data_blob_free(&response);
+               goto err;
+       }
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Auth failed (%s)\n", nt_errstr(status)));
+               goto err;
+       }
+
+       /* Now verify auth was indeed successful and extract server info */
+       status = pipe_auth_verify_final(p);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Auth Verify failed (%s)\n", nt_errstr(status)));
+               goto err;
+       }
+
+       return true;
+
+err:
+
+       TALLOC_FREE(p->auth.auth_ctx);
+       return false;
+}
+
 /****************************************************************************
  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;
@@ -1272,6 +1273,9 @@ 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 auth_ntlmssp_state *ntlmssp_ctx;
+       struct spnego_context *spnego_ctx;
+       struct gse_context *gse_ctx;
 
        DEBUG(5,("api_pipe_alter_context: make response. %d\n", __LINE__));
 
@@ -1332,23 +1336,70 @@ 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 != 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;
+               }
 
-               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;
-                               }
 
-                       } else {
+               switch (auth_info.auth_type) {
+               case DCERPC_AUTH_TYPE_SPNEGO:
+                       spnego_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                       struct spnego_context);
+                       status = spnego_server_step(spnego_ctx,
+                                                   pkt,
+                                                   &auth_info.credentials,
+                                                   &auth_resp);
+                       break;
+
+               case DCERPC_AUTH_TYPE_KRB5:
+                       gse_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                       struct gse_context);
+                       status = gssapi_server_step(gse_ctx,
+                                                   pkt,
+                                                   &auth_info.credentials,
+                                                   &auth_resp);
+                       break;
+               case DCERPC_AUTH_TYPE_NTLMSSP:
+                       ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+                                                   struct auth_ntlmssp_state);
+                       status = ntlmssp_server_step(ntlmssp_ctx,
+                                                    pkt,
+                                                    &auth_info.credentials,
+                                                    &auth_resp);
+                       break;
+
+               default:
+                       DEBUG(3, (__location__ ": Usupported auth type (%d) "
+                                 "in alter-context call\n",
+                                 auth_info.auth_type));
+                       goto err_exit;
+               }
+
+               if (NT_STATUS_IS_OK(status)) {
+                       /* third leg of auth, verify auth info */
+                       status = pipe_auth_verify_final(p);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               DEBUG(0, ("Auth Verify failed (%s)\n",
+                                         nt_errstr(status)));
                                goto err_exit;
                        }
+               } else if (NT_STATUS_EQUAL(status,
+                                       NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+                       DEBUG(10, ("More auth legs required.\n"));
+               } else {
+                       DEBUG(0, ("Auth step returned an error (%s)\n",
+                                 nt_errstr(status)));
+                       goto err_exit;
                }
        }
 
@@ -1456,46 +1507,9 @@ 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 PIPE_RPC_FNS* find_pipe_fns_by_context( PIPE_RPC_FNS *list, uint32 context_id )
-{
-       PIPE_RPC_FNS *fns = NULL;
-
-       if ( !list ) {
-               DEBUG(0,("find_pipe_fns_by_context: ERROR!  No context list for pipe!\n"));
-               return NULL;
-       }
-
-       for (fns=list; fns; fns=fns->next ) {
-               if ( fns->context_id == context_id )
-                       return fns;
-       }
-       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;
-       }
-
-       return; 
-}
-
 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);
 
 /****************************************************************************
  Find the correct RPC function to call for this request.
@@ -1503,26 +1517,24 @@ static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
  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)
 {
        bool ret = False;
        bool changed_user = False;
-       PIPE_RPC_FNS *pipe_fns;
+       struct 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)) {
+            (p->auth.auth_type == DCERPC_AUTH_TYPE_KRB5) ||
+            (p->auth.auth_type == DCERPC_AUTH_TYPE_SPNEGO))) {
+               if(!become_authenticated_pipe_user(p->session_info)) {
                        data_blob_free(&p->out_data.rdata);
                        return False;
                }
                changed_user = True;
        }
 
-       DEBUG(5, ("Requested \\PIPE\\%s\n",
-                 get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
-
        /* get the set of RPC functions for this context */
 
        pipe_fns = find_pipe_fns_by_context(p->contexts,
@@ -1530,15 +1542,19 @@ bool api_pipe_request(struct pipes_struct *p, struct ncacn_packet *pkt)
 
        if ( pipe_fns ) {
                TALLOC_CTX *frame = talloc_stackframe();
-               ret = api_rpcTNP(p, pkt, pipe_fns->cmds, pipe_fns->n_cmds);
+
+               DEBUG(5, ("Requested %s rpc service\n",
+                         get_pipe_name_from_syntax(talloc_tos(), &pipe_fns->syntax)));
+
+               ret = api_rpcTNP(p, pkt, pipe_fns->cmds, pipe_fns->n_cmds,
+                                &pipe_fns->syntax);
+
                TALLOC_FREE(frame);
        }
        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)));
+                         "[%d]\n",
+                         pkt->u.request.context_id));
        }
 
        if (changed_user) {
@@ -1553,20 +1569,21 @@ 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;
 
        /* interpret the command */
        DEBUG(4,("api_rpcTNP: %s op 0x%x - ",
-                get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
+                get_pipe_name_from_syntax(talloc_tos(), syntax),
                 pkt->u.request.opnum));
 
        if (DEBUGLEVEL >= 50) {
                fstring name;
                slprintf(name, sizeof(name)-1, "in_%s",
-                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
+                        get_pipe_name_from_syntax(talloc_tos(), syntax));
                dump_pdu_region(name, pkt->u.request.opnum,
                                &p->in_data.data, 0,
                                p->in_data.data.length);
@@ -1599,7 +1616,7 @@ 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),
+                        get_pipe_name_from_syntax(talloc_tos(), syntax),
                         api_rpc_cmds[fn_num].name));
                data_blob_free(&p->out_data.rdata);
                return False;
@@ -1622,14 +1639,14 @@ static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
        if (DEBUGLEVEL >= 50) {
                fstring name;
                slprintf(name, sizeof(name)-1, "out_%s",
-                        get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
+                        get_pipe_name_from_syntax(talloc_tos(), syntax));
                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)));
+                get_pipe_name_from_syntax(talloc_tos(), syntax)));
 
        /* Check for buffer underflow in rpc parsing */
        if ((DEBUGLEVEL >= 10) &&
@@ -1672,8 +1689,8 @@ void set_incoming_fault(struct pipes_struct *p)
        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)));
+
+       DEBUG(10, ("Setting fault state\n"));
 }
 
 static NTSTATUS dcesrv_auth_request(struct pipe_auth_data *auth,
@@ -1807,8 +1824,7 @@ void process_complete_pdu(struct pipes_struct *p)
        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)));
+               DEBUG(10,("RPC connection in fault state.\n"));
                goto done;
        }
 
@@ -1840,7 +1856,7 @@ void process_complete_pdu(struct pipes_struct *p)
        /* Store the call_id */
        p->call_id = pkt->call_id;
 
-       DEBUG(10, ("Processing packet type %d\n", (int)pkt->ptype));
+       DEBUG(10, ("Processing packet type %u\n", (unsigned int)pkt->ptype));
 
        switch (pkt->ptype) {
        case DCERPC_PKT_REQUEST:
@@ -1848,19 +1864,12 @@ void process_complete_pdu(struct pipes_struct *p)
                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:
@@ -1873,11 +1882,8 @@ 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:
@@ -1891,12 +1897,9 @@ void process_complete_pdu(struct pipes_struct *p)
 
        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;
 
 
@@ -1910,16 +1913,13 @@ void process_complete_pdu(struct pipes_struct *p)
                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);
@@ -1927,11 +1927,8 @@ void process_complete_pdu(struct pipes_struct *p)
                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:
@@ -1976,9 +1973,7 @@ 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);