First round of merging various UUID structures.
[samba.git] / source / rpc_server / srv_pipe.c
index 06743d8d163a1f7869c872842a1ab2157fe5f9db..7bbe726f5ae04495c272ae2cbec4f2c14666d0a6 100644 (file)
@@ -1,12 +1,11 @@
-#define OLD_NTDOMAIN 1
 /* 
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
+ *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-1998
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-1998,
- *  Copyright (C) Paul Ashton                  1997-1998.
- *  Copyright (C) Jeremy Allison                    1999.
+ *  Copyright (C) Paul Ashton                  1997-1998,
+ *  Copyright (C) Jeremy Allison                    1999,
+ *  Copyright (C) Jim McDonough <jmcd@us.ibm.com>   2003.
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_SRV
+
+/*************************************************************
+ HACK Alert!
+ We need to transfer the session key from one rpc bind to the
+ next. This is the way the netlogon schannel works.
+**************************************************************/
+struct dcinfo last_dcinfo;
 
 static void NTLMSSPcalc_p( pipes_struct *p, unsigned char *data, int len)
 {
@@ -78,14 +85,12 @@ static void NTLMSSPcalc_p( pipes_struct *p, unsigned char *data, int len)
 BOOL create_next_pdu(pipes_struct *p)
 {
        RPC_HDR_RESP hdr_resp;
-       BOOL auth_verify = IS_BITS_SET_ALL(p->ntlmssp_chal_flags, NTLMSSP_NEGOTIATE_SIGN);
-       BOOL auth_seal   = IS_BITS_SET_ALL(p->ntlmssp_chal_flags, NTLMSSP_NEGOTIATE_SEAL);
+       BOOL auth_verify = ((p->ntlmssp_chal_flags & NTLMSSP_NEGOTIATE_SIGN) != 0);
+       BOOL auth_seal   = ((p->ntlmssp_chal_flags & NTLMSSP_NEGOTIATE_SEAL) != 0);
        uint32 data_len;
        uint32 data_space_available;
        uint32 data_len_left;
        prs_struct outgoing_pdu;
-       char *data;
-       char *data_from;
        uint32 data_pos;
 
        /*
@@ -94,7 +99,7 @@ BOOL create_next_pdu(pipes_struct *p)
         */
 
        if(p->fault_state) {
-               setup_fault_pdu(p);
+               setup_fault_pdu(p, NT_STATUS(0x1c010002));
                return True;
        }
 
@@ -117,6 +122,9 @@ BOOL create_next_pdu(pipes_struct *p)
        if(p->ntlmssp_auth_validated)
                data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NTLMSSP_CHK_LEN);
 
+       if(p->netsec_auth_validated)
+               data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_CHK_LEN);
+
        /*
         * The amount we send is the minimum of the available
         * space and the amount left to send.
@@ -150,6 +158,10 @@ BOOL create_next_pdu(pipes_struct *p)
                p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len +
                                        RPC_HDR_AUTH_LEN + RPC_AUTH_NTLMSSP_CHK_LEN;
                p->hdr.auth_len = RPC_AUTH_NTLMSSP_CHK_LEN;
+       } else if (p->netsec_auth_validated) {
+               p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len +
+                       RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_CHK_LEN;
+               p->hdr.auth_len = RPC_AUTH_NETSEC_CHK_LEN;
        } else {
                p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len;
                p->hdr.auth_len = 0;
@@ -167,17 +179,19 @@ BOOL create_next_pdu(pipes_struct *p)
         * data.
         */
 
-       prs_init( &outgoing_pdu, 0, 4, MARSHALL);
+       prs_init( &outgoing_pdu, 0, p->mem_ctx, MARSHALL);
        prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
 
        /* Store the header in the data stream. */
        if(!smb_io_rpc_hdr("hdr", &p->hdr, &outgoing_pdu, 0)) {
                DEBUG(0,("create_next_pdu: failed to marshall RPC_HDR.\n"));
+               prs_mem_free(&outgoing_pdu);
                return False;
        }
 
        if(!smb_io_rpc_hdr_resp("resp", &hdr_resp, &outgoing_pdu, 0)) {
                DEBUG(0,("create_next_pdu: failed to marshall RPC_HDR_RESP.\n"));
+               prs_mem_free(&outgoing_pdu);
                return False;
        }
 
@@ -185,25 +199,26 @@ BOOL create_next_pdu(pipes_struct *p)
        data_pos = prs_offset(&outgoing_pdu);
 
        /* Copy the data into the PDU. */
-       data_from = prs_data_p(&p->out_data.rdata) + p->out_data.data_sent_length;
 
-       if(!prs_append_data(&outgoing_pdu, data_from, data_len)) {
+       if(!prs_append_some_prs_data(&outgoing_pdu, &p->out_data.rdata, p->out_data.data_sent_length, data_len)) {
                DEBUG(0,("create_next_pdu: failed to copy %u bytes of data.\n", (unsigned int)data_len));
+               prs_mem_free(&outgoing_pdu);
                return False;
        }
 
-       /*
-        * Set data to point to where we copied the data into.
-        */
-
-       data = prs_data_p(&outgoing_pdu) + data_pos;
-
-       if (p->hdr.auth_len > 0) {
+       if (p->ntlmssp_auth_validated) {
                uint32 crc32 = 0;
+               char *data;
 
                DEBUG(5,("create_next_pdu: sign: %s seal: %s data %d auth %d\n",
                         BOOLSTR(auth_verify), BOOLSTR(auth_seal), data_len, p->hdr.auth_len));
 
+               /*
+                * Set data to point to where we copied the data into.
+                */
+
+               data = prs_data_p(&outgoing_pdu) + data_pos;
+
                if (auth_seal) {
                        crc32 = crc32_calc_buffer(data, data_len);
                        NTLMSSPcalc_p(p, (uchar*)data, data_len);
@@ -212,10 +227,11 @@ BOOL create_next_pdu(pipes_struct *p)
                if (auth_seal || auth_verify) {
                        RPC_HDR_AUTH auth_info;
 
-                       init_rpc_hdr_auth(&auth_info, NTLMSSP_AUTH_TYPE, NTLMSSP_AUTH_LEVEL, 
+                       init_rpc_hdr_auth(&auth_info, NTLMSSP_AUTH_TYPE, RPC_PIPE_AUTH_SEAL_LEVEL, 
                                        (auth_verify ? RPC_HDR_AUTH_LEN : 0), (auth_verify ? 1 : 0));
                        if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, &outgoing_pdu, 0)) {
                                DEBUG(0,("create_next_pdu: failed to marshall RPC_HDR_AUTH.\n"));
+                               prs_mem_free(&outgoing_pdu);
                                return False;
                        }
                }
@@ -230,12 +246,48 @@ BOOL create_next_pdu(pipes_struct *p)
                        auth_data = prs_data_p(&outgoing_pdu) + prs_offset(&outgoing_pdu) + 4;
                        if(!smb_io_rpc_auth_ntlmssp_chk("auth_sign", &ntlmssp_chk, &outgoing_pdu, 0)) {
                                DEBUG(0,("create_next_pdu: failed to marshall RPC_AUTH_NTLMSSP_CHK.\n"));
+                               prs_mem_free(&outgoing_pdu);
                                return False;
                        }
                        NTLMSSPcalc_p(p, (uchar*)auth_data, RPC_AUTH_NTLMSSP_CHK_LEN - 4);
                }
        }
 
+       if (p->netsec_auth_validated) {
+               int auth_type, auth_level;
+               char *data;
+               RPC_HDR_AUTH auth_info;
+
+               RPC_AUTH_NETSEC_CHK verf;
+               prs_struct rverf;
+               prs_struct rauth;
+
+               data = prs_data_p(&outgoing_pdu) + data_pos;
+               /* Check it's the type of reply we were expecting to decode */
+
+               get_auth_type_level(p->netsec_auth.auth_flags, &auth_type, &auth_level);
+               init_rpc_hdr_auth(&auth_info, auth_type, auth_level, 
+                                 RPC_HDR_AUTH_LEN, 1);
+
+               if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, &outgoing_pdu, 0)) {
+                       DEBUG(0,("create_next_pdu: failed to marshall RPC_HDR_AUTH.\n"));
+                       prs_mem_free(&outgoing_pdu);
+                       return False;
+               }
+
+               prs_init(&rverf, 0, p->mem_ctx, MARSHALL);
+               prs_init(&rauth, 0, p->mem_ctx, MARSHALL);
+
+               netsec_encode(&p->netsec_auth, 
+                             p->netsec_auth.auth_flags,
+                             SENDER_IS_ACCEPTOR,
+                             &verf, data, data_len);
+
+               smb_io_rpc_auth_netsec_chk("", &verf, &outgoing_pdu, 0);
+
+               p->netsec_auth.seq_num++;
+       }
+
        /*
         * Setup the counts for this PDU.
         */
@@ -244,6 +296,7 @@ BOOL create_next_pdu(pipes_struct *p)
        p->out_data.current_pdu_len = p->hdr.frag_len;
        p->out_data.current_pdu_sent = 0;
 
+       prs_mem_free(&outgoing_pdu);
        return True;
 }
 
@@ -258,53 +311,61 @@ BOOL create_next_pdu(pipes_struct *p)
 static BOOL api_pipe_ntlmssp_verify(pipes_struct *p, RPC_AUTH_NTLMSSP_RESP *ntlmssp_resp)
 {
        uchar lm_owf[24];
-       uchar nt_owf[24];
+       uchar nt_owf[128];
+       int nt_pw_len;
+       int lm_pw_len;
        fstring user_name;
-       fstring unix_user_name;
        fstring domain;
        fstring wks;
-       BOOL guest_user = False;
-       struct smb_passwd *smb_pass = NULL;
-       struct passwd *pass = NULL;
-       uchar null_smb_passwd[16];
-       uchar *smb_passwd_ptr = NULL;
-       
+
+       NTSTATUS nt_status;
+
+       struct auth_context *auth_context = NULL;
+       auth_usersupplied_info *user_info = NULL;
+       auth_serversupplied_info *server_info = NULL;
+
        DEBUG(5,("api_pipe_ntlmssp_verify: checking user details\n"));
 
        memset(p->user_name, '\0', sizeof(p->user_name));
-       memset(p->unix_user_name, '\0', sizeof(p->unix_user_name));
+       memset(p->pipe_user_name, '\0', sizeof(p->pipe_user_name));
        memset(p->domain, '\0', sizeof(p->domain));
        memset(p->wks, '\0', sizeof(p->wks));
 
+       /* Set up for non-authenticated user. */
+       delete_nt_token(&p->pipe_user.nt_user_token);
+       p->pipe_user.ngroups = 0;
+       SAFE_FREE( p->pipe_user.groups);
+
        /* 
         * Setup an empty password for a guest user.
         */
 
-       memset(null_smb_passwd,0,16);
-
        /*
         * We always negotiate UNICODE.
         */
 
-       if (IS_BITS_SET_ALL(p->ntlmssp_chal_flags, NTLMSSP_NEGOTIATE_UNICODE)) {
-               fstrcpy(user_name, dos_unistrn2((uint16*)ntlmssp_resp->user, ntlmssp_resp->hdr_usr.str_str_len/2));
-               fstrcpy(domain, dos_unistrn2((uint16*)ntlmssp_resp->domain, ntlmssp_resp->hdr_domain.str_str_len/2));
-               fstrcpy(wks, dos_unistrn2((uint16*)ntlmssp_resp->wks, ntlmssp_resp->hdr_wks.str_str_len/2));
+       if (p->ntlmssp_chal_flags & NTLMSSP_NEGOTIATE_UNICODE) {
+               rpcstr_pull(user_name, ntlmssp_resp->user, sizeof(fstring), ntlmssp_resp->hdr_usr.str_str_len*2, 0 );
+               rpcstr_pull(domain, ntlmssp_resp->domain, sizeof(fstring), ntlmssp_resp->hdr_domain.str_str_len*2, 0);
+               rpcstr_pull(wks, ntlmssp_resp->wks, sizeof(fstring), ntlmssp_resp->hdr_wks.str_str_len*2, 0);
        } else {
-               fstrcpy(user_name, ntlmssp_resp->user);
-               fstrcpy(domain, ntlmssp_resp->domain);
-               fstrcpy(wks, ntlmssp_resp->wks);
+               pull_ascii_fstring(user_name, ntlmssp_resp->user);
+               pull_ascii_fstring(domain, ntlmssp_resp->domain);
+               pull_ascii_fstring(wks, ntlmssp_resp->wks);
        }
 
        DEBUG(5,("user: %s domain: %s wks: %s\n", user_name, domain, wks));
 
+       nt_pw_len = MIN(sizeof(nt_owf), ntlmssp_resp->hdr_nt_resp.str_str_len);
+       lm_pw_len = MIN(sizeof(lm_owf), ntlmssp_resp->hdr_lm_resp.str_str_len);
+
        memcpy(lm_owf, ntlmssp_resp->lm_resp, sizeof(lm_owf));
-       memcpy(nt_owf, ntlmssp_resp->nt_resp, sizeof(nt_owf));
+       memcpy(nt_owf, ntlmssp_resp->nt_resp, nt_pw_len);
 
 #ifdef DEBUG_PASSWORD
        DEBUG(100,("lm, nt owfs, chal\n"));
        dump_data(100, (char *)lm_owf, sizeof(lm_owf));
-       dump_data(100, (char *)nt_owf, sizeof(nt_owf));
+       dump_data(100, (char *)nt_owf, nt_pw_len);
        dump_data(100, (char *)p->challenge, 8);
 #endif
 
@@ -312,25 +373,7 @@ static BOOL api_pipe_ntlmssp_verify(pipes_struct *p, RPC_AUTH_NTLMSSP_RESP *ntlm
         * Allow guest access. Patch from Shirish Kalele <kalele@veritas.com>.
         */
 
-       if((strlen(user_name) == 0) && 
-          (ntlmssp_resp->hdr_nt_resp.str_str_len==0))
-         {
-               guest_user = True;
-
-        fstrcpy(unix_user_name, lp_guestaccount(-1));
-               DEBUG(100,("Null user in NTLMSSP verification. Using guest = %s\n", unix_user_name));
-
-               smb_passwd_ptr = null_smb_passwd;
-
-       } else {
-
-               /*
-                * Pass the user through the NT -> unix user mapping
-                * function.
-                */
-
-               fstrcpy(unix_user_name, user_name);
-               (void)map_username(unix_user_name);
+       if (*user_name) {
 
                /* 
                 * Do the length checking only if user is not NULL.
@@ -348,55 +391,29 @@ static BOOL api_pipe_ntlmssp_verify(pipes_struct *p, RPC_AUTH_NTLMSSP_RESP *ntlm
                        return False;
 
        }
+       
+       make_auth_context_fixed(&auth_context, (uchar*)p->challenge);
 
-       /*
-        * Find the user in the unix password db.
-        */
-
-       if(!(pass = Get_Pwnam(unix_user_name,True))) {
-               DEBUG(1,("Couldn't find user '%s' in UNIX password database.\n",unix_user_name));
-               return(False);
+       if (!make_user_info_netlogon_network(&user_info, 
+                                            user_name, domain, wks,
+                                            lm_owf, lm_pw_len, 
+                                            nt_owf, nt_pw_len)) {
+               DEBUG(0,("make_user_info_netlogon_network failed!  Failing authenticaion.\n"));
+               return False;
        }
-
-       if(!guest_user) {
-
-               become_root(True);
-
-               if(!(p->ntlmssp_auth_validated = pass_check_smb(unix_user_name, domain,
-                                     (uchar*)p->challenge, lm_owf, nt_owf, NULL))) {
-                       DEBUG(1,("api_pipe_ntlmssp_verify: User %s\\%s from machine %s \
-failed authentication on named pipe %s.\n", domain, unix_user_name, wks, p->name ));
-                       unbecome_root(True);
-                       return False;
-               }
-
-               if(!(smb_pass = getsmbpwnam(unix_user_name))) {
-                       DEBUG(1,("api_pipe_ntlmssp_verify: Cannot find user %s in smb passwd database.\n",
-                               unix_user_name));
-                       unbecome_root(True);
-                       return False;
-               }
-
-               unbecome_root(True);
-
-               if (smb_pass == NULL) {
-                       DEBUG(1,("api_pipe_ntlmssp_verify: Couldn't find user '%s' in smb_passwd file.\n", 
-                               unix_user_name));
-                       return(False);
-               }
-
-               /* Quit if the account was disabled. */
-               if((smb_pass->acct_ctrl & ACB_DISABLED) || !smb_pass->smb_passwd) {
-                       DEBUG(1,("Account for user '%s' was disabled.\n", unix_user_name));
-                       return(False);
-               }
-
-               if(!smb_pass->smb_nt_passwd) {
-                       DEBUG(1,("Account for user '%s' has no NT password hash.\n", unix_user_name));
-                       return(False);
-               }
-
-               smb_passwd_ptr = smb_pass->smb_passwd;
+       
+       nt_status = auth_context->check_ntlm_password(auth_context, user_info, &server_info); 
+       
+       (auth_context->free)(&auth_context);
+       free_user_info(&user_info);
+       
+       p->ntlmssp_auth_validated = NT_STATUS_IS_OK(nt_status);
+       
+       if (!p->ntlmssp_auth_validated) {
+               DEBUG(1,("api_pipe_ntlmssp_verify: User [%s]\\[%s] from machine %s \
+failed authentication on named pipe %s.\n", domain, user_name, wks, p->name ));
+               free_server_info(&server_info);
+               return False;
        }
 
        /*
@@ -405,7 +422,7 @@ failed authentication on named pipe %s.\n", domain, unix_user_name, wks, p->name
 
        {
                uchar p24[24];
-               NTLMSSPOWFencrypt(smb_passwd_ptr, lm_owf, p24);
+               NTLMSSPOWFencrypt(server_info->first_8_lm_hash, lm_owf, p24);
                {
                        unsigned char j = 0;
                        int ind;
@@ -433,13 +450,17 @@ failed authentication on named pipe %s.\n", domain, unix_user_name, wks, p->name
                        p->ntlmssp_hash[256] = 0;
                        p->ntlmssp_hash[257] = 0;
                }
+
+               dump_data_pw("NTLMSSP hash (v1)\n", p->ntlmssp_hash, 
+                            sizeof(p->ntlmssp_hash));
+
 /*             NTLMSSPhash(p->ntlmssp_hash, p24); */
                p->ntlmssp_seq_num = 0;
 
        }
 
        fstrcpy(p->user_name, user_name);
-       fstrcpy(p->unix_user_name, unix_user_name);
+       fstrcpy(p->pipe_user_name, server_info->unix_name);
        fstrcpy(p->domain, domain);
        fstrcpy(p->wks, wks);
 
@@ -447,10 +468,32 @@ failed authentication on named pipe %s.\n", domain, unix_user_name, wks, p->name
         * Store the UNIX credential data (uid/gid pair) in the pipe structure.
         */
 
-       p->uid = pass->pw_uid;
-       p->gid = pass->pw_gid;
+       memcpy(p->session_key, server_info->session_key, sizeof(p->session_key));
+
+       p->pipe_user.uid = server_info->uid;
+       p->pipe_user.gid = server_info->gid;
+       
+       p->pipe_user.ngroups = server_info->n_groups;
+       if (p->pipe_user.ngroups) {
+               if (!(p->pipe_user.groups = memdup(server_info->groups, sizeof(gid_t) * p->pipe_user.ngroups))) {
+                       DEBUG(0,("failed to memdup group list to p->pipe_user.groups\n"));
+                       free_server_info(&server_info);
+                       return False;
+               }
+       }
+
+       if (server_info->ptok)
+               p->pipe_user.nt_user_token = dup_nt_token(server_info->ptok);
+       else {
+               DEBUG(1,("Error: Authmodule failed to provide nt_user_token\n"));
+               p->pipe_user.nt_user_token = NULL;
+               free_server_info(&server_info);
+               return False;
+       }
 
        p->ntlmssp_auth_validated = True;
+
+       free_server_info(&server_info);
        return True;
 }
 
@@ -458,24 +501,19 @@ failed authentication on named pipe %s.\n", domain, unix_user_name, wks, p->name
  The switch table for the pipe names and the functions to handle them.
  *******************************************************************/
 
-struct api_cmd
+struct rpc_table
 {
-  char * pipe_clnt_name;
-  char * pipe_srv_name;
-  BOOL (*fn) (pipes_struct *, prs_struct *);
+  struct
+  {
+    const char *clnt;
+    const char *srv;
+  } pipe;
+  struct api_struct *cmds;
+  int n_cmds;
 };
 
-static struct api_cmd api_fd_commands[] =
-{
-    { "lsarpc",   "lsass",   api_ntlsa_rpc },
-    { "samr",     "lsass",   api_samr_rpc },
-    { "srvsvc",   "ntsvcs",  api_srvsvc_rpc },
-    { "wkssvc",   "ntsvcs",  api_wkssvc_rpc },
-    { "NETLOGON", "lsass",   api_netlog_rpc },
-    { "winreg",   "winreg",  api_reg_rpc },
-    { "spoolss",  "spoolss", api_spoolss_rpc },
-    { NULL,       NULL,      NULL }
-};
+static struct rpc_table *rpc_lookup;
+static int rpc_lookup_size;
 
 /*******************************************************************
  This is the client reply to our challenge for an authenticated 
@@ -504,7 +542,7 @@ BOOL api_pipe_bind_auth_resp(pipes_struct *p, prs_struct *rpc_in_p)
                return False;
        }
 
-       if (autha_info.auth_type != NTLMSSP_AUTH_TYPE || autha_info.auth_level != NTLMSSP_AUTH_LEVEL) {
+       if (autha_info.auth_type != NTLMSSP_AUTH_TYPE || autha_info.auth_level != RPC_PIPE_AUTH_SEAL_LEVEL) {
                DEBUG(0,("api_pipe_bind_auth_resp: incorrect auth type (%d) or level (%d).\n",
                        (int)autha_info.auth_type, (int)autha_info.auth_level ));
                return False;
@@ -561,7 +599,7 @@ static BOOL setup_bind_nak(pipes_struct *p)
         * header and are never sending more than one PDU here.
         */
 
-       prs_init( &outgoing_rpc, 0, 4, MARSHALL);
+       prs_init( &outgoing_rpc, 0, p->mem_ctx, MARSHALL);
        prs_give_memory( &outgoing_rpc, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
 
 
@@ -578,6 +616,7 @@ static BOOL setup_bind_nak(pipes_struct *p)
 
        if(!smb_io_rpc_hdr("", &nak_hdr, &outgoing_rpc, 0)) {
                DEBUG(0,("setup_bind_nak: marshalling of RPC_HDR failed.\n"));
+               prs_mem_free(&outgoing_rpc);
                return False;
        }
 
@@ -585,8 +624,10 @@ static BOOL setup_bind_nak(pipes_struct *p)
         * Now add the reject reason.
         */
 
-       if(!prs_uint16("reject code", &outgoing_rpc, 0, &zero))
+       if(!prs_uint16("reject code", &outgoing_rpc, 0, &zero)) {
+               prs_mem_free(&outgoing_rpc);
         return False;
+       }
 
        p->out_data.data_sent_length = 0;
        p->out_data.current_pdu_len = prs_offset(&outgoing_rpc);
@@ -601,7 +642,7 @@ static BOOL setup_bind_nak(pipes_struct *p)
  Marshall a fault pdu.
 *******************************************************************/
 
-BOOL setup_fault_pdu(pipes_struct *p)
+BOOL setup_fault_pdu(pipes_struct *p, NTSTATUS status)
 {
        prs_struct outgoing_pdu;
        RPC_HDR fault_hdr;
@@ -617,7 +658,7 @@ BOOL setup_fault_pdu(pipes_struct *p)
         * header and are never sending more than one PDU here.
         */
 
-       prs_init( &outgoing_pdu, 0, 4, MARSHALL);
+       prs_init( &outgoing_pdu, 0, p->mem_ctx, MARSHALL);
        prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
 
        /*
@@ -633,7 +674,7 @@ BOOL setup_fault_pdu(pipes_struct *p)
 
        memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
 
-       fault_resp.status = 0x1c010002;
+       fault_resp.status = status;
        fault_resp.reserved = 0;
 
        /*
@@ -642,16 +683,19 @@ BOOL setup_fault_pdu(pipes_struct *p)
 
        if(!smb_io_rpc_hdr("", &fault_hdr, &outgoing_pdu, 0)) {
                DEBUG(0,("setup_fault_pdu: marshalling of RPC_HDR failed.\n"));
+               prs_mem_free(&outgoing_pdu);
                return False;
        }
 
        if(!smb_io_rpc_hdr_resp("resp", &hdr_resp, &outgoing_pdu, 0)) {
                DEBUG(0,("setup_fault_pdu: failed to marshall RPC_HDR_RESP.\n"));
+               prs_mem_free(&outgoing_pdu);
                return False;
        }
 
        if(!smb_io_rpc_hdr_fault("fault", &fault_resp, &outgoing_pdu, 0)) {
                DEBUG(0,("setup_fault_pdu: failed to marshall RPC_HDR_FAULT.\n"));
+               prs_mem_free(&outgoing_pdu);
                return False;
        }
 
@@ -659,6 +703,7 @@ BOOL setup_fault_pdu(pipes_struct *p)
        p->out_data.current_pdu_len = prs_offset(&outgoing_pdu);
        p->out_data.current_pdu_sent = 0;
 
+       prs_mem_free(&outgoing_pdu);
        return True;
 }
 
@@ -667,36 +712,111 @@ BOOL setup_fault_pdu(pipes_struct *p)
  Used to reject unknown binds from Win2k.
 *******************************************************************/
 
-BOOL check_bind_req(char* pipe_name, RPC_IFACE* abstract,
-                                       RPC_IFACE* transfer)
+BOOL check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract,
+                    RPC_IFACE* transfer, uint32 context_id)
 {
        extern struct pipe_id_info pipe_names[];
+       char *pipe_name = p->name;
        int i=0;
        fstring pname;
+       
        fstrcpy(pname,"\\PIPE\\");
        fstrcat(pname,pipe_name);
 
-       for(i=0;pipe_names[i].client_pipe; i++) {
-               if(strequal(pipe_names[i].client_pipe, pname))
+       DEBUG(3,("check_bind_req for %s\n", pname));
+
+       /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */
+               
+       for ( i=0; pipe_names[i].client_pipe; i++ ) 
+       {
+               if ( strequal(pipe_names[i].client_pipe, pname)
+                       && (abstract->version == pipe_names[i].abstr_syntax.version) 
+                       && (memcmp(&abstract->uuid, &pipe_names[i].abstr_syntax.uuid, sizeof(struct uuid)) == 0)
+                       && (transfer->version == pipe_names[i].trans_syntax.version)
+                       && (memcmp(&transfer->uuid, &pipe_names[i].trans_syntax.uuid, sizeof(struct uuid)) == 0) )
+               {
+                       struct api_struct       *fns = NULL;
+                       int                     n_fns = 0;
+                       PIPE_RPC_FNS            *context_fns;
+                       
+                       if ( !(context_fns = malloc(sizeof(PIPE_RPC_FNS))) ) {
+                               DEBUG(0,("check_bind_req: malloc() failed!\n"));
+                               return False;
+                       }
+                       
+                       /* save the RPC function table associated with this bind */
+                       
+                       get_pipe_fns(i, &fns, &n_fns);
+                       
+                       context_fns->cmds = fns;
+                       context_fns->n_cmds = n_fns;
+                       context_fns->context_id = context_id;
+                       
+                       /* add to the list of open contexts */
+                       
+                       DLIST_ADD( p->contexts, context_fns );
+                       
                        break;
+               }
        }
 
        if(pipe_names[i].client_pipe == NULL)
                return False;
 
-       /* check the abstract interface */
-       if((abstract->version != pipe_names[i].abstr_syntax.version) ||
-               (memcmp(&abstract->uuid, &pipe_names[i].abstr_syntax.uuid,
-                       sizeof(RPC_UUID)) != 0))
-               return False;
+       return True;
+}
 
-       /* check the transfer interface */
-       if((transfer->version != pipe_names[i].trans_syntax.version) ||
-               (memcmp(&transfer->uuid, &pipe_names[i].trans_syntax.uuid,
-                       sizeof(RPC_UUID)) != 0))
-               return False;
+/*******************************************************************
+ Register commands to an RPC pipe
+*******************************************************************/
+NTSTATUS rpc_pipe_register_commands(int version, const char *clnt, const char *srv, const struct api_struct *cmds, int size)
+{
+        struct rpc_table *rpc_entry;
 
-       return True;
+       if (!clnt || !srv || !cmds) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (version != SMB_RPC_INTERFACE_VERSION) {
+               DEBUG(0,("Can't register rpc commands!\n"
+                        "You tried to register a rpc module with SMB_RPC_INTERFACE_VERSION %d"
+                        ", while this version of samba uses version %d!\n", 
+                        version,SMB_RPC_INTERFACE_VERSION));
+               return NT_STATUS_OBJECT_TYPE_MISMATCH;
+       }
+
+       /* TODO: 
+        *
+        * we still need to make sure that don't register the same commands twice!!!
+        * 
+        * --metze
+        */
+
+        /* We use a temporary variable because this call can fail and 
+           rpc_lookup will still be valid afterwards.  It could then succeed if
+           called again later */
+        rpc_entry = realloc(rpc_lookup, 
+                            ++rpc_lookup_size*sizeof(struct rpc_table));
+        if (NULL == rpc_entry) {
+                rpc_lookup_size--;
+                DEBUG(0, ("rpc_pipe_register_commands: memory allocation failed\n"));
+                return NT_STATUS_NO_MEMORY;
+        } else {
+                rpc_lookup = rpc_entry;
+        }
+        
+        rpc_entry = rpc_lookup + (rpc_lookup_size - 1);
+        ZERO_STRUCTP(rpc_entry);
+        rpc_entry->pipe.clnt = strdup(clnt);
+        rpc_entry->pipe.srv = strdup(srv);
+        rpc_entry->cmds = realloc(rpc_entry->cmds, 
+                                  (rpc_entry->n_cmds + size) *
+                                  sizeof(struct api_struct));
+        memcpy(rpc_entry->cmds + rpc_entry->n_cmds, cmds,
+               size * sizeof(struct api_struct));
+        rpc_entry->n_cmds += size;
+        
+        return NT_STATUS_OK;
 }
 
 /*******************************************************************
@@ -718,6 +838,7 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
        enum RPC_PKT_TYPE reply_pkt_type;
 
        p->ntlmssp_auth_requested = False;
+       p->netsec_auth_validated = False;
 
        DEBUG(5,("api_pipe_bind_req: decode request. %d\n", __LINE__));
 
@@ -726,23 +847,38 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
         * that this is a pipe name we support.
         */
 
-       for (i = 0; api_fd_commands[i].pipe_clnt_name; i++) {
-               if (strequal(api_fd_commands[i].pipe_clnt_name, p->name) &&
-                   api_fd_commands[i].fn != NULL) {
-                       DEBUG(3,("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
-                                  api_fd_commands[i].pipe_clnt_name,
-                                  api_fd_commands[i].pipe_srv_name));
-                       fstrcpy(p->pipe_srv_name, api_fd_commands[i].pipe_srv_name);
-                       break;
-               }
+
+       for (i = 0; i < rpc_lookup_size; i++) {
+               if (strequal(rpc_lookup[i].pipe.clnt, p->name)) {
+                  DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
+                            rpc_lookup[i].pipe.clnt, rpc_lookup[i].pipe.srv));
+                  fstrcpy(p->pipe_srv_name, rpc_lookup[i].pipe.srv);
+                  break;
+                }
        }
 
-       if (api_fd_commands[i].fn == NULL) {
-               DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in bind request.\n",
-                       p->name ));
-               if(!setup_bind_nak(p))
+       if (i == rpc_lookup_size) {
+               if (NT_STATUS_IS_ERR(smb_probe_module("rpc", p->name))) {
+                       DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in bind request.\n",
+                                p->name ));
+                       if(!setup_bind_nak(p))
+                               return False;
+                       return True;
+                }
+
+                for (i = 0; i < rpc_lookup_size; i++) {
+                       if (strequal(rpc_lookup[i].pipe.clnt, p->name)) {
+                               DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
+                                         rpc_lookup[i].pipe.clnt, rpc_lookup[i].pipe.srv));
+                               fstrcpy(p->pipe_srv_name, rpc_lookup[i].pipe.srv);
+                               break;
+                       }
+                }
+
+               if (i == rpc_lookup_size) {
+                       DEBUG(0, ("module %s doesn't provide functions for pipe %s!\n", p->name, p->name));
                        return False;
-               return True;
+               }
        }
 
        /* decode the bind request */
@@ -768,39 +904,62 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                        return False;
                }
 
-               /*
-                * We only support NTLMSSP_AUTH_TYPE requests.
-                */
+               if(auth_info.auth_type == NTLMSSP_AUTH_TYPE) {
 
-               if(auth_info.auth_type != NTLMSSP_AUTH_TYPE) {
-                       DEBUG(0,("api_pipe_bind_req: unknown auth type %x requested.\n",
-                               auth_info.auth_type ));
-                       return False;
-               }
+                       if(!smb_io_rpc_auth_verifier("", &auth_verifier, rpc_in_p, 0)) {
+                               DEBUG(0,("api_pipe_bind_req: unable to "
+                                        "unmarshall RPC_HDR_AUTH struct.\n"));
+                               return False;
+                       }
 
-               if(!smb_io_rpc_auth_verifier("", &auth_verifier, rpc_in_p, 0)) {
-                       DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_AUTH struct.\n"));
-                       return False;
-               }
+                       if(!strequal(auth_verifier.signature, "NTLMSSP")) {
+                               DEBUG(0,("api_pipe_bind_req: "
+                                        "auth_verifier.signature != NTLMSSP\n"));
+                               return False;
+                       }
 
-               if(!strequal(auth_verifier.signature, "NTLMSSP")) {
-                       DEBUG(0,("api_pipe_bind_req: auth_verifier.signature != NTLMSSP\n"));
-                       return False;
-               }
+                       if(auth_verifier.msg_type != NTLMSSP_NEGOTIATE) {
+                               DEBUG(0,("api_pipe_bind_req: "
+                                        "auth_verifier.msg_type (%d) != NTLMSSP_NEGOTIATE\n",
+                                        auth_verifier.msg_type));
+                               return False;
+                       }
 
-               if(auth_verifier.msg_type != NTLMSSP_NEGOTIATE) {
-                       DEBUG(0,("api_pipe_bind_req: auth_verifier.msg_type (%d) != NTLMSSP_NEGOTIATE\n",
-                               auth_verifier.msg_type));
-                       return False;
-               }
+                       if(!smb_io_rpc_auth_ntlmssp_neg("", &ntlmssp_neg, rpc_in_p, 0)) {
+                               DEBUG(0,("api_pipe_bind_req: "
+                                        "Failed to unmarshall RPC_AUTH_NTLMSSP_NEG.\n"));
+                               return False;
+                       }
+
+                       p->ntlmssp_chal_flags = SMBD_NTLMSSP_NEG_FLAGS;
+                       p->ntlmssp_auth_requested = True;
+
+               } else if (auth_info.auth_type == NETSEC_AUTH_TYPE) {
+
+                       RPC_AUTH_NETSEC_NEG neg;
+                       struct netsec_auth_struct *a = &(p->netsec_auth);
 
-               if(!smb_io_rpc_auth_ntlmssp_neg("", &ntlmssp_neg, rpc_in_p, 0)) {
-                       DEBUG(0,("api_pipe_bind_req: Failed to unmarshall RPC_AUTH_NTLMSSP_NEG.\n"));
+                       if (!smb_io_rpc_auth_netsec_neg("", &neg, rpc_in_p, 0)) {
+                               DEBUG(0,("api_pipe_bind_req: "
+                                        "Could not unmarshal SCHANNEL auth neg\n"));
+                               return False;
+                       }
+
+                       p->netsec_auth_validated = True;
+
+                       memset(a->sess_key, 0, sizeof(a->sess_key));
+                       memcpy(a->sess_key, last_dcinfo.sess_key, sizeof(last_dcinfo.sess_key));
+
+                       a->seq_num = 0;
+
+                       DEBUG(10,("schannel auth: domain [%s] myname [%s]\n",
+                                 neg.domain, neg.myname));
+
+               } else {
+                       DEBUG(0,("api_pipe_bind_req: unknown auth type %x requested.\n",
+                                auth_info.auth_type ));
                        return False;
                }
-
-               p->ntlmssp_chal_flags = SMBD_NTLMSSP_NEG_FLAGS;
-               p->ntlmssp_auth_requested = True;
        }
 
        switch(p->hdr.pkt_type) {
@@ -830,7 +989,7 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
         * header and are never sending more than one PDU here.
         */
 
-       prs_init( &outgoing_rpc, 0, 4, MARSHALL);
+       prs_init( &outgoing_rpc, 0, p->mem_ctx, MARSHALL);
        prs_give_memory( &outgoing_rpc, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
 
        /*
@@ -838,13 +997,15 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
         * auth footers.
         */
 
-       if(!prs_init(&out_hdr_ba, 1024, 4, MARSHALL)) {
+       if(!prs_init(&out_hdr_ba, 1024, p->mem_ctx, MARSHALL)) {
                DEBUG(0,("api_pipe_bind_req: malloc out_hdr_ba failed.\n"));
+               prs_mem_free(&outgoing_rpc);
                return False;
        }
 
-       if(!prs_init(&out_auth, 1024, 4, MARSHALL)) {
+       if(!prs_init(&out_auth, 1024, p->mem_ctx, MARSHALL)) {
                DEBUG(0,("pi_pipe_bind_req: malloc out_auth failed.\n"));
+               prs_mem_free(&outgoing_rpc);
                prs_mem_free(&out_hdr_ba);
                return False;
        }
@@ -852,7 +1013,7 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
        if (p->ntlmssp_auth_requested)
                assoc_gid = 0x7a77;
        else
-               assoc_gid = hdr_rb.bba.assoc_gid;
+               assoc_gid = hdr_rb.bba.assoc_gid ? hdr_rb.bba.assoc_gid : 0x53f0;
 
        /*
         * Create the bind response struct.
@@ -864,7 +1025,8 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                unknown to NT4)
                Needed when adding entries to a DACL from NT5 - SK */
 
-       if(check_bind_req(p->name, &hdr_rb.abstract, &hdr_rb.transfer)) {
+       if(check_bind_req(p, &hdr_rb.abstract, &hdr_rb.transfer, hdr_rb.context_id )) 
+       {
                init_rpc_hdr_ba(&hdr_ba,
                        MAX_PDU_FRAG_LEN,
                        MAX_PDU_FRAG_LEN,
@@ -903,7 +1065,7 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
                /*** Authentication info ***/
 
-               init_rpc_hdr_auth(&auth_info, NTLMSSP_AUTH_TYPE, NTLMSSP_AUTH_LEVEL, RPC_HDR_AUTH_LEN, 1);
+               init_rpc_hdr_auth(&auth_info, NTLMSSP_AUTH_TYPE, RPC_PIPE_AUTH_SEAL_LEVEL, RPC_HDR_AUTH_LEN, 1);
                if(!smb_io_rpc_hdr_auth("", &auth_info, &out_auth, 0)) {
                        DEBUG(0,("api_pipe_bind_req: marshalling of RPC_HDR_AUTH failed.\n"));
                        goto err_exit;
@@ -929,6 +1091,38 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
        }
 
+       if (p->netsec_auth_validated) {
+               RPC_AUTH_VERIFIER auth_verifier;
+               uint32 flags;
+
+               /* The client opens a second RPC NETLOGON pipe without
+                   doing a auth2. The credentials for the schannel are
+                   re-used from the auth2 the client did before. */
+               p->dc = last_dcinfo;
+
+               init_rpc_hdr_auth(&auth_info, NETSEC_AUTH_TYPE, RPC_PIPE_AUTH_SEAL_LEVEL, RPC_HDR_AUTH_LEN, 1);
+               if(!smb_io_rpc_hdr_auth("", &auth_info, &out_auth, 0)) {
+                       DEBUG(0,("api_pipe_bind_req: marshalling of RPC_HDR_AUTH failed.\n"));
+                       goto err_exit;
+               }
+
+               /*** NETSEC verifier ***/
+
+               init_rpc_auth_verifier(&auth_verifier, "\001", 0x0);
+               if(!smb_io_rpc_netsec_verifier("", &auth_verifier, &out_auth, 0)) {
+                       DEBUG(0,("api_pipe_bind_req: marshalling of RPC_AUTH_VERIFIER failed.\n"));
+                       goto err_exit;
+               }
+
+               prs_align(&out_auth);
+
+               flags = 5;
+               if(!prs_uint32("flags ", &out_auth, 0, &flags))
+                       goto err_exit;
+
+               auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
+       }
+
        /*
         * Create the header, now we know the length.
         */
@@ -956,7 +1150,8 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                goto err_exit;
        }
 
-       if(p->ntlmssp_auth_requested && !prs_append_prs_data( &outgoing_rpc, &out_auth)) {
+       if((p->ntlmssp_auth_requested|p->netsec_auth_validated) &&
+          !prs_append_prs_data( &outgoing_rpc, &out_auth)) {
                DEBUG(0,("api_pipe_bind_req: append of auth info failed.\n"));
                goto err_exit;
        }
@@ -979,6 +1174,7 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
   err_exit:
 
+       prs_mem_free(&outgoing_rpc);
        prs_mem_free(&out_hdr_ba);
        prs_mem_free(&out_auth);
        return False;
@@ -993,8 +1189,8 @@ BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *rpc_in)
        /*
         * We always negotiate the following two bits....
         */
-       BOOL auth_verify = IS_BITS_SET_ALL(p->ntlmssp_chal_flags, NTLMSSP_NEGOTIATE_SIGN);
-       BOOL auth_seal   = IS_BITS_SET_ALL(p->ntlmssp_chal_flags, NTLMSSP_NEGOTIATE_SEAL);
+       BOOL auth_verify = ((p->ntlmssp_chal_flags & NTLMSSP_NEGOTIATE_SIGN) != 0);
+       BOOL auth_seal   = ((p->ntlmssp_chal_flags & NTLMSSP_NEGOTIATE_SEAL) != 0);
        int data_len;
        int auth_len;
        uint32 old_offset;
@@ -1025,7 +1221,14 @@ BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *rpc_in)
                 * has already been consumed.
                 */
                char *data = prs_data_p(rpc_in) + RPC_HDR_REQ_LEN;
+               dump_data_pw("NTLMSSP hash (v1)\n", p->ntlmssp_hash, 
+                            sizeof(p->ntlmssp_hash));
+
+               dump_data_pw("Incoming RPC PDU (NTLMSSP sealed)\n", 
+                            (const unsigned char *)data, data_len);
                NTLMSSPcalc_p(p, (uchar*)data, data_len);
+               dump_data_pw("Incoming RPC PDU (NTLMSSP unsealed)\n", 
+                            (const unsigned char *)data, data_len);
                crc32 = crc32_calc_buffer(data, data_len);
        }
 
@@ -1087,6 +1290,156 @@ BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *rpc_in)
        return True;
 }
 
+/****************************************************************************
+ Deal with schannel processing on an RPC request.
+****************************************************************************/
+BOOL api_pipe_netsec_process(pipes_struct *p, prs_struct *rpc_in)
+{
+       /*
+        * We always negotiate the following two bits....
+        */
+       int data_len;
+       int auth_len;
+       uint32 old_offset;
+       RPC_HDR_AUTH auth_info;
+       RPC_AUTH_NETSEC_CHK netsec_chk;
+
+
+       auth_len = p->hdr.auth_len;
+
+       if (auth_len != RPC_AUTH_NETSEC_CHK_LEN) {
+               DEBUG(0,("Incorrect auth_len %d.\n", auth_len ));
+               return False;
+       }
+
+       /*
+        * The following is that length of the data we must verify or unseal.
+        * This doesn't include the RPC headers or the auth_len or the RPC_HDR_AUTH_LEN
+        * preceeding the auth_data.
+        */
+
+       data_len = p->hdr.frag_len - RPC_HEADER_LEN - RPC_HDR_REQ_LEN - 
+               RPC_HDR_AUTH_LEN - auth_len;
+       
+       DEBUG(5,("data %d auth %d\n", data_len, auth_len));
+
+       old_offset = prs_offset(rpc_in);
+
+       if(!prs_set_offset(rpc_in, old_offset + data_len)) {
+               DEBUG(0,("cannot move offset to %u.\n",
+                        (unsigned int)old_offset + data_len ));
+               return False;
+       }
+
+       if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, rpc_in, 0)) {
+               DEBUG(0,("failed to unmarshall RPC_HDR_AUTH.\n"));
+               return False;
+       }
+
+       if (auth_info.auth_type != NETSEC_AUTH_TYPE) {
+               DEBUG(0,("Invalid auth info %d on schannel\n",
+                        auth_info.auth_type));
+               return False;
+       }
+
+       if (auth_info.auth_level == RPC_PIPE_AUTH_SEAL_LEVEL) {
+               p->netsec_auth.auth_flags = AUTH_PIPE_NETSEC|AUTH_PIPE_SIGN|AUTH_PIPE_SEAL;
+       } else if (auth_info.auth_level == RPC_PIPE_AUTH_SIGN_LEVEL) {
+               p->netsec_auth.auth_flags = AUTH_PIPE_NETSEC|AUTH_PIPE_SIGN;
+       } else {
+               DEBUG(0,("Invalid auth level %d on schannel\n",
+                        auth_info.auth_level));
+               return False;
+       }
+
+       if(!smb_io_rpc_auth_netsec_chk("", &netsec_chk, rpc_in, 0)) {
+               DEBUG(0,("failed to unmarshal RPC_AUTH_NETSEC_CHK.\n"));
+               return False;
+       }
+
+       if (!netsec_decode(&p->netsec_auth,
+                          p->netsec_auth.auth_flags,
+                          SENDER_IS_INITIATOR,
+                          &netsec_chk,
+                          prs_data_p(rpc_in)+old_offset, data_len)) {
+               DEBUG(0,("failed to decode PDU\n"));
+               return False;
+       }
+
+       /*
+        * Return the current pointer to the data offset.
+        */
+
+       if(!prs_set_offset(rpc_in, old_offset)) {
+               DEBUG(0,("failed to set offset back to %u\n",
+                        (unsigned int)old_offset ));
+               return False;
+       }
+
+       /* The sequence number gets incremented on both send and receive. */
+       p->netsec_auth.seq_num++;
+
+       return True;
+}
+
+/****************************************************************************
+ Return a user struct for a pipe user.
+****************************************************************************/
+
+struct current_user *get_current_user(struct current_user *user, pipes_struct *p)
+{
+       if (p->ntlmssp_auth_validated) {
+               memcpy(user, &p->pipe_user, sizeof(struct current_user));
+       } else {
+               extern struct current_user current_user;
+               memcpy(user, &current_user, sizeof(struct current_user));
+       }
+
+       return user;
+}
+
+/****************************************************************************
+ 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;
+       PIPE_RPC_FNS *tmp = NULL;
+       
+       if ( !list ) {
+               DEBUG(0,("find_pipe_fns_by_context: ERROR!  No context list for pipe!\n"));
+               return NULL;
+       }
+       
+       for (tmp=list; tmp; tmp=tmp->next ) {
+               if ( tmp->context_id == context_id )
+                       break;
+       }
+       
+       fns = tmp;
+       
+       return fns;
+}
+
+/****************************************************************************
+ 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; 
+}
+
 /****************************************************************************
  Find the correct RPC function to call for this request.
  If the pipe is authenticated then become the correct UNIX user
@@ -1095,30 +1448,35 @@ BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *rpc_in)
 
 BOOL api_pipe_request(pipes_struct *p)
 {
-       int i = 0;
        BOOL ret = False;
-       BOOL changed_user_id = False;
-
+       PIPE_RPC_FNS *pipe_fns;
+       
        if (p->ntlmssp_auth_validated) {
 
                if(!become_authenticated_pipe_user(p)) {
                        prs_mem_free(&p->out_data.rdata);
                        return False;
                }
-
-               changed_user_id = True;
        }
 
-       for (i = 0; api_fd_commands[i].pipe_clnt_name; i++) {
-               if (strequal(api_fd_commands[i].pipe_clnt_name, p->name) &&
-                   api_fd_commands[i].fn != NULL) {
-                       DEBUG(3,("Doing \\PIPE\\%s\n", api_fd_commands[i].pipe_clnt_name));
-                       ret = api_fd_commands[i].fn(p, &p->in_data.data);
-               }
+       DEBUG(5, ("Requested \\PIPE\\%s\n", p->name));
+       
+       /* get the set of RPC functions for this context */
+       
+       pipe_fns = find_pipe_fns_by_context(p->contexts, p->hdr_req.context_id);
+       
+       if ( pipe_fns ) {
+               set_current_rpc_talloc(p->mem_ctx);
+               ret = api_rpcTNP(p, p->name, pipe_fns->cmds, pipe_fns->n_cmds);
+               set_current_rpc_talloc(NULL);   
+       }
+       else {
+               DEBUG(0,("api_pipe_request: No rpc function table associated with context [%d] on pipe [%s]\n",
+                       p->hdr_req.context_id, p->name));
        }
 
-       if(changed_user_id)
-               unbecome_authenticated_pipe_user(p);
+       if(p->ntlmssp_auth_validated)
+               unbecome_authenticated_pipe_user();
 
        return ret;
 }
@@ -1127,8 +1485,8 @@ BOOL api_pipe_request(pipes_struct *p)
  Calls the underlying RPC function for a named pipe.
  ********************************************************************/
 
-BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds,
-                               prs_struct *rpc_in)
+BOOL api_rpcTNP(pipes_struct *p, const char *rpc_name, 
+               const struct api_struct *api_rpc_cmds, int n_cmds)
 {
        int fn_num;
        fstring name;
@@ -1137,37 +1495,46 @@ BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds
        /* interpret the command */
        DEBUG(4,("api_rpcTNP: %s op 0x%x - ", rpc_name, p->hdr_req.opnum));
 
-       slprintf(name, sizeof(name), "in_%s", rpc_name);
-       prs_dump(name, p->hdr_req.opnum, rpc_in);
+       slprintf(name, sizeof(name)-1, "in_%s", rpc_name);
+       prs_dump(name, p->hdr_req.opnum, &p->in_data.data);
 
-       for (fn_num = 0; api_rpc_cmds[fn_num].name; fn_num++) {
+       for (fn_num = 0; fn_num < n_cmds; fn_num++) {
                if (api_rpc_cmds[fn_num].opnum == p->hdr_req.opnum && api_rpc_cmds[fn_num].fn != NULL) {
                        DEBUG(3,("api_rpcTNP: rpc command: %s\n", api_rpc_cmds[fn_num].name));
                        break;
                }
        }
 
-       if (api_rpc_cmds[fn_num].name == NULL) {
+       if (fn_num == n_cmds) {
                /*
                 * For an unknown RPC just return a fault PDU but
                 * return True to allow RPC's on the pipe to continue
                 * and not put the pipe into fault state. JRA.
                 */
                DEBUG(4, ("unknown\n"));
-               setup_fault_pdu(p);
+               setup_fault_pdu(p, NT_STATUS(0x1c010002));
                return True;
        }
 
        offset1 = prs_offset(&p->out_data.rdata);
 
+        DEBUG(6, ("api_rpc_cmds[%d].fn == %p\n", 
+                fn_num, api_rpc_cmds[fn_num].fn));
        /* do the actual command */
-       if(!api_rpc_cmds[fn_num].fn(rpc_in, &p->out_data.rdata)) {
-               DEBUG(0,("api_rpcTNP: %s: failed.\n", rpc_name));
+       if(!api_rpc_cmds[fn_num].fn(p)) {
+               DEBUG(0,("api_rpcTNP: %s: %s failed.\n", rpc_name, api_rpc_cmds[fn_num].name));
                prs_mem_free(&p->out_data.rdata);
                return False;
        }
 
-       slprintf(name, sizeof(name), "out_%s", rpc_name);
+       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(0x1C00001A));
+               return True;
+       }
+
+       slprintf(name, sizeof(name)-1, "out_%s", rpc_name);
        offset2 = prs_offset(&p->out_data.rdata);
        prs_set_offset(&p->out_data.rdata, offset1);
        prs_dump(name, p->hdr_req.opnum, &p->out_data.rdata);
@@ -1175,7 +1542,78 @@ BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds
 
        DEBUG(5,("api_rpcTNP: called %s successfully\n", rpc_name));
 
+       /* Check for buffer underflow in rpc parsing */
+
+       if ((DEBUGLEVEL >= 10) && 
+           (prs_offset(&p->in_data.data) != prs_data_size(&p->in_data.data))) {
+               size_t data_len = prs_data_size(&p->in_data.data) - prs_offset(&p->in_data.data);
+               char *data;
+
+               data = malloc(data_len);
+
+               DEBUG(10, ("api_rpcTNP: rpc input buffer underflow (parse error?)\n"));
+               if (data) {
+                       prs_uint8s(False, "", &p->in_data.data, 0, (unsigned char *)data, (uint32)data_len);
+                       SAFE_FREE(data);
+               }
+
+       }
+
        return True;
 }
 
-#undef OLD_NTDOMAIN
+/*******************************************************************
+*******************************************************************/
+
+void get_pipe_fns( int idx, struct api_struct **fns, int *n_fns )
+{
+       struct api_struct *cmds = NULL;
+       int               n_cmds = 0;
+
+       switch ( idx ) {
+               case PI_LSARPC:
+                       lsa_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+               case PI_LSARPC_DS:
+                       lsa_ds_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+               case PI_SAMR:
+                       samr_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+               case PI_NETLOGON:
+                       netlog_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+               case PI_SRVSVC:
+                       srvsvc_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+               case PI_WKSSVC:
+                       wkssvc_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+               case PI_WINREG:
+                       reg_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+               case PI_SPOOLSS:
+                       spoolss_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+               case PI_NETDFS:
+                       netdfs_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+#ifdef DEVELOPER
+               case PI_ECHO:
+                       echo_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+#endif
+               case PI_EPM:
+                       epm_get_pipe_fns( &cmds, &n_cmds );
+                       break;
+               default:
+                       DEBUG(0,("get_pipe_fns: Unknown pipe index! [%d]\n", idx));
+       }
+
+       *fns = cmds;
+       *n_fns = n_cmds;
+
+       return;
+}
+
+