Ensure that only parse_prs.c access internal members of the prs_struct.
[samba.git] / source3 / rpc_server / srv_pipe.c
index c4664f7d7b0b09e41582052358973aad83284fbb..50127005a101f16acc20501277d2d3bcca6c68aa 100644 (file)
@@ -1,11 +1,11 @@
-
 /* 
- *  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) Paul Ashton                  1997-1998,
+ *  Copyright (C) Jeremy Allison                    1999,
+ *  Copyright (C) Anthony Liguori                   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
@@ -39,9 +39,9 @@
  */
 
 #include "includes.h"
-#include "nterr.h"
 
-extern int DEBUGLEVEL;
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_SRV
 
 static void NTLMSSPcalc_p( pipes_struct *p, unsigned char *data, int len)
 {
@@ -50,8 +50,7 @@ static void NTLMSSPcalc_p( pipes_struct *p, unsigned char *data, int len)
     unsigned char index_j = hash[257];
     int ind;
 
-    for( ind = 0; ind < len; ind++)
-    {
+    for( ind = 0; ind < len; ind++) {
         unsigned char tc;
         unsigned char t;
 
@@ -71,253 +70,310 @@ static void NTLMSSPcalc_p( pipes_struct *p, unsigned char *data, int len)
 }
 
 /*******************************************************************
- turns a DCE/RPC request into a DCE/RPC reply
-
- this is where the data really should be split up into an array of
- headers and data sections.
-
+ Generate the next PDU to be returned from the data in p->rdata. 
+ We cheat here as this function doesn't handle the special auth
+ footers of the authenticated bind response reply.
  ********************************************************************/
-BOOL create_rpc_reply(pipes_struct *p,
-                               uint32 data_start, uint32 data_end)
+
+BOOL create_next_pdu(pipes_struct *p)
 {
-       char *data;
-       BOOL auth_verify = IS_BITS_SET_ALL(p->ntlmssp_chal.neg_flags, NTLMSSP_NEGOTIATE_SIGN);
-       BOOL auth_seal   = IS_BITS_SET_ALL(p->ntlmssp_chal.neg_flags, NTLMSSP_NEGOTIATE_SEAL);
+       RPC_HDR_RESP hdr_resp;
+       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 auth_len;
-
-       DEBUG(5,("create_rpc_reply: data_start: %d data_end: %d max_tsize: %d\n",
-                 data_start, data_end, p->hdr_ba.bba.max_tsize));
-
-       auth_len = p->hdr.auth_len;
-
-       if (p->ntlmssp_auth)
-       {
-               DEBUG(10,("create_rpc_reply: auth\n"));
-               if (auth_len != 16)
-               {
-                       return False;
-               }
+       uint32 data_space_available;
+       uint32 data_len_left;
+       prs_struct outgoing_pdu;
+       uint32 data_pos;
+
+       /*
+        * If we're in the fault state, keep returning fault PDU's until
+        * the pipe gets closed. JRA.
+        */
+
+       if(p->fault_state) {
+               setup_fault_pdu(p, NT_STATUS(0x1c010002));
+               return True;
        }
 
-       prs_init(&p->rhdr , 0x18, 4, 0, False);
-       prs_init(&p->rauth, 1024, 4, 0, False);
-       prs_init(&p->rverf, 0x10, 4, 0, False);
+       memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
 
-       p->hdr.pkt_type = RPC_RESPONSE; /* mark header as an rpc response */
+       /* Change the incoming request header to a response. */
+       p->hdr.pkt_type = RPC_RESPONSE;
 
-       /* set up rpc header (fragmentation issues) */
-       if (data_start == 0)
-       {
+       /* Set up rpc header flags. */
+       if (p->out_data.data_sent_length == 0)
                p->hdr.flags = RPC_FLG_FIRST;
-       }
        else
-       {
                p->hdr.flags = 0;
-       }
 
-       p->hdr_resp.alloc_hint = data_end - data_start; /* calculate remaining data to be sent */
+       /*
+        * Work out how much we can fit in a single PDU.
+        */
 
-       if (p->hdr_resp.alloc_hint + 0x18 <= p->hdr_ba.bba.max_tsize)
-       {
-               p->hdr.flags |= RPC_FLG_LAST;
-               p->hdr.frag_len = p->hdr_resp.alloc_hint + 0x18;
-       }
-       else
-       {
-               p->hdr.frag_len = p->hdr_ba.bba.max_tsize;
-       }
+       data_space_available = sizeof(p->out_data.current_pdu) - RPC_HEADER_LEN - RPC_HDR_RESP_LEN;
+       if(p->ntlmssp_auth_validated)
+               data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NTLMSSP_CHK_LEN);
 
-       if (p->ntlmssp_auth)
-       {
-               p->hdr_resp.alloc_hint -= auth_len + 8;
+       /*
+        * The amount we send is the minimum of the available
+        * space and the amount left to send.
+        */
+
+       data_len_left = prs_offset(&p->out_data.rdata) - p->out_data.data_sent_length;
+
+       /*
+        * Ensure there really is data left to send.
+        */
+
+       if(!data_len_left) {
+               DEBUG(0,("create_next_pdu: no data left to send !\n"));
+               return False;
        }
 
-       if (p->ntlmssp_auth)
-       {
-               data_len = p->hdr.frag_len - auth_len - (auth_verify ? 8 : 0) - 0x18;
+       data_len = MIN(data_len_left, data_space_available);
+
+       /*
+        * Set up the alloc hint. This should be the data left to
+        * send.
+        */
+
+       hdr_resp.alloc_hint = data_len_left;
+
+       /*
+        * Set up the header lengths.
+        */
+
+       if (p->ntlmssp_auth_validated) {
+               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 {
+               p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len;
+               p->hdr.auth_len = 0;
        }
-       else
-       {
-               data_len = p->hdr.frag_len - 0x18;
+
+       /*
+        * Work out if this PDU will be the last.
+        */
+
+       if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata))
+               p->hdr.flags |= RPC_FLG_LAST;
+
+       /*
+        * Init the parse struct to point at the outgoing
+        * data.
+        */
+
+       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;
        }
 
-       p->rhdr.data->offset.start = 0;
-       p->rhdr.data->offset.end   = 0x18;
+       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;
+       }
 
-       /* store the header in the data stream */
-       smb_io_rpc_hdr     ("hdr" , &(p->hdr     ), &(p->rhdr), 0);
-       smb_io_rpc_hdr_resp("resp", &(p->hdr_resp), &(p->rhdr), 0);
+       /* Store the current offset. */
+       data_pos = prs_offset(&outgoing_pdu);
 
-       /* don't use rdata: use rdata_i instead, which moves... */
-       /* make a pointer to the rdata data, NOT A COPY */
+       /* Copy the data into the PDU. */
 
-       p->rdata_i.data = NULL;
-       prs_init(&p->rdata_i, 0, p->rdata.align, p->rdata.data->margin, p->rdata.io);
-       data = mem_data(&(p->rdata.data), data_start);
-       mem_create(p->rdata_i.data, data, 0, data_len, 0, False); 
-       p->rdata_i.offset = 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;
+       }
 
-       if (auth_len > 0)
-       {
+       if (p->hdr.auth_len > 0) {
                uint32 crc32 = 0;
+               char *data;
 
-               DEBUG(5,("create_rpc_reply: sign: %s seal: %s data %d auth %d\n",
-                        BOOLSTR(auth_verify), BOOLSTR(auth_seal), data_len, auth_len));
+               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));
 
-               if (auth_seal)
-               {
-                       crc32 = crc32_calc_buffer(data_len, data);
+               /*
+                * 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);
                }
 
-               if (auth_seal || auth_verify)
-               {
-                       make_rpc_hdr_auth(&p->auth_info, 0x0a, 0x06, 0x08, (auth_verify ? 1 : 0));
-                       smb_io_rpc_hdr_auth("hdr_auth", &p->auth_info, &p->rauth, 0);
+               if (auth_seal || auth_verify) {
+                       RPC_HDR_AUTH auth_info;
+
+                       init_rpc_hdr_auth(&auth_info, NTLMSSP_AUTH_TYPE, NTLMSSP_AUTH_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;
+                       }
                }
 
-               if (auth_verify)
-               {
-                       char *auth_data;
+               if (auth_verify) {
+                       RPC_AUTH_NTLMSSP_CHK ntlmssp_chk;
+                       char *auth_data = prs_data_p(&outgoing_pdu);
+
                        p->ntlmssp_seq_num++;
-                       make_rpc_auth_ntlmssp_chk(&p->ntlmssp_chk, NTLMSSP_SIGN_VERSION, crc32, p->ntlmssp_seq_num++);
-                       smb_io_rpc_auth_ntlmssp_chk("auth_sign", &(p->ntlmssp_chk), &p->rverf, 0);
-                       auth_data = mem_data(&p->rverf.data, 4);
-                       NTLMSSPcalc_p(p, (uchar*)auth_data, 12);
+                       init_rpc_auth_ntlmssp_chk(&ntlmssp_chk, NTLMSSP_SIGN_VERSION,
+                                       crc32, p->ntlmssp_seq_num++);
+                       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);
                }
        }
 
-       /* set up the data chain */
-       if (p->ntlmssp_auth)
-       {
-               prs_link(NULL       , &p->rhdr   , &p->rdata_i);
-               prs_link(&p->rhdr   , &p->rdata_i, &p->rauth  );
-               prs_link(&p->rdata_i, &p->rauth  , &p->rverf  );
-               prs_link(&p->rauth  , &p->rverf  , NULL       );
-       }
-       else
-       {
-               prs_link(NULL    , &p->rhdr   , &p->rdata_i);
-               prs_link(&p->rhdr, &p->rdata_i, NULL       );
-       }
+       /*
+        * Setup the counts for this PDU.
+        */
+
+       p->out_data.data_sent_length += data_len;
+       p->out_data.current_pdu_len = p->hdr.frag_len;
+       p->out_data.current_pdu_sent = 0;
 
-       return p->rhdr.data != NULL && p->rhdr.offset == 0x18;
+       prs_mem_free(&outgoing_pdu);
+       return True;
 }
 
-static BOOL api_pipe_ntlmssp_verify(pipes_struct *p)
+/*******************************************************************
+ 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.
+ The initial challenge is stored in p->challenge.
+ *******************************************************************/
+
+static BOOL api_pipe_ntlmssp_verify(pipes_struct *p, RPC_AUTH_NTLMSSP_RESP *ntlmssp_resp)
 {
-       uchar *pwd = NULL;
-       uchar null_pwd[16];
        uchar lm_owf[24];
        uchar nt_owf[128];
-       size_t lm_owf_len;
-       size_t nt_owf_len;
-       size_t usr_len;
-       size_t dom_len;
-       size_t wks_len;
-       BOOL anonymous = False;
-
-       struct smb_passwd *smb_pass = NULL;
-       
-       user_struct *vuser = get_valid_user_struct(p->vuid);
+       int nt_pw_len;
+       int lm_pw_len;
+       fstring user_name;
+       fstring domain;
+       fstring wks;
 
-       memset(null_pwd, 0, sizeof(null_pwd));
+       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"));
 
-       if (vuser == NULL)
-       {
-               DEBUG(0,("get user struct %d failed\n", p->vuid));
-               return False;
+       memset(p->user_name, '\0', sizeof(p->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.
+        */
+
+       /*
+        * We always negotiate UNICODE.
+        */
+
+       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 {
+               pull_ascii_fstring(user_name, ntlmssp_resp->user);
+               pull_ascii_fstring(domain, ntlmssp_resp->domain);
+               pull_ascii_fstring(wks, ntlmssp_resp->wks);
        }
 
-       lm_owf_len = p->ntlmssp_resp.hdr_lm_resp.str_str_len;
-       nt_owf_len = p->ntlmssp_resp.hdr_nt_resp.str_str_len;
-       usr_len    = p->ntlmssp_resp.hdr_usr    .str_str_len;
-       dom_len    = p->ntlmssp_resp.hdr_domain .str_str_len;
-       wks_len    = p->ntlmssp_resp.hdr_wks    .str_str_len;
-
-       if (lm_owf_len == 0 && nt_owf_len == 0 &&
-           usr_len == 0 && dom_len == 0 && wks_len == 0)
-       {
-               anonymous = True;
-       }
-       else
-       {
-               if (lm_owf_len == 0) return False;
-               if (nt_owf_len == 0) return False;
-               if (p->ntlmssp_resp.hdr_usr    .str_str_len == 0) return False;
-               if (p->ntlmssp_resp.hdr_domain .str_str_len == 0) return False;
-               if (p->ntlmssp_resp.hdr_wks    .str_str_len == 0) return False;
-       }
+       DEBUG(5,("user: %s domain: %s wks: %s\n", user_name, domain, wks));
 
-       if (lm_owf_len > sizeof(lm_owf)) return False;
-       if (nt_owf_len > sizeof(nt_owf)) return False;
+       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, p->ntlmssp_resp.lm_resp, sizeof(lm_owf));
-       memcpy(nt_owf, p->ntlmssp_resp.nt_resp, sizeof(nt_owf));
+       memcpy(lm_owf, ntlmssp_resp->lm_resp, sizeof(lm_owf));
+       memcpy(nt_owf, ntlmssp_resp->nt_resp, nt_pw_len);
 
 #ifdef DEBUG_PASSWORD
        DEBUG(100,("lm, nt owfs, chal\n"));
-       dump_data(100, lm_owf, sizeof(lm_owf));
-       dump_data(100, nt_owf, sizeof(nt_owf));
-       dump_data(100, p->ntlmssp_chal.challenge, 8);
+       dump_data(100, (char *)lm_owf, sizeof(lm_owf));
+       dump_data(100, (char *)nt_owf, nt_pw_len);
+       dump_data(100, (char *)p->challenge, 8);
 #endif
 
-       memset(p->user_name, 0, sizeof(p->user_name));
-       memset(p->domain   , 0, sizeof(p->domain   ));
-       memset(p->wks      , 0, sizeof(p->wks      ));
+       /*
+        * Allow guest access. Patch from Shirish Kalele <kalele@veritas.com>.
+        */
 
-       if (IS_BITS_SET_ALL(p->ntlmssp_chal.neg_flags, NTLMSSP_NEGOTIATE_UNICODE))
-       {
-               unibuf_to_ascii(p->user_name, p->ntlmssp_resp.user,
-                               MIN(p->ntlmssp_resp.hdr_usr   .str_str_len/2,
-                                   sizeof(p->user_name)-1));
-               unibuf_to_ascii(p->domain   , p->ntlmssp_resp.domain,
-                               MIN(p->ntlmssp_resp.hdr_domain.str_str_len/2,
-                                   sizeof(p->domain   )-1));
-               unibuf_to_ascii(p->wks      , p->ntlmssp_resp.wks,
-                               MIN(p->ntlmssp_resp.hdr_wks   .str_str_len/2,
-                                   sizeof(p->wks      )-1));
-       }
-       else
-       {
-               fstrcpy(p->user_name, p->ntlmssp_resp.user  );
-               fstrcpy(p->domain   , p->ntlmssp_resp.domain);
-               fstrcpy(p->wks      , p->ntlmssp_resp.wks   );
-       }
+       if (*user_name) {
 
+               /* 
+                * Do the length checking only if user is not NULL.
+                */
+
+               if (ntlmssp_resp->hdr_lm_resp.str_str_len == 0)
+                       return False;
+               if (ntlmssp_resp->hdr_nt_resp.str_str_len == 0)
+                       return False;
+               if (ntlmssp_resp->hdr_usr.str_str_len == 0)
+                       return False;
+               if (ntlmssp_resp->hdr_domain.str_str_len == 0)
+                       return False;
+               if (ntlmssp_resp->hdr_wks.str_str_len == 0)
+                       return False;
 
-       if (anonymous)
-       {
-               DEBUG(5,("anonymous user session\n"));
-               mdfour(vuser->dc.user_sess_key, null_pwd, 16);
-               pwd = null_pwd;
-               p->ntlmssp_validated = True;
        }
-       else
-       {
-               DEBUG(5,("user: %s domain: %s wks: %s\n", p->user_name, p->domain, p->wks));
-               become_root(True);
-               smb_pass = getsmbpwnam(p->user_name);
-               p->ntlmssp_validated = pass_check_smb(smb_pass, p->domain,
-                                     (uchar*)p->ntlmssp_chal.challenge,
-                                     lm_owf, lm_owf_len,
-                                     nt_owf, nt_owf_len,
-                                     NULL, vuser->dc.user_sess_key);
-               unbecome_root(True);
-
-               if (smb_pass != NULL)
-               {
-                       pwd = smb_pass->smb_passwd;
-               }
+       
+       make_auth_context_fixed(&auth_context, (uchar*)p->challenge);
+
+       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;
+       }
+       
+       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;
        }
 
-       if (p->ntlmssp_validated && pwd != NULL)
+       /*
+        * Set up the sign/seal data.
+        */
+
        {
                uchar p24[24];
-               NTLMSSPOWFencrypt(pwd, lm_owf, p24);
+               NTLMSSPOWFencrypt(server_info->first_8_lm_hash, lm_owf, p24);
                {
                        unsigned char j = 0;
                        int ind;
@@ -330,12 +386,9 @@ static BOOL api_pipe_ntlmssp_verify(pipes_struct *p)
                        k2[7] = 0xb0;
 
                        for (ind = 0; ind < 256; ind++)
-                       {
                                p->ntlmssp_hash[ind] = (unsigned char)ind;
-                       }
 
-                       for( ind = 0; ind < 256; ind++)
-                       {
+                       for( ind = 0; ind < 256; ind++) {
                                unsigned char tc;
 
                                j += (p->ntlmssp_hash[ind] + k2[ind%8]);
@@ -348,318 +401,753 @@ static BOOL api_pipe_ntlmssp_verify(pipes_struct *p)
                        p->ntlmssp_hash[256] = 0;
                        p->ntlmssp_hash[257] = 0;
                }
+/*             NTLMSSPhash(p->ntlmssp_hash, p24); */
                p->ntlmssp_seq_num = 0;
-       }
-       else
-       {
-               p->ntlmssp_validated = False;
+
        }
 
-       return p->ntlmssp_validated;
-}
+       fstrcpy(p->user_name, user_name);
+       fstrcpy(p->pipe_user_name, pdb_get_username(server_info->sam_account));
+       fstrcpy(p->domain, domain);
+       fstrcpy(p->wks, wks);
 
-static BOOL api_pipe_ntlmssp(pipes_struct *p, prs_struct *pd)
-{
-       /* receive a negotiate; send a challenge; receive a response */
-       switch (p->auth_verifier.msg_type)
-       {
-               case NTLMSSP_NEGOTIATE:
-               {
-                       smb_io_rpc_auth_ntlmssp_neg("", &p->ntlmssp_neg, pd, 0);
-                       break;
-               }
-               case NTLMSSP_AUTH:
-               {
-                       smb_io_rpc_auth_ntlmssp_resp("", &p->ntlmssp_resp, pd, 0);
-                       if (!api_pipe_ntlmssp_verify(p))
-                       {
-                               pd->offset = 0;
-                       }
-                       break;
-               }
-               default:
-               {
-                       /* NTLMSSP expected: unexpected message type */
-                       DEBUG(3,("unexpected message type in NTLMSSP %d\n",
-                                 p->auth_verifier.msg_type));
+       /*
+        * Store the UNIX credential data (uid/gid pair) in the pipe structure.
+        */
+
+       if (!IS_SAM_UNIX_USER(server_info->sam_account)) {
+               DEBUG(0,("Attempted authenticated pipe with invalid user.  No uid/gid in SAM_ACCOUNT\n"));
+               free_server_info(&server_info);
+               return False;
+       }
+       
+       memcpy(p->session_key, server_info->session_key, sizeof(p->session_key));
+
+       p->pipe_user.uid = pdb_get_uid(server_info->sam_account);
+       p->pipe_user.gid = pdb_get_gid(server_info->sam_account);
+       
+       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;
                }
        }
 
-       return (pd->offset != 0);
+       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;
 }
 
+/*******************************************************************
+ The switch table for the pipe names and the functions to handle them.
+ *******************************************************************/
+
 struct api_cmd
 {
-  char * pipe_clnt_name;
-  char * pipe_srv_name;
-  BOOL (*fn) (pipes_struct *, prs_struct *);
+  const char *name;
+  int (*init)(void);
 };
 
 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 },
-    { "browser",  "ntsvcs",  api_brs_rpc },
-    { "svcctl",   "ntsvcs",  api_svcctl_rpc },
-    { "NETLOGON", "lsass",   api_netlog_rpc },
-    { "winreg",   "winreg",  api_reg_rpc },
-    { "spoolss",  "spoolss", api_spoolss_rpc },
-    { NULL,       NULL,      NULL }
+#ifndef RPC_LSA_DYNAMIC
+    { "lsarpc",   rpc_lsa_init },
+#endif
+#ifndef RPC_SAMR_DYNAMIC
+    { "samr",     rpc_samr_init },
+#endif
+#ifndef RPC_SVC_DYNAMIC
+    { "srvsvc",   rpc_srv_init },
+#endif
+#ifndef RPC_WKS_DYNAMIC
+    { "wkssvc",   rpc_wks_init },
+#endif
+#ifndef RPC_NETLOG_DYNAMIC
+    { "NETLOGON", rpc_net_init },
+#endif
+#ifndef RPC_REG_DYNAMIC
+    { "winreg",   rpc_reg_init },
+#endif
+#ifndef RPC_SPOOLSS_DYNAMIC
+    { "spoolss",  rpc_spoolss_init },
+#endif
+#ifndef RPC_DFS_DYNAMIC
+    { "netdfs",   rpc_dfs_init },
+#endif
+    { NULL, NULL }
+};
+
+struct rpc_table
+{
+  struct
+  {
+    const char *clnt;
+    const char *srv;
+  } pipe;
+  struct api_struct *cmds;
+  int n_cmds;
 };
 
-static BOOL api_pipe_bind_auth_resp(pipes_struct *p, prs_struct *pd)
+static struct rpc_table *rpc_lookup;
+static int rpc_lookup_size;
+
+/*******************************************************************
+ This is the client reply to our challenge for an authenticated 
+ bind request. The challenge we sent is in p->challenge.
+*******************************************************************/
+
+BOOL api_pipe_bind_auth_resp(pipes_struct *p, prs_struct *rpc_in_p)
 {
+       RPC_HDR_AUTHA autha_info;
+       RPC_AUTH_VERIFIER auth_verifier;
+       RPC_AUTH_NTLMSSP_RESP ntlmssp_resp;
+
        DEBUG(5,("api_pipe_bind_auth_resp: decode request. %d\n", __LINE__));
 
-       if (p->hdr.auth_len == 0) return False;
+       if (p->hdr.auth_len == 0) {
+               DEBUG(0,("api_pipe_bind_auth_resp: No auth field sent !\n"));
+               return False;
+       }
+
+       /*
+        * Decode the authentication verifier response.
+        */
+
+       if(!smb_io_rpc_hdr_autha("", &autha_info, rpc_in_p, 0)) {
+               DEBUG(0,("api_pipe_bind_auth_resp: unmarshall of RPC_HDR_AUTHA failed.\n"));
+               return False;
+       }
+
+       if (autha_info.auth_type != NTLMSSP_AUTH_TYPE || autha_info.auth_level != NTLMSSP_AUTH_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;
+       }
+
+       if(!smb_io_rpc_auth_verifier("", &auth_verifier, rpc_in_p, 0)) {
+               DEBUG(0,("api_pipe_bind_auth_resp: unmarshall of RPC_AUTH_VERIFIER failed.\n"));
+               return False;
+       }
 
-       /* decode the authentication verifier response */
-       smb_io_rpc_hdr_autha("", &p->autha_info, pd, 0);
-       if (pd->offset == 0) return False;
+       /*
+        * Ensure this is a NTLMSSP_AUTH packet type.
+        */
 
-       if (!rpc_hdr_auth_chk(&(p->auth_info))) return False;
+       if (!rpc_auth_verifier_chk(&auth_verifier, "NTLMSSP", NTLMSSP_AUTH)) {
+               DEBUG(0,("api_pipe_bind_auth_resp: rpc_auth_verifier_chk failed.\n"));
+               return False;
+       }
 
-       smb_io_rpc_auth_ntlmssp_verifier("", &p->auth_verifier, pd, 0);
-       if (pd->offset == 0) return False;
+       if(!smb_io_rpc_auth_ntlmssp_resp("", &ntlmssp_resp, rpc_in_p, 0)) {
+               DEBUG(0,("api_pipe_bind_auth_resp: Failed to unmarshall RPC_AUTH_NTLMSSP_RESP.\n"));
+               return False;
+       }
 
-       if (!rpc_auth_ntlmssp_verifier_chk(&(p->auth_verifier), "NTLMSSP", NTLMSSP_AUTH)) return False;
+       /*
+        * The following call actually checks the challenge/response data.
+        * for correctness against the given DOMAIN\user name.
+        */
        
-       return api_pipe_ntlmssp(p, pd);
+       if (!api_pipe_ntlmssp_verify(p, &ntlmssp_resp))
+               return False;
+
+       p->pipe_bound = True
+;
+       return True;
 }
 
-static BOOL api_pipe_fault_resp(pipes_struct *p, prs_struct *pd, uint32 status)
+/*******************************************************************
+ Marshall a bind_nak pdu.
+*******************************************************************/
+
+static BOOL setup_bind_nak(pipes_struct *p)
 {
-       DEBUG(5,("api_pipe_fault_resp: make response\n"));
+       prs_struct outgoing_rpc;
+       RPC_HDR nak_hdr;
+       uint16 zero = 0;
+
+       /* Free any memory in the current return data buffer. */
+       prs_mem_free(&p->out_data.rdata);
+
+       /*
+        * Marshall directly into the outgoing PDU space. We
+        * must do this as we need to set to the bind response
+        * header and are never sending more than one PDU here.
+        */
+
+       prs_init( &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);
 
-       prs_init(&(p->rhdr     ), 0x18, 4, 0, False);
-       prs_init(&(p->rfault   ), 0x8 , 4, 0, False);
 
-       /***/
-       /*** set up the header, response header and fault status ***/
-       /***/
+       /*
+        * Initialize a bind_nak header.
+        */
 
-       p->hdr_fault.status   = status;
-       p->hdr_fault.reserved = 0x0;
+       init_rpc_hdr(&nak_hdr, RPC_BINDNACK, RPC_FLG_FIRST | RPC_FLG_LAST,
+            p->hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
 
-       p->hdr_resp.alloc_hint   = 0x0;
-       p->hdr_resp.cancel_count = 0x0;
-       p->hdr_resp.reserved     = 0x0;
+       /*
+        * Marshall the header into the outgoing PDU.
+        */
 
-       make_rpc_hdr(&p->hdr, RPC_FAULT, RPC_FLG_NOCALL | RPC_FLG_FIRST | RPC_FLG_LAST,
-                    p->hdr.call_id,
-                    0x20,
-                    0);
+       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;
+       }
+
+       /*
+        * Now add the reject reason.
+        */
 
-       smb_io_rpc_hdr      ("hdr"  , &(p->hdr      ), &(p->rhdr), 0);
-       smb_io_rpc_hdr_resp ("resp" , &(p->hdr_resp ), &(p->rhdr), 0);
-       smb_io_rpc_hdr_fault("fault", &(p->hdr_fault), &(p->rfault), 0);
-       mem_realloc_data(p->rhdr.data, p->rhdr.offset);
-       mem_realloc_data(p->rfault.data, p->rfault.offset);
+       if(!prs_uint16("reject code", &outgoing_rpc, 0, &zero)) {
+               prs_mem_free(&outgoing_rpc);
+        return False;
+       }
 
-       /***/
-       /*** link rpc header and fault together ***/
-       /***/
+       p->out_data.data_sent_length = 0;
+       p->out_data.current_pdu_len = prs_offset(&outgoing_rpc);
+       p->out_data.current_pdu_sent = 0;
 
-       prs_link(NULL    , &p->rhdr  , &p->rfault);
-       prs_link(&p->rhdr, &p->rfault, NULL      );
+       p->pipe_bound = False;
 
        return True;
 }
 
-static BOOL api_pipe_bind_and_alt_req(pipes_struct *p, prs_struct *pd, enum RPC_PKT_TYPE pkt_type)
+/*******************************************************************
+ Marshall a fault pdu.
+*******************************************************************/
+
+BOOL setup_fault_pdu(pipes_struct *p, NTSTATUS status)
 {
-       uint16 assoc_gid;
-       fstring ack_pipe_name;
-       int i = 0;
+       prs_struct outgoing_pdu;
+       RPC_HDR fault_hdr;
+       RPC_HDR_RESP hdr_resp;
+       RPC_HDR_FAULT fault_resp;
 
-       p->ntlmssp_auth = False;
+       /* Free any memory in the current return data buffer. */
+       prs_mem_free(&p->out_data.rdata);
 
-       DEBUG(5,("api_pipe_bind_req: decode request. %d\n", __LINE__));
+       /*
+        * Marshall directly into the outgoing PDU space. We
+        * must do this as we need to set to the bind response
+        * header and are never sending more than one PDU here.
+        */
+
+       prs_init( &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);
+
+       /*
+        * Initialize a fault header.
+        */
+
+       init_rpc_hdr(&fault_hdr, RPC_FAULT, RPC_FLG_FIRST | RPC_FLG_LAST | RPC_FLG_NOCALL,
+            p->hdr.call_id, RPC_HEADER_LEN + RPC_HDR_RESP_LEN + RPC_HDR_FAULT_LEN, 0);
+
+       /*
+        * Initialize the HDR_RESP and FAULT parts of the PDU.
+        */
+
+       memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
+
+       fault_resp.status = status;
+       fault_resp.reserved = 0;
+
+       /*
+        * Marshall the header into the outgoing PDU.
+        */
+
+       if(!smb_io_rpc_hdr("", &fault_hdr, &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;
+       }
+
+       p->out_data.data_sent_length = 0;
+       p->out_data.current_pdu_len = prs_offset(&outgoing_pdu);
+       p->out_data.current_pdu_sent = 0;
+
+       prs_mem_free(&outgoing_pdu);
+       return True;
+}
 
-       for (i = 0; api_fd_commands[i].pipe_clnt_name; i++)
+/*******************************************************************
+ Ensure a bind request has the correct abstract & transfer interface.
+ Used to reject unknown binds from Win2k.
+*******************************************************************/
+
+BOOL check_bind_req(char* pipe_name, RPC_IFACE* abstract,
+                                       RPC_IFACE* transfer)
+{
+       extern struct pipe_id_info pipe_names[];
+       int i=0;
+       fstring pname;
+       fstrcpy(pname,"\\PIPE\\");
+       fstrcat(pname,pipe_name);
+
+       DEBUG(3,("check_bind_req for %s\n", pname));
+
+#ifndef SUPPORT_NEW_LSARPC_UUID
+
+       /* check for the first pipe matching the name */
+       
+       for ( i=0; pipe_names[i].client_pipe; i++ ) {
+               if ( strequal(pipe_names[i].client_pipe, pname) )
+                       break;
+       }
+#else
+       /* 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(api_fd_commands[i].pipe_clnt_name, p->name) &&
-                   api_fd_commands[i].fn != NULL)
+               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(RPC_UUID)) == 0)
+                       && (transfer->version == pipe_names[i].trans_syntax.version)
+                       && (memcmp(&transfer->uuid, &pipe_names[i].trans_syntax.uuid, sizeof(RPC_UUID)) == 0) )
                {
-                       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;
                }
        }
+#endif
+
+       if(pipe_names[i].client_pipe == NULL)
+               return False;
+
+#ifndef SUPPORT_NEW_LSARPC_UUID
+       /* 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;
+       }
+
+       /* 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;
+       }
+#endif
+       return True;
+}
+
+/*******************************************************************
+ Register commands to an RPC pipe
+*******************************************************************/
+int rpc_pipe_register_commands(const char *clnt, const char *srv, const struct api_struct *cmds, int size)
+{
+        struct rpc_table *rpc_entry;
+
+
+        /* 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 0;
+        } 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 size;
+}
+
+/*******************************************************************
+ Register commands to an RPC pipe
+*******************************************************************/
+int rpc_load_module(const char *module)
+{
+#ifdef HAVE_DLOPEN
+        void *handle;
+        int (*module_init)(void);
+        pstring full_path;
+        char *error;
+        
+        pstrcpy(full_path, lib_path("rpc"));
+        pstrcat(full_path, "/librpc_");
+        pstrcat(full_path, module);
+        pstrcat(full_path, ".");
+        pstrcat(full_path, shlib_ext());
+
+        handle = sys_dlopen(full_path, RTLD_LAZY);
+        if (!handle) {
+                DEBUG(0, ("Could not load requested pipe %s as %s\n", 
+                    module, full_path));
+                DEBUG(0, (" Error: %s\n", dlerror()));
+                return 0;
+        }
+        
+        DEBUG(3, ("Module '%s' loaded\n", full_path));
+        
+        module_init = sys_dlsym(handle, "rpc_pipe_init");
+        if ((error = sys_dlerror()) != NULL) {
+                DEBUG(0, ("Error trying to resolve symbol 'rpc_pipe_init' in %s: %s\n",
+                          full_path, error));
+                return 0;
+        }
+        
+        return module_init();
+#else
+        DEBUG(0,("Attempting to load a dynamic RPC pipe when dlopen isn't available\n"));
+        return 0;
+#endif
+}
+
+/*******************************************************************
+ Respond to a pipe bind request.
+*******************************************************************/
+
+BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
+{
+       RPC_HDR_BA hdr_ba;
+       RPC_HDR_RB hdr_rb;
+       RPC_HDR_AUTH auth_info;
+       uint16 assoc_gid;
+       fstring ack_pipe_name;
+       prs_struct out_hdr_ba;
+       prs_struct out_auth;
+       prs_struct outgoing_rpc;
+       int i = 0;
+       int auth_len = 0;
+       enum RPC_PKT_TYPE reply_pkt_type;
+
+       p->ntlmssp_auth_requested = False;
+
+       DEBUG(5,("api_pipe_bind_req: decode request. %d\n", __LINE__));
+
+       /*
+        * Try and find the correct pipe name to ensure
+        * that this is a pipe name we support.
+        */
+
+
+       for (i = 0; i < rpc_lookup_size; i++) {
+               if (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) return False;
+       if (i == rpc_lookup_size) {
+                for (i = 0; api_fd_commands[i].name; i++) {
+                       if (strequal(api_fd_commands[i].name, p->name)) {
+                               api_fd_commands[i].init();
+                               break;
+                       }
+                }
+
+                if (!api_fd_commands[i].name && !rpc_load_module(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;
+                       }
+                }
+       }
 
        /* decode the bind request */
-       smb_io_rpc_hdr_rb("", &p->hdr_rb, pd, 0);
+       if(!smb_io_rpc_hdr_rb("", &hdr_rb, rpc_in_p, 0))  {
+               DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_RB struct.\n"));
+               return False;
+       }
 
-       if (pd->offset == 0) return False;
+       /*
+        * Check if this is an authenticated request.
+        */
 
-       if (p->hdr.auth_len != 0)
-       {
-               /* decode the authentication verifier */
-               smb_io_rpc_hdr_auth    ("", &p->auth_info    , pd, 0);
-               if (pd->offset == 0) return False;
+       if (p->hdr.auth_len != 0) {
+               RPC_AUTH_VERIFIER auth_verifier;
+               RPC_AUTH_NTLMSSP_NEG ntlmssp_neg;
 
-               p->ntlmssp_auth = p->auth_info.auth_type = 0x0a;
+               /* 
+                * Decode the authentication verifier.
+                */
 
-               if (p->ntlmssp_auth)
-               {
-                       smb_io_rpc_auth_ntlmssp_verifier("", &p->auth_verifier, pd, 0);
-                       if (pd->offset == 0) return False;
+               if(!smb_io_rpc_hdr_auth("", &auth_info, rpc_in_p, 0)) {
+                       DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_AUTH struct.\n"));
+                       return False;
+               }
+
+               /*
+                * We only support NTLMSSP_AUTH_TYPE requests.
+                */
 
-                       p->ntlmssp_auth = strequal(p->auth_verifier.signature, "NTLMSSP");
+               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 (p->ntlmssp_auth)
-               {
-                       if (!api_pipe_ntlmssp(p, pd)) 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(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;
        }
 
-       switch (pkt_type)
-       {
-               case RPC_BINDACK:
-               {
+       switch(p->hdr.pkt_type) {
+               case RPC_BIND:
                        /* name has to be \PIPE\xxxxx */
                        fstrcpy(ack_pipe_name, "\\PIPE\\");
                        fstrcat(ack_pipe_name, p->pipe_srv_name);
+                       reply_pkt_type = RPC_BINDACK;
                        break;
-               }
-               case RPC_ALTCONTRESP:
-               {
+               case RPC_ALTCONT:
                        /* secondary address CAN be NULL
-                        * as the specs says it's ignored.
+                        * as the specs say it's ignored.
                         * It MUST NULL to have the spoolss working.
                         */
-                       fstrcpy(ack_pipe_name, "");
+                       fstrcpy(ack_pipe_name,"");
+                       reply_pkt_type = RPC_ALTCONTRESP;
                        break;
-               }
                default:
-               {
                        return False;
-               }
        }
 
        DEBUG(5,("api_pipe_bind_req: make response. %d\n", __LINE__));
 
-       prs_init(&(p->rdata), 1024, 4, 0, False);
-       prs_init(&(p->rhdr ), 0x18, 4, 0, False);
-       prs_init(&(p->rauth), 1024, 4, 0, False);
-       prs_init(&(p->rverf), 0x08, 4, 0, False);
-       prs_init(&(p->rntlm), 1024, 4, 0, False);
+       /* 
+        * Marshall directly into the outgoing PDU space. We
+        * must do this as we need to set to the bind response
+        * header and are never sending more than one PDU here.
+        */
 
-       /***/
-       /*** do the bind ack first ***/
-       /***/
+       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);
 
-       if (p->ntlmssp_auth)
-       {
-               assoc_gid = 0x7a77;
+       /*
+        * Setup the memory to marshall the ba header, and the
+        * auth footers.
+        */
+
+       if(!prs_init(&out_hdr_ba, 1024, p->mem_ctx, MARSHALL)) {
+               DEBUG(0,("api_pipe_bind_req: malloc out_hdr_ba failed.\n"));
+               prs_mem_free(&outgoing_rpc);
+               return False;
        }
-       else
-       {
-               assoc_gid = p->hdr_rb.bba.assoc_gid;
+
+       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;
        }
 
-       make_rpc_hdr_ba(&p->hdr_ba,
-                       p->hdr_rb.bba.max_tsize,
-                       p->hdr_rb.bba.max_rsize,
+       if (p->ntlmssp_auth_requested)
+               assoc_gid = 0x7a77;
+       else
+               assoc_gid = hdr_rb.bba.assoc_gid ? hdr_rb.bba.assoc_gid : 0x53f0;
+
+       /*
+        * Create the bind response struct.
+        */
+
+       /* If the requested abstract synt uuid doesn't match our client pipe,
+               reject the bind_ack & set the transfer interface synt to all 0's,
+               ver 0 (observed when NT5 attempts to bind to abstract interfaces
+               unknown to NT4)
+               Needed when adding entries to a DACL from NT5 - SK */
+
+       if(check_bind_req(p->name, &hdr_rb.abstract, &hdr_rb.transfer)) {
+               init_rpc_hdr_ba(&hdr_ba,
+                       MAX_PDU_FRAG_LEN,
+                       MAX_PDU_FRAG_LEN,
                        assoc_gid,
                        ack_pipe_name,
                        0x1, 0x0, 0x0,
-                       &(p->hdr_rb.transfer));
+                       &hdr_rb.transfer);
+       } else {
+               RPC_IFACE null_interface;
+               ZERO_STRUCT(null_interface);
+               /* Rejection reason: abstract syntax not supported */
+               init_rpc_hdr_ba(&hdr_ba, MAX_PDU_FRAG_LEN,
+                                       MAX_PDU_FRAG_LEN, assoc_gid,
+                                       ack_pipe_name, 0x1, 0x2, 0x1,
+                                       &null_interface);
+       }
+
+       /*
+        * and marshall it.
+        */
 
-       smb_io_rpc_hdr_ba("", &p->hdr_ba, &p->rdata, 0);
-       mem_realloc_data(p->rdata.data, p->rdata.offset);
+       if(!smb_io_rpc_hdr_ba("", &hdr_ba, &out_hdr_ba, 0)) {
+               DEBUG(0,("api_pipe_bind_req: marshalling of RPC_HDR_BA failed.\n"));
+               goto err_exit;
+       }
 
-       /***/
-       /*** now the authentication ***/
-       /***/
+       /*
+        * Now the authentication.
+        */
 
-       if (p->ntlmssp_auth)
-       {
-               uint8 challenge[8];
-               generate_random_buffer(challenge, 8, False);
+       if (p->ntlmssp_auth_requested) {
+               RPC_AUTH_VERIFIER auth_verifier;
+               RPC_AUTH_NTLMSSP_CHAL ntlmssp_chal;
+
+               generate_random_buffer(p->challenge, 8, False);
 
-               /*** authentication info ***/
+               /*** Authentication info ***/
 
-               make_rpc_hdr_auth(&p->auth_info, 0x0a, 0x06, 0, 1);
-               smb_io_rpc_hdr_auth("", &p->auth_info, &p->rverf, 0);
-               mem_realloc_data(p->rverf.data, p->rverf.offset);
+               init_rpc_hdr_auth(&auth_info, NTLMSSP_AUTH_TYPE, NTLMSSP_AUTH_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;
+               }
 
                /*** NTLMSSP verifier ***/
 
-               make_rpc_auth_ntlmssp_verifier(&p->auth_verifier,
-                                      "NTLMSSP", NTLMSSP_CHALLENGE);
-               smb_io_rpc_auth_ntlmssp_verifier("", &p->auth_verifier, &p->rauth, 0);
-               mem_realloc_data(p->rauth.data, p->rauth.offset);
+               init_rpc_auth_verifier(&auth_verifier, "NTLMSSP", NTLMSSP_CHALLENGE);
+               if(!smb_io_rpc_auth_verifier("", &auth_verifier, &out_auth, 0)) {
+                       DEBUG(0,("api_pipe_bind_req: marshalling of RPC_AUTH_VERIFIER failed.\n"));
+                       goto err_exit;
+               }
 
                /* NTLMSSP challenge ***/
 
-               make_rpc_auth_ntlmssp_chal(&p->ntlmssp_chal,
-                                          0x000082b1, challenge);
-               smb_io_rpc_auth_ntlmssp_chal("", &p->ntlmssp_chal, &p->rntlm, 0);
-               mem_realloc_data(p->rntlm.data, p->rntlm.offset);
+               init_rpc_auth_ntlmssp_chal(&ntlmssp_chal, p->ntlmssp_chal_flags, p->challenge);
+               if(!smb_io_rpc_auth_ntlmssp_chal("", &ntlmssp_chal, &out_auth, 0)) {
+                       DEBUG(0,("api_pipe_bind_req: marshalling of RPC_AUTH_NTLMSSP_CHAL failed.\n"));
+                       goto err_exit;
+               }
+
+               /* Auth len in the rpc header doesn't include auth_header. */
+               auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
        }
 
-       /***/
-       /*** then do the header, now we know the length ***/
-       /***/
+       /*
+        * Create the header, now we know the length.
+        */
 
-       make_rpc_hdr(&p->hdr, pkt_type, RPC_FLG_FIRST | RPC_FLG_LAST,
-                    p->hdr.call_id,
-                    p->rdata.offset + p->rverf.offset + p->rauth.offset + p->rntlm.offset + 0x10,
-                    p->rauth.offset + p->rntlm.offset);
+       init_rpc_hdr(&p->hdr, reply_pkt_type, RPC_FLG_FIRST | RPC_FLG_LAST,
+                       p->hdr.call_id,
+                       RPC_HEADER_LEN + prs_offset(&out_hdr_ba) + prs_offset(&out_auth),
+                       auth_len);
 
-       smb_io_rpc_hdr("", &p->hdr, &p->rhdr, 0);
-       mem_realloc_data(p->rhdr.data, p->rdata.offset);
+       /*
+        * Marshall the header into the outgoing PDU.
+        */
 
-       /***/
-       /*** link rpc header, bind acknowledgment and authentication responses ***/
-       /***/
+       if(!smb_io_rpc_hdr("", &p->hdr, &outgoing_rpc, 0)) {
+               DEBUG(0,("pi_pipe_bind_req: marshalling of RPC_HDR failed.\n"));
+               goto err_exit;
+       }
 
-       if (p->ntlmssp_auth)
-       {
-               prs_link(NULL     , &p->rhdr , &p->rdata);
-               prs_link(&p->rhdr , &p->rdata, &p->rverf);
-               prs_link(&p->rdata, &p->rverf, &p->rauth);
-               prs_link(&p->rverf, &p->rauth, &p->rntlm);
-               prs_link(&p->rauth, &p->rntlm, NULL     );
+       /*
+        * Now add the RPC_HDR_BA and any auth needed.
+        */
+
+       if(!prs_append_prs_data( &outgoing_rpc, &out_hdr_ba)) {
+               DEBUG(0,("api_pipe_bind_req: append of RPC_HDR_BA failed.\n"));
+               goto err_exit;
        }
-       else
-       {
-               prs_link(NULL    , &p->rhdr , &p->rdata);
-               prs_link(&p->rhdr, &p->rdata, NULL     );
+
+       if(p->ntlmssp_auth_requested && !prs_append_prs_data( &outgoing_rpc, &out_auth)) {
+               DEBUG(0,("api_pipe_bind_req: append of auth info failed.\n"));
+               goto err_exit;
        }
 
+       if(!p->ntlmssp_auth_requested)
+               p->pipe_bound = True;
+
+       /*
+        * Setup the lengths for the initial reply.
+        */
+
+       p->out_data.data_sent_length = 0;
+       p->out_data.current_pdu_len = prs_offset(&outgoing_rpc);
+       p->out_data.current_pdu_sent = 0;
+
+       prs_mem_free(&out_hdr_ba);
+       prs_mem_free(&out_auth);
+
        return True;
-}
 
-/*
- * The RPC Alter-Context call is used only by the spoolss pipe
- * simply because there is a bug (?) in the MS unmarshalling code
- * or in the marshalling code. If it's in the later, then Samba
- * have the same bug.
- */
-static BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *pd)
-{
-       return api_pipe_bind_and_alt_req(p, pd, RPC_BINDACK);
-}
+  err_exit:
 
-static BOOL api_pipe_alt_req(pipes_struct *p, prs_struct *pd)
-{
-       return api_pipe_bind_and_alt_req(p, pd, RPC_ALTCONTRESP);
+       prs_mem_free(&outgoing_rpc);
+       prs_mem_free(&out_hdr_ba);
+       prs_mem_free(&out_auth);
+       return False;
 }
 
-static BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *pd)
+/****************************************************************************
+ Deal with sign & seal processing on an RPC request.
+****************************************************************************/
+
+BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *rpc_in)
 {
-       BOOL auth_verify = IS_BITS_SET_ALL(p->ntlmssp_chal.neg_flags, NTLMSSP_NEGOTIATE_SIGN);
-       BOOL auth_seal   = IS_BITS_SET_ALL(p->ntlmssp_chal.neg_flags, NTLMSSP_NEGOTIATE_SEAL);
+       /*
+        * We always negotiate the following two bits....
+        */
+       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;
@@ -667,203 +1155,250 @@ static BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *pd)
 
        auth_len = p->hdr.auth_len;
 
-       if (auth_len != 16 && auth_verify)
-       {
+       if ((auth_len != RPC_AUTH_NTLMSSP_CHK_LEN) && auth_verify) {
+               DEBUG(0,("api_pipe_auth_process: Incorrect auth_len %d.\n", auth_len ));
                return False;
        }
 
-       data_len = p->hdr.frag_len - auth_len - (auth_verify ? 8 : 0) - 0x18;
+       /*
+        * 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 - 
+                       (auth_verify ? RPC_HDR_AUTH_LEN : 0) - auth_len;
        
        DEBUG(5,("api_pipe_auth_process: sign: %s seal: %s data %d auth %d\n",
                 BOOLSTR(auth_verify), BOOLSTR(auth_seal), data_len, auth_len));
 
-       if (auth_seal)
-       {
-               char *data = mem_data(&pd->data, pd->offset);
-               DEBUG(5,("api_pipe_auth_process: data %d\n", pd->offset));
+       if (auth_seal) {
+               /*
+                * The data in rpc_in doesn't contain the RPC_HEADER as this
+                * has already been consumed.
+                */
+               char *data = prs_data_p(rpc_in) + RPC_HDR_REQ_LEN;
                NTLMSSPcalc_p(p, (uchar*)data, data_len);
-               crc32 = crc32_calc_buffer(data_len, data);
+               crc32 = crc32_calc_buffer(data, data_len);
        }
 
-       /*** skip the data, record the offset so we can restore it again */
-       old_offset = pd->offset;
+       old_offset = prs_offset(rpc_in);
 
-       if (auth_seal || auth_verify)
-       {
-               pd->offset += data_len;
-               smb_io_rpc_hdr_auth("hdr_auth", &p->auth_info, pd, 0);
-       }
+       if (auth_seal || auth_verify) {
+               RPC_HDR_AUTH auth_info;
 
-       if (auth_verify)
-       {
-               char *req_data = mem_data(&pd->data, pd->offset + 4);
-               DEBUG(5,("api_pipe_auth_process: auth %d\n", pd->offset + 4));
-               NTLMSSPcalc_p(p, (uchar*)req_data, 12);
-               smb_io_rpc_auth_ntlmssp_chk("auth_sign", &(p->ntlmssp_chk), pd, 0);
+               if(!prs_set_offset(rpc_in, old_offset + data_len)) {
+                       DEBUG(0,("api_pipe_auth_process: cannot move offset to %u.\n",
+                               (unsigned int)old_offset + data_len ));
+                       return False;
+               }
 
-               if (!rpc_auth_ntlmssp_chk(&(p->ntlmssp_chk), crc32,
-                                         p->ntlmssp_seq_num))
-               {
+               if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, rpc_in, 0)) {
+                       DEBUG(0,("api_pipe_auth_process: failed to unmarshall RPC_HDR_AUTH.\n"));
                        return False;
                }
        }
 
-       pd->offset = old_offset;
+       if (auth_verify) {
+               RPC_AUTH_NTLMSSP_CHK ntlmssp_chk;
+               char *req_data = prs_data_p(rpc_in) + prs_offset(rpc_in) + 4;
 
-       return True;
-}
+               DEBUG(5,("api_pipe_auth_process: auth %d\n", prs_offset(rpc_in) + 4));
 
-static BOOL api_pipe_request(pipes_struct *p, prs_struct *pd)
-{
-       int i = 0;
+               /*
+                * Ensure we have RPC_AUTH_NTLMSSP_CHK_LEN - 4 more bytes in the
+                * incoming buffer.
+                */
+               if(prs_mem_get(rpc_in, RPC_AUTH_NTLMSSP_CHK_LEN - 4) == NULL) {
+                       DEBUG(0,("api_pipe_auth_process: missing %d bytes in buffer.\n",
+                               RPC_AUTH_NTLMSSP_CHK_LEN - 4 ));
+                       return False;
+               }
 
-       if (p->ntlmssp_auth && p->ntlmssp_validated)
-       {
-               if (!api_pipe_auth_process(p, pd)) return False;
+               NTLMSSPcalc_p(p, (uchar*)req_data, RPC_AUTH_NTLMSSP_CHK_LEN - 4);
+               if(!smb_io_rpc_auth_ntlmssp_chk("auth_sign", &ntlmssp_chk, rpc_in, 0)) {
+                       DEBUG(0,("api_pipe_auth_process: failed to unmarshall RPC_AUTH_NTLMSSP_CHK.\n"));
+                       return False;
+               }
 
-               DEBUG(0,("api_pipe_request: **** MUST CALL become_user() HERE **** \n"));
-#if 0
-               become_user();
-#endif
+               if (!rpc_auth_ntlmssp_chk(&ntlmssp_chk, crc32, p->ntlmssp_seq_num)) {
+                       DEBUG(0,("api_pipe_auth_process: NTLMSSP check failed.\n"));
+                       return False;
+               }
        }
 
-       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));
-                       return api_fd_commands[i].fn(p, pd);
-               }
+       /*
+        * Return the current pointer to the data offset.
+        */
+
+       if(!prs_set_offset(rpc_in, old_offset)) {
+               DEBUG(0,("api_pipe_auth_process: failed to set offset back to %u\n",
+                       (unsigned int)old_offset ));
+               return False;
        }
-       return False;
+
+       return True;
 }
 
-BOOL rpc_command(pipes_struct *p, prs_struct *pd)
+/****************************************************************************
+ Return a user struct for a pipe user.
+****************************************************************************/
+
+struct current_user *get_current_user(struct current_user *user, pipes_struct *p)
 {
-       BOOL reply = False;
-       DEBUG(10,("rpc_command\n"));
+       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;
+}
 
-       if (pd->data == NULL) return False;
+/****************************************************************************
+ Find the correct RPC function to call for this request.
+ If the pipe is authenticated then become the correct UNIX user
+ before doing the call.
+****************************************************************************/
 
-       /* process the rpc header */
-       smb_io_rpc_hdr("", &p->hdr, pd, 0);
+BOOL api_pipe_request(pipes_struct *p)
+{
+       int i = 0;
+       BOOL ret = False;
 
-       if (pd->offset == 0) return False;
+       if (p->ntlmssp_auth_validated) {
 
-       switch (p->hdr.pkt_type)
-       {
-               case RPC_BIND   :
-               {
-                       reply = api_pipe_bind_req(p, pd);
-                       break;
-               }
-               case RPC_ALTCONT:
-               {
-                       reply = api_pipe_alt_req(p, pd);
-                       break;
-               }
-               case RPC_REQUEST:
-               {
-                       if (p->ntlmssp_auth && !p->ntlmssp_validated)
-                       {
-                               /* authentication _was_ requested
-                                  and it failed.  sorry, no deal!
-                                */
-                               reply = False;
-                       }
-                       else
-                       {
-                               /* read the rpc header */
-                               smb_io_rpc_hdr_req("req", &(p->hdr_req), pd, 0);
-                               reply = api_pipe_request(p, pd);
-                       }
-                       break;
-               }
-               case RPC_BINDRESP: /* not the real name! */
-               {
-                       reply = api_pipe_bind_auth_resp(p, pd);
-                       p->ntlmssp_auth = reply;
-                       break;
+               if(!become_authenticated_pipe_user(p)) {
+                       prs_mem_free(&p->out_data.rdata);
+                       return False;
                }
        }
 
-       if (!reply)
-       {
-               reply = api_pipe_fault_resp(p, pd, 0x1c010002);
+       DEBUG(5, ("Requested \\PIPE\\%s\n", p->name));
+
+       for (i = 0; i < rpc_lookup_size; i++) {
+               if (strequal(rpc_lookup[i].pipe.clnt, p->name)) {
+                        DEBUG(3,("Doing \\PIPE\\%s\n", 
+                                 rpc_lookup[i].pipe.clnt));
+                        set_current_rpc_talloc(p->mem_ctx);
+                        ret = api_rpcTNP(p, rpc_lookup[i].pipe.clnt,
+                                         rpc_lookup[i].cmds,
+                                         rpc_lookup[i].n_cmds);
+                        set_current_rpc_talloc(NULL);
+                        break;
+                }
        }
 
-       return reply;
-}
 
+       if (i == rpc_lookup_size) {
+               for (i = 0; api_fd_commands[i].name; i++) {
+                        if (strequal(api_fd_commands[i].name, p->name)) {
+                                api_fd_commands[i].init();
+                                break;
+                        }
+                }
+
+                if (!api_fd_commands[i].name) {
+                       rpc_load_module(p->name);
+                }
+
+                for (i = 0; i < rpc_lookup_size; i++) {
+                        if (strequal(rpc_lookup[i].pipe.clnt, p->name)) {
+                                DEBUG(3,("Doing \\PIPE\\%s\n",
+                                         rpc_lookup[i].pipe.clnt));
+                                set_current_rpc_talloc(p->mem_ctx);
+                                ret = api_rpcTNP(p, rpc_lookup[i].pipe.clnt,
+                                                 rpc_lookup[i].cmds,
+                                                 rpc_lookup[i].n_cmds);
+                                set_current_rpc_talloc(NULL);
+                                break;
+                        }
+                }
+       }
+
+       if(p->ntlmssp_auth_validated)
+               unbecome_authenticated_pipe_user();
+
+       return ret;
+}
 
 /*******************************************************************
receives a netlogon pipe and responds.
Calls the underlying RPC function for a named pipe.
  ********************************************************************/
-static BOOL api_rpc_command(pipes_struct *p, 
-                               char *rpc_name, struct api_struct *api_rpc_cmds,
-                               prs_struct *data)
+
+BOOL api_rpcTNP(pipes_struct *p, const char *rpc_name, 
+               const struct api_struct *api_rpc_cmds, int n_cmds)
 {
        int fn_num;
-       DEBUG(4,("api_rpc_command: %s op 0x%x - ", rpc_name, p->hdr_req.opnum));
+       fstring name;
+       uint32 offset1, offset2;
+       /* interpret the command */
+       DEBUG(4,("api_rpcTNP: %s op 0x%x - ", rpc_name, p->hdr_req.opnum));
 
-       for (fn_num = 0; api_rpc_cmds[fn_num].name; fn_num++)
-       {
-               if (api_rpc_cmds[fn_num].opnum == p->hdr_req.opnum && api_rpc_cmds[fn_num].fn != NULL)
-               {
-                       DEBUG(3,("api_rpc_command: %s\n", api_rpc_cmds[fn_num].name));
+       slprintf(name, sizeof(name)-1, "in_%s", rpc_name);
+       prs_dump(name, p->hdr_req.opnum, &p->in_data.data);
+
+       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"));
-               return False;
+               setup_fault_pdu(p, NT_STATUS(0x1c010002));
+               return True;
        }
 
-       /* start off with 1024 bytes, and a large safety margin too */
-       prs_init(&p->rdata, 1024, 4, SAFETY_MARGIN, False);
+       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 */
-       api_rpc_cmds[fn_num].fn(p, data, &(p->rdata));
-
-       if (p->rdata.data == NULL || p->rdata.offset == 0)
-       {
-               mem_free_data(p->rdata.data);
+       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;
        }
 
-       mem_realloc_data(p->rdata.data, p->rdata.offset);
+       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;
+       }
 
-       DEBUG(10,("called %s\n", rpc_name));
+       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);
+       prs_set_offset(&p->out_data.rdata, offset2);
 
-       return True;
-}
+       DEBUG(5,("api_rpcTNP: called %s successfully\n", rpc_name));
 
+       /* Check for buffer underflow in rpc parsing */
 
-/*******************************************************************
- receives a netlogon pipe and responds.
- ********************************************************************/
-BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds,
-                               prs_struct *data)
-{
-       if (data == NULL || data->data == NULL)
-       {
-               DEBUG(2,("%s: NULL data received\n", rpc_name));
-               return False;
-       }
+       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;
 
-       /* interpret the command */
-       if (!api_rpc_command(p, rpc_name, api_rpc_cmds, data))
-       {
-               return False;
-       }
+               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);
+               }
 
-       /* create the rpc header */
-       if (!create_rpc_reply(p, 0, p->rdata.offset + (p->ntlmssp_auth ? (16 + 8) : 0)))
-       {
-               return False;
        }
 
        return True;