Revert "Make get_rpc_pipe() static"
[samba.git] / source3 / rpc_server / srv_pipe_hnd.c
index faba41b92581d3e1bfe6ce4a6ac252e99bcde311..c55e3287051965047ddbc232b2e7167932066b27 100644 (file)
@@ -1,15 +1,13 @@
-#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) Jeremy Allison                                   1999.
+ *  Largely re-written : 2005
+ *  Copyright (C) Jeremy Allison               1998 - 2005
  *  
  *  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
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
  *  
  *  This program is distributed in the hope that it will be useful,
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "includes.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_SRV
 
-#define        PIPE            "\\PIPE\\"
-#define        PIPELEN         strlen(PIPE)
-
-extern int DEBUGLEVEL;
-static pipes_struct *chain_p;
+static smb_np_struct *chain_p;
 static int pipes_open;
 
-#ifndef MAX_OPEN_PIPES
-#define MAX_OPEN_PIPES 64
+/*
+ * Sometimes I can't decide if I hate Windows printer driver
+ * writers more than I hate the Windows spooler service driver
+ * writers. This gets around a combination of bugs in the spooler
+ * and the HP 8500 PCL driver that causes a spooler spin. JRA.
+ *
+ * bumped up from 20 -> 64 after viewing traffic from WordPerfect
+ * 2002 running on NT 4.- SP6
+ * bumped up from 64 -> 256 after viewing traffic from con2prt
+ * for lots of printers on a WinNT 4.x SP6 box.
+ */
+#ifndef MAX_OPEN_SPOOLSS_PIPES
+#define MAX_OPEN_SPOOLSS_PIPES 256
 #endif
+static int current_spoolss_pipes_open;
 
-static pipes_struct *Pipes;
+static smb_np_struct *Pipes;
+static pipes_struct *InternalPipes;
 static struct bitmap *bmap;
 
+/* TODO
+ * the following prototypes are declared here to avoid
+ * code being moved about too much for a patch to be
+ * disrupted / less obvious.
+ *
+ * these functions, and associated functions that they
+ * call, should be moved behind a .so module-loading
+ * system _anyway_.  so that's the next step...
+ */
+
+static int close_internal_rpc_pipe_hnd(struct pipes_struct *p);
+
+/****************************************************************************
+ Internal Pipe iterator functions.
+****************************************************************************/
+
+pipes_struct *get_first_internal_pipe(void)
+{
+       return InternalPipes;
+}
+
+pipes_struct *get_next_internal_pipe(pipes_struct *p)
+{
+       return p->next;
+}
+
 /* this must be larger than the sum of the open files and directories */
 static int pipe_handle_offset;
 
@@ -49,15 +83,17 @@ static int pipe_handle_offset;
 
 void set_pipe_handle_offset(int max_open_files)
 {
-  if(max_open_files < 0x7000)
-    pipe_handle_offset = 0x7000;
-  else
-    pipe_handle_offset = max_open_files + 10; /* For safety. :-) */
+       if(max_open_files < 0x7000) {
+               pipe_handle_offset = 0x7000;
+       } else {
+               pipe_handle_offset = max_open_files + 10; /* For safety. :-) */
+       }
 }
 
 /****************************************************************************
  Reset pipe chain handle number.
 ****************************************************************************/
+
 void reset_chain_p(void)
 {
        chain_p = NULL;
@@ -70,16 +106,19 @@ void reset_chain_p(void)
 void init_rpc_pipe_hnd(void)
 {
        bmap = bitmap_allocate(MAX_OPEN_PIPES);
-       if (!bmap)
-               exit_server("out of memory in init_rpc_pipe_hnd\n");
+       if (!bmap) {
+               exit_server("out of memory in init_rpc_pipe_hnd");
+       }
 }
 
 /****************************************************************************
  Initialise an outgoing packet.
 ****************************************************************************/
 
-static BOOL pipe_init_outgoing_data(output_data *o_data)
+static bool pipe_init_outgoing_data(pipes_struct *p)
 {
+       output_data *o_data = &p->out_data;
+
        /* Reset the offset counters. */
        o_data->data_sent_length = 0;
        o_data->current_pdu_len = 0;
@@ -94,7 +133,7 @@ static BOOL pipe_init_outgoing_data(output_data *o_data)
         * Initialize the outgoing RPC data buffer.
         * we will use this as the raw data area for replying to rpc requests.
         */     
-       if(!prs_init(&o_data->rdata, MAX_PDU_FRAG_LEN, 4, MARSHALL)) {
+       if(!prs_init(&o_data->rdata, RPC_MAX_PDU_FRAG_LEN, p->mem_ctx, MARSHALL)) {
                DEBUG(0,("pipe_init_outgoing_data: malloc fail.\n"));
                return False;
        }
@@ -102,80 +141,38 @@ static BOOL pipe_init_outgoing_data(output_data *o_data)
        return True;
 }
 
-/****************************************************************************
- Attempt to find a remote process to communicate RPC's with.
-****************************************************************************/
-
-#if 0
-
-static void attempt_remote_rpc_connect(pipes_struct *p)
-{
-       struct user_creds usr;
-       user_struct *vuser = get_valid_user_struct(p->vuid);
-
-       p->m = NULL;
-
-       if (vuser == NULL) {
-               DEBUG(4,("attempt_remote_rpc_connect: invalid vuid %d\n", (int)p->vuid));
-               return;
-       }
-
-       ZERO_STRUCT(usr);
-
-       /* set up unix credentials from the smb side, to feed over the pipe */
-       make_creds_unix(&usr.uxc, vuser->user.unix_name, vuser->user.smb_name,
-                                       vuser->user.full_name, vuser->guest);
-       usr.ptr_uxc = 1;
-       make_creds_unix_sec(&usr.uxs, vuser->uid, vuser->gid,
-                                       vuser->n_groups, vuser->groups);
-       usr.ptr_uxs = 1;
-
-       usr.ptr_ssk = 1;
-       DEBUG(10,("user session key not available (yet).\n"));
-       DEBUG(10,("password-change operations may fail.\n"));
-
-#if USER_SESSION_KEY_DEFINED_IN_VUSER_STRUCT
-       memcpy(usr.usr_sess_key, vuser->usr_sess_key, sizeof(usr.usr_sess_key));
-#else
-       memset(usr.usr_sess_key, 0, sizeof(usr.usr_sess_key));
-#endif
-
-       /* set up nt credentials from the smb side, to feed over the pipe */
-       /* lkclXXXX todo!
-       make_creds_nt(&usr.ntc);
-       make_creds_nt_sec(&usr.nts);
-       */
-
-       become_root(); /* to connect to pipe */
-       p->m = msrpc_use_add(p->name, sys_getpid(), &usr, False);
-       unbecome_root();
-
-       if (p->m == NULL)
-               DEBUG(10,("attempt_remote_rpc_connect: msrpc redirect failed - using local implementation.\n"));
-}
-
-#endif
-
 /****************************************************************************
  Find first available pipe slot.
 ****************************************************************************/
 
-pipes_struct *open_rpc_pipe_p(char *pipe_name, 
+smb_np_struct *open_rpc_pipe_p(const char *pipe_name, 
                              connection_struct *conn, uint16 vuid)
 {
        int i;
-       pipes_struct *p;
+       smb_np_struct *p, *p_it;
        static int next_pipe;
+       bool is_spoolss_pipe = False;
 
        DEBUG(4,("Open pipe requested %s (pipes_open=%d)\n",
                 pipe_name, pipes_open));
 
-       
+       if (strstr(pipe_name, "spoolss")) {
+               is_spoolss_pipe = True;
+       }
+       if (is_spoolss_pipe && current_spoolss_pipes_open >= MAX_OPEN_SPOOLSS_PIPES) {
+               DEBUG(10,("open_rpc_pipe_p: spooler bug workaround. Denying open on pipe %s\n",
+                       pipe_name ));
+               return NULL;
+       }
+
        /* not repeating pipe numbers makes it easier to track things in 
           log files and prevents client bugs where pipe numbers are reused
           over connection restarts */
-       if (next_pipe == 0)
+
+       if (next_pipe == 0) {
                next_pipe = (sys_getpid() ^ time(NULL)) % MAX_OPEN_PIPES;
+       }
 
        i = bitmap_find(bmap, next_pipe);
 
@@ -186,16 +183,40 @@ pipes_struct *open_rpc_pipe_p(char *pipe_name,
 
        next_pipe = (i+1) % MAX_OPEN_PIPES;
 
-       for (p = Pipes; p; p = p->next)
-               DEBUG(5,("open pipes: name %s pnum=%x\n", p->name, p->pnum));  
-
-       p = (pipes_struct *)malloc(sizeof(*p));
+       for (p = Pipes; p; p = p->next) {
+               DEBUG(5,("open_rpc_pipe_p: name %s pnum=%x\n", p->name, p->pnum));  
+       }
 
-       if (!p)
+       p = talloc(NULL, smb_np_struct);
+       if (!p) {
+               DEBUG(0,("ERROR! no memory for smb_np_struct!\n"));
                return NULL;
+       }
 
        ZERO_STRUCTP(p);
 
+       p->name = talloc_strdup(p, pipe_name);
+       if (p->name == NULL) {
+               TALLOC_FREE(p);
+               DEBUG(0,("ERROR! no memory for pipe name!\n"));
+               return NULL;
+       }
+
+       /* add a dso mechanism instead of this, here */
+
+       p->namedpipe_create = make_internal_rpc_pipe_p;
+       p->namedpipe_read = read_from_internal_pipe;
+       p->namedpipe_write = write_to_internal_pipe;
+
+       p->np_state = p->namedpipe_create(pipe_name, conn->client_address,
+                                         conn->server_info, vuid);
+
+       if (p->np_state == NULL) {
+               DEBUG(0,("open_rpc_pipe_p: make_internal_rpc_pipe_p failed.\n"));
+               TALLOC_FREE(p);
+               return NULL;
+       }
+
        DLIST_ADD(Pipes, p);
 
        /*
@@ -205,11 +226,6 @@ pipes_struct *open_rpc_pipe_p(char *pipe_name,
         * change the type to UNMARSALLING before processing the stream.
         */
 
-       if(!prs_init(&p->in_data.data, MAX_PDU_FRAG_LEN, 4, MARSHALL)) {
-               DEBUG(0,("open_rpc_pipe_p: malloc fail for in_data struct.\n"));
-               return NULL;
-       }
-
        bitmap_set(bmap, i);
        i += pipe_handle_offset;
 
@@ -224,62 +240,103 @@ pipes_struct *open_rpc_pipe_p(char *pipe_name,
        p->vuid  = vuid;
 
        p->max_trans_reply = 0;
+
+       DEBUG(4,("Opened pipe %s with handle %x (pipes_open=%d)\n",
+                pipe_name, i, pipes_open));
+       
+       chain_p = p;
        
-       p->ntlmssp_chal_flags = 0;
-       p->ntlmssp_auth_validated = False;
-       p->ntlmssp_auth_requested = False;
+       /* Iterate over p_it as a temp variable, to display all open pipes */ 
+       for (p_it = Pipes; p_it; p_it = p_it->next) {
+               DEBUG(5,("open pipes: name %s pnum=%x\n", p_it->name, p_it->pnum));  
+       }
 
-       p->pipe_bound = False;
-       p->fault_state = False;
+       return chain_p;
+}
 
-       /*
-        * Initialize the incoming RPC struct.
-        */
+/****************************************************************************
+ Make an internal namedpipes structure
+****************************************************************************/
 
-       p->in_data.pdu_needed_len = 0;
-       p->in_data.pdu_received_len = 0;
+struct pipes_struct *make_internal_rpc_pipe_p(const char *pipe_name,
+                                             const char *client_address,
+                                             struct auth_serversupplied_info *server_info,
+                                             uint16_t vuid)
+{
+       pipes_struct *p;
 
-       /*
-        * Initialize the outgoing RPC struct.
-        */
+       DEBUG(4,("Create pipe requested %s\n", pipe_name));
 
-       p->out_data.current_pdu_len = 0;
-       p->out_data.current_pdu_sent = 0;
-       p->out_data.data_sent_length = 0;
+       p = TALLOC_ZERO_P(NULL, pipes_struct);
 
-       /*
-        * Initialize the outgoing RPC data buffer with no memory.
-        */     
-       prs_init(&p->out_data.rdata, 0, 4, MARSHALL);
-       
-       ZERO_STRUCT(p->pipe_user);
+       if (!p) {
+               DEBUG(0,("ERROR! no memory for pipes_struct!\n"));
+               return NULL;
+       }
 
-       p->pipe_user.uid = (uid_t)-1;
-       p->pipe_user.gid = (gid_t)-1;
-       
-       fstrcpy(p->name, pipe_name);
-       
-#if 0
+       if ((p->mem_ctx = talloc_init("pipe %s %p", pipe_name, p)) == NULL) {
+               DEBUG(0,("open_rpc_pipe_p: talloc_init failed.\n"));
+               TALLOC_FREE(p);
+               return NULL;
+       }
 
-   Comment out until memory leak fixed. JRA.
+       if (!init_pipe_handle_list(p, pipe_name)) {
+               DEBUG(0,("open_rpc_pipe_p: init_pipe_handles failed.\n"));
+               talloc_destroy(p->mem_ctx);
+               TALLOC_FREE(p);
+               return NULL;
+       }
 
        /*
-        * For Luke - attempt to connect to RPC redirect process.
+        * Initialize the incoming RPC data buffer with one PDU worth of memory.
+        * We cheat here and say we're marshalling, as we intend to add incoming
+        * data directly into the prs_struct and we want it to auto grow. We will
+        * change the type to UNMARSALLING before processing the stream.
         */
 
-       attempt_remote_rpc_connect(p);
-#endif
+       if(!prs_init(&p->in_data.data, RPC_MAX_PDU_FRAG_LEN, p->mem_ctx, MARSHALL)) {
+               DEBUG(0,("open_rpc_pipe_p: malloc fail for in_data struct.\n"));
+               talloc_destroy(p->mem_ctx);
+               close_policy_by_pipe(p);
+               TALLOC_FREE(p);
+               return NULL;
+       }
 
-       DEBUG(4,("Opened pipe %s with handle %x (pipes_open=%d)\n",
-                pipe_name, i, pipes_open));
+       p->server_info = copy_serverinfo(p, server_info);
+       if (p->server_info == NULL) {
+               DEBUG(0, ("open_rpc_pipe_p: copy_serverinfo failed\n"));
+               talloc_destroy(p->mem_ctx);
+               close_policy_by_pipe(p);
+               TALLOC_FREE(p);
+               return NULL;
+       }
+
+       DLIST_ADD(InternalPipes, p);
+
+       memcpy(p->client_address, client_address, sizeof(p->client_address));
+
+       p->endian = RPC_LITTLE_ENDIAN;
+
+       ZERO_STRUCT(p->pipe_user);
+
+       p->pipe_user.vuid = vuid;
+       p->pipe_user.ut.uid = (uid_t)-1;
+       p->pipe_user.ut.gid = (gid_t)-1;
+       p->pipe_user.nt_user_token = dup_nt_token(NULL, server_info->ptok);
+
+       /*
+        * Initialize the outgoing RPC data buffer with no memory.
+        */     
+       prs_init_empty(&p->out_data.rdata, p->mem_ctx, MARSHALL);
        
-       chain_p = p;
+       fstrcpy(p->name, pipe_name);
        
-       /* OVERWRITE p as a temp variable, to display all open pipes */ 
-       for (p = Pipes; p; p = p->next)
-               DEBUG(5,("open pipes: name %s pnum=%x\n", p->name, p->pnum));  
+       DEBUG(4,("Created internal pipe %s (pipes_open=%d)\n",
+                pipe_name, pipes_open));
 
-       return chain_p;
+       talloc_set_destructor(p, close_internal_rpc_pipe_hnd);
+
+       return p;
 }
 
 /****************************************************************************
@@ -292,8 +349,8 @@ static void set_incoming_fault(pipes_struct *p)
        p->in_data.pdu_needed_len = 0;
        p->in_data.pdu_received_len = 0;
        p->fault_state = True;
-       DEBUG(10,("set_incoming_fault: Setting fault state on pipe %s : pnum = 0x%x\n",
-               p->name, p->pnum ));
+       DEBUG(10, ("set_incoming_fault: Setting fault state on pipe %s\n",
+                  p->name));
 }
 
 /****************************************************************************
@@ -332,18 +389,22 @@ static ssize_t unmarshall_rpc_header(pipes_struct *p)
                return -1;
        }
 
-       prs_init( &rpc_in, 0, 4, UNMARSHALL);
+       prs_init_empty( &rpc_in, p->mem_ctx, UNMARSHALL);
+       prs_set_endian_data( &rpc_in, p->endian);
+
        prs_give_memory( &rpc_in, (char *)&p->in_data.current_in_pdu[0],
                                        p->in_data.pdu_received_len, False);
 
        /*
         * Unmarshall the header as this will tell us how much
         * data we need to read to get the complete pdu.
+        * This also sets the endian flag in rpc_in.
         */
 
        if(!smb_io_rpc_hdr("", &p->hdr, &rpc_in, 0)) {
                DEBUG(0,("unmarshall_rpc_header: failed to unmarshall RPC_HDR.\n"));
                set_incoming_fault(p);
+               prs_mem_free(&rpc_in);
                return -1;
        }
 
@@ -354,59 +415,108 @@ static ssize_t unmarshall_rpc_header(pipes_struct *p)
        if(p->hdr.major != 5 && p->hdr.minor != 0) {
                DEBUG(0,("unmarshall_rpc_header: invalid major/minor numbers in RPC_HDR.\n"));
                set_incoming_fault(p);
+               prs_mem_free(&rpc_in);
                return -1;
        }
 
        /*
-        * If there is no data in the incoming buffer and it's a requst pdu then
-        * ensure that the FIRST flag is set. If not then we have
-        * a stream missmatch.
+        * If there's not data in the incoming buffer this should be the start of a new RPC.
         */
 
-       if((p->hdr.pkt_type == RPC_REQUEST) && (prs_offset(&p->in_data.data) == 0) && !(p->hdr.flags & RPC_FLG_FIRST)) {
-               DEBUG(0,("unmarshall_rpc_header: FIRST flag not set in first PDU !\n"));
-               set_incoming_fault(p);
-               return -1;
+       if(prs_offset(&p->in_data.data) == 0) {
+
+               /*
+                * AS/U doesn't set FIRST flag in a BIND packet it seems.
+                */
+
+               if ((p->hdr.pkt_type == RPC_REQUEST) && !(p->hdr.flags & RPC_FLG_FIRST)) {
+                       /*
+                        * Ensure that the FIRST flag is set. If not then we have
+                        * a stream missmatch.
+                        */
+
+                       DEBUG(0,("unmarshall_rpc_header: FIRST flag not set in first PDU !\n"));
+                       set_incoming_fault(p);
+                       prs_mem_free(&rpc_in);
+                       return -1;
+               }
+
+               /*
+                * If this is the first PDU then set the endianness
+                * flag in the pipe. We will need this when parsing all
+                * data in this RPC.
+                */
+
+               p->endian = rpc_in.bigendian_data;
+
+               DEBUG(5,("unmarshall_rpc_header: using %sendian RPC\n",
+                               p->endian == RPC_LITTLE_ENDIAN ? "little-" : "big-" ));
+
+       } else {
+
+               /*
+                * If this is *NOT* the first PDU then check the endianness
+                * flag in the pipe is the same as that in the PDU.
+                */
+
+               if (p->endian != rpc_in.bigendian_data) {
+                       DEBUG(0,("unmarshall_rpc_header: FIRST endianness flag (%d) different in next PDU !\n", (int)p->endian));
+                       set_incoming_fault(p);
+                       prs_mem_free(&rpc_in);
+                       return -1;
+               }
        }
 
        /*
         * Ensure that the pdu length is sane.
         */
 
-       if((p->hdr.frag_len < RPC_HEADER_LEN) || (p->hdr.frag_len > MAX_PDU_FRAG_LEN)) {
+       if((p->hdr.frag_len < RPC_HEADER_LEN) || (p->hdr.frag_len > RPC_MAX_PDU_FRAG_LEN)) {
                DEBUG(0,("unmarshall_rpc_header: assert on frag length failed.\n"));
                set_incoming_fault(p);
+               prs_mem_free(&rpc_in);
                return -1;
        }
 
        DEBUG(10,("unmarshall_rpc_header: type = %u, flags = %u\n", (unsigned int)p->hdr.pkt_type,
                        (unsigned int)p->hdr.flags ));
 
-       /*
-        * Adjust for the header we just ate.
-        */
-       p->in_data.pdu_received_len = 0;
        p->in_data.pdu_needed_len = (uint32)p->hdr.frag_len - RPC_HEADER_LEN;
 
-       /*
-        * Null the data we just ate.
-        */
-
-       memset((char *)&p->in_data.current_in_pdu[0], '\0', RPC_HEADER_LEN);
+       prs_mem_free(&rpc_in);
 
        return 0; /* No extra data processed. */
 }
 
+/****************************************************************************
+ Call this to free any talloc'ed memory. Do this before and after processing
+ a complete PDU.
+****************************************************************************/
+
+static void free_pipe_context(pipes_struct *p)
+{
+       if (p->mem_ctx) {
+               DEBUG(3,("free_pipe_context: destroying talloc pool of size "
+                        "%lu\n", (unsigned long)talloc_total_size(p->mem_ctx) ));
+               talloc_free_children(p->mem_ctx);
+       } else {
+               p->mem_ctx = talloc_init("pipe %s %p", p->name, p);
+               if (p->mem_ctx == NULL) {
+                       p->fault_state = True;
+               }
+       }
+}
+
 /****************************************************************************
  Processes a request pdu. This will do auth processing if needed, and
  appends the data into the complete stream if the LAST flag is not set.
 ****************************************************************************/
 
-static BOOL process_request_pdu(pipes_struct *p, prs_struct *rpc_in_p)
+static bool process_request_pdu(pipes_struct *p, prs_struct *rpc_in_p)
 {
-       BOOL auth_verify = IS_BITS_SET_ALL(p->ntlmssp_chal_flags, NTLMSSP_NEGOTIATE_SIGN);
+       uint32 ss_padding_len = 0;
        size_t data_len = p->hdr.frag_len - RPC_HEADER_LEN - RPC_HDR_REQ_LEN -
-                               (auth_verify ? RPC_HDR_AUTH_LEN : 0) - p->hdr.auth_len;
+                               (p->hdr.auth_len ? RPC_HDR_AUTH_LEN : 0) - p->hdr.auth_len;
 
        if(!p->pipe_bound) {
                DEBUG(0,("process_request_pdu: rpc request with no bind.\n"));
@@ -429,29 +539,50 @@ static BOOL process_request_pdu(pipes_struct *p, prs_struct *rpc_in_p)
                return False;
        }
 
-       if(p->ntlmssp_auth_validated && !api_pipe_auth_process(p, rpc_in_p)) {
-               DEBUG(0,("process_request_pdu: failed to do auth processing.\n"));
-               set_incoming_fault(p);
-               return False;
-       }
+       switch(p->auth.auth_type) {
+               case PIPE_AUTH_TYPE_NONE:
+                       break;
 
-       if (p->ntlmssp_auth_requested && !p->ntlmssp_auth_validated) {
+               case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
+               case PIPE_AUTH_TYPE_NTLMSSP:
+               {
+                       NTSTATUS status;
+                       if(!api_pipe_ntlmssp_auth_process(p, rpc_in_p, &ss_padding_len, &status)) {
+                               DEBUG(0,("process_request_pdu: failed to do auth processing.\n"));
+                               DEBUG(0,("process_request_pdu: error was %s.\n", nt_errstr(status) ));
+                               set_incoming_fault(p);
+                               return False;
+                       }
+                       break;
+               }
 
-               /*
-                * Authentication _was_ requested and it already failed.
-                */
+               case PIPE_AUTH_TYPE_SCHANNEL:
+                       if (!api_pipe_schannel_process(p, rpc_in_p, &ss_padding_len)) {
+                               DEBUG(3,("process_request_pdu: failed to do schannel processing.\n"));
+                               set_incoming_fault(p);
+                               return False;
+                       }
+                       break;
 
-               DEBUG(0,("process_request_pdu: RPC request received on pipe %s where \
-authentication failed. Denying the request.\n", p->name));
-               set_incoming_fault(p);
-        return False;
-    }
+               default:
+                       DEBUG(0,("process_request_pdu: unknown auth type %u set.\n", (unsigned int)p->auth.auth_type ));
+                       set_incoming_fault(p);
+                       return False;
+       }
+
+       /* Now we've done the sign/seal we can remove any padding data. */
+       if (data_len > ss_padding_len) {
+               data_len -= ss_padding_len;
+       }
 
        /*
-        * Check the data length doesn't go over the 1Mb limit.
+        * Check the data length doesn't go over the 15Mb limit.
+        * increased after observing a bug in the Windows NT 4.0 SP6a
+        * spoolsv.exe when the response to a GETPRINTERDRIVER2 RPC
+        * will not fit in the initial buffer of size 0x1068   --jerry 22/01/2002
         */
        
-       if(prs_data_size(&p->in_data.data) + data_len > 1024*1024) {
+       if(prs_offset(&p->in_data.data) + data_len > 15*1024*1024) {
                DEBUG(0,("process_request_pdu: rpc data buffer too large (%u) + (%u)\n",
                                (unsigned int)prs_data_size(&p->in_data.data), (unsigned int)data_len ));
                set_incoming_fault(p);
@@ -462,20 +593,15 @@ authentication failed. Denying the request.\n", p->name));
         * Append the data portion into the buffer and return.
         */
 
-       {
-               char *data_from = prs_data_p(rpc_in_p) + prs_offset(rpc_in_p);
-
-               if(!prs_append_data(&p->in_data.data, data_from, data_len)) {
-                       DEBUG(0,("process_request_pdu: Unable to append data size %u to parse buffer of size %u.\n",
-                                       (unsigned int)data_len, (unsigned int)prs_data_size(&p->in_data.data) ));
-                       set_incoming_fault(p);
-                       return False;
-               }
-
+       if(!prs_append_some_prs_data(&p->in_data.data, rpc_in_p, prs_offset(rpc_in_p), data_len)) {
+               DEBUG(0,("process_request_pdu: Unable to append data size %u to parse buffer of size %u.\n",
+                               (unsigned int)data_len, (unsigned int)prs_data_size(&p->in_data.data) ));
+               set_incoming_fault(p);
+               return False;
        }
 
        if(p->hdr.flags & RPC_FLG_LAST) {
-               BOOL ret = False;
+               bool ret = False;
                /*
                 * Ok - we finally have a complete RPC stream.
                 * Call the rpc command to process it.
@@ -486,8 +612,7 @@ authentication failed. Denying the request.\n", p->name));
                 * size as the current offset.
                 */
 
-               if(!prs_set_buffer_size(&p->in_data.data, prs_offset(&p->in_data.data)))
-               {
+               if(!prs_set_buffer_size(&p->in_data.data, prs_offset(&p->in_data.data))) {
                        DEBUG(0,("process_request_pdu: Call to prs_set_buffer_size failed!\n"));
                        set_incoming_fault(p);
                        return False;
@@ -505,8 +630,13 @@ authentication failed. Denying the request.\n", p->name));
                 * Process the complete data stream here.
                 */
 
-               if(pipe_init_outgoing_data(&p->out_data))
+               free_pipe_context(p);
+
+               if(pipe_init_outgoing_data(p)) {
                        ret = api_pipe_request(p);
+               }
+
+               free_pipe_context(p);
 
                /*
                 * We have consumed the whole data stream. Set back to
@@ -529,55 +659,146 @@ authentication failed. Denying the request.\n", p->name));
  already been parsed and stored in p->hdr.
 ****************************************************************************/
 
-static ssize_t process_complete_pdu(pipes_struct *p)
+static void process_complete_pdu(pipes_struct *p)
 {
        prs_struct rpc_in;
-       size_t data_len = p->in_data.pdu_received_len;
-       char *data_p = (char *)&p->in_data.current_in_pdu[0];
-       BOOL reply = False;
+       size_t data_len = p->in_data.pdu_received_len - RPC_HEADER_LEN;
+       char *data_p = (char *)&p->in_data.current_in_pdu[RPC_HEADER_LEN];
+       bool reply = False;
 
        if(p->fault_state) {
                DEBUG(10,("process_complete_pdu: pipe %s in fault state.\n",
                        p->name ));
                set_incoming_fault(p);
-               setup_fault_pdu(p);
-               return (ssize_t)data_len;
+               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
+               return;
        }
 
-       prs_init( &rpc_in, 0, 4, UNMARSHALL);
+       prs_init_empty( &rpc_in, p->mem_ctx, UNMARSHALL);
+
+       /*
+        * Ensure we're using the corrent endianness for both the 
+        * RPC header flags and the raw data we will be reading from.
+        */
+
+       prs_set_endian_data( &rpc_in, p->endian);
+       prs_set_endian_data( &p->in_data.data, p->endian);
+
        prs_give_memory( &rpc_in, data_p, (uint32)data_len, False);
 
        DEBUG(10,("process_complete_pdu: processing packet type %u\n",
                        (unsigned int)p->hdr.pkt_type ));
 
        switch (p->hdr.pkt_type) {
+               case RPC_REQUEST:
+                       reply = process_request_pdu(p, &rpc_in);
+                       break;
+
+               case RPC_PING: /* CL request - ignore... */
+                       DEBUG(0,("process_complete_pdu: Error. Connectionless packet type %u received on pipe %s.\n",
+                               (unsigned int)p->hdr.pkt_type, p->name));
+                       break;
+
+               case RPC_RESPONSE: /* No responses here. */
+                       DEBUG(0,("process_complete_pdu: Error. RPC_RESPONSE received from client on pipe %s.\n",
+                               p->name ));
+                       break;
+
+               case RPC_FAULT:
+               case RPC_WORKING: /* CL request - reply to a ping when a call in process. */
+               case RPC_NOCALL: /* CL - server reply to a ping call. */
+               case RPC_REJECT:
+               case RPC_ACK:
+               case RPC_CL_CANCEL:
+               case RPC_FACK:
+               case RPC_CANCEL_ACK:
+                       DEBUG(0,("process_complete_pdu: Error. Connectionless packet type %u received on pipe %s.\n",
+                               (unsigned int)p->hdr.pkt_type, p->name));
+                       break;
+
                case RPC_BIND:
-               case RPC_ALTCONT:
                        /*
                         * We assume that a pipe bind is only in one pdu.
                         */
-                       if(pipe_init_outgoing_data(&p->out_data))
+                       if(pipe_init_outgoing_data(p)) {
                                reply = api_pipe_bind_req(p, &rpc_in);
+                       }
+                       break;
+
+               case RPC_BINDACK:
+               case RPC_BINDNACK:
+                       DEBUG(0,("process_complete_pdu: Error. RPC_BINDACK/RPC_BINDNACK packet type %u received on pipe %s.\n",
+                               (unsigned int)p->hdr.pkt_type, p->name));
                        break;
-               case RPC_BINDRESP:
+
+
+               case RPC_ALTCONT:
                        /*
-                        * We assume that a pipe bind_resp is only in one pdu.
+                        * We assume that a pipe bind is only in one pdu.
                         */
-                       if(pipe_init_outgoing_data(&p->out_data))
-                               reply = api_pipe_bind_auth_resp(p, &rpc_in);
+                       if(pipe_init_outgoing_data(p)) {
+                               reply = api_pipe_alter_context(p, &rpc_in);
+                       }
                        break;
-               case RPC_REQUEST:
-                       reply = process_request_pdu(p, &rpc_in);
+
+               case RPC_ALTCONTRESP:
+                       DEBUG(0,("process_complete_pdu: Error. RPC_ALTCONTRESP on pipe %s: Should only be server -> client.\n",
+                               p->name));
+                       break;
+
+               case RPC_AUTH3:
+                       /*
+                        * The third packet in an NTLMSSP auth exchange.
+                        */
+                       if(pipe_init_outgoing_data(p)) {
+                               reply = api_pipe_bind_auth3(p, &rpc_in);
+                       }
                        break;
+
+               case RPC_SHUTDOWN:
+                       DEBUG(0,("process_complete_pdu: Error. RPC_SHUTDOWN on pipe %s: Should only be server -> client.\n",
+                               p->name));
+                       break;
+
+               case RPC_CO_CANCEL:
+                       /* For now just free all client data and continue processing. */
+                       DEBUG(3,("process_complete_pdu: RPC_ORPHANED. Abandoning rpc call.\n"));
+                       /* As we never do asynchronous RPC serving, we can never cancel a
+                          call (as far as I know). If we ever did we'd have to send a cancel_ack
+                          reply. For now, just free all client data and continue processing. */
+                       reply = True;
+                       break;
+#if 0
+                       /* Enable this if we're doing async rpc. */
+                       /* We must check the call-id matches the outstanding callid. */
+                       if(pipe_init_outgoing_data(p)) {
+                               /* Send a cancel_ack PDU reply. */
+                               /* We should probably check the auth-verifier here. */
+                               reply = setup_cancel_ack_reply(p, &rpc_in);
+                       }
+                       break;
+#endif
+
+               case RPC_ORPHANED:
+                       /* We should probably check the auth-verifier here.
+                          For now just free all client data and continue processing. */
+                       DEBUG(3,("process_complete_pdu: RPC_ORPHANED. Abandoning rpc call.\n"));
+                       reply = True;
+                       break;
+
                default:
                        DEBUG(0,("process_complete_pdu: Unknown rpc type = %u received.\n", (unsigned int)p->hdr.pkt_type ));
                        break;
        }
 
+       /* Reset to little endian. Probably don't need this but it won't hurt. */
+       prs_set_endian_data( &p->in_data.data, RPC_LITTLE_ENDIAN);
+
        if (!reply) {
                DEBUG(3,("process_complete_pdu: DCE/RPC fault sent on pipe %s\n", p->pipe_srv_name));
                set_incoming_fault(p);
-               setup_fault_pdu(p);
+               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
+               prs_mem_free(&rpc_in);
        } else {
                /*
                 * Reset the lengths. We're ready for a new pdu.
@@ -586,7 +807,7 @@ static ssize_t process_complete_pdu(pipes_struct *p)
                p->in_data.pdu_received_len = 0;
        }
 
-       return (ssize_t)data_len;
+       prs_mem_free(&rpc_in);
 }
 
 /****************************************************************************
@@ -595,7 +816,7 @@ static ssize_t process_complete_pdu(pipes_struct *p)
 
 static ssize_t process_incoming_data(pipes_struct *p, char *data, size_t n)
 {
-       size_t data_to_copy = MIN(n, MAX_PDU_FRAG_LEN - p->in_data.pdu_received_len);
+       size_t data_to_copy = MIN(n, RPC_MAX_PDU_FRAG_LEN - p->in_data.pdu_received_len);
 
        DEBUG(10,("process_incoming_data: Start: pdu_received_len = %u, pdu_needed_len = %u, incoming data = %u\n",
                (unsigned int)p->in_data.pdu_received_len, (unsigned int)p->in_data.pdu_needed_len,
@@ -636,8 +857,15 @@ incoming data size = %u\n", (unsigned int)p->in_data.pdu_received_len, (unsigned
         * data we need, then loop again.
         */
 
-       if(p->in_data.pdu_needed_len == 0)
-               return unmarshall_rpc_header(p);
+       if(p->in_data.pdu_needed_len == 0) {
+               ssize_t rret = unmarshall_rpc_header(p);
+               if (rret == -1 || p->in_data.pdu_needed_len > 0) {
+                       return rret;
+               }
+               /* If rret == 0 and pdu_needed_len == 0 here we have a PDU that consists
+                  of an RPC_HEADER only. This is a RPC_SHUTDOWN, RPC_CO_CANCEL or RPC_ORPHANED
+                  pdu type. Deal with this in process_complete_pdu(). */
+       }
 
        /*
         * Ok - at this point we have a valid RPC_HEADER in p->hdr.
@@ -648,58 +876,65 @@ incoming data size = %u\n", (unsigned int)p->in_data.pdu_received_len, (unsigned
 
        /*
         * Copy as much of the data as we need into the current_in_pdu buffer.
+        * pdu_needed_len becomes zero when we have a complete pdu.
         */
 
        memcpy( (char *)&p->in_data.current_in_pdu[p->in_data.pdu_received_len], data, data_to_copy);
        p->in_data.pdu_received_len += data_to_copy;
+       p->in_data.pdu_needed_len -= data_to_copy;
 
        /*
         * Do we have a complete PDU ?
+        * (return the number of bytes handled in the call)
         */
 
-       if(p->in_data.pdu_received_len == p->in_data.pdu_needed_len)
-               return process_complete_pdu(p);
+       if(p->in_data.pdu_needed_len == 0) {
+               process_complete_pdu(p);
+               return data_to_copy;
+       }
 
        DEBUG(10,("process_incoming_data: not a complete PDU yet. pdu_received_len = %u, pdu_needed_len = %u\n",
                (unsigned int)p->in_data.pdu_received_len, (unsigned int)p->in_data.pdu_needed_len ));
 
        return (ssize_t)data_to_copy;
-
 }
 
 /****************************************************************************
  Accepts incoming data on an rpc pipe.
 ****************************************************************************/
 
-ssize_t write_to_pipe(pipes_struct *p, char *data, size_t n)
+ssize_t write_to_pipe(smb_np_struct *p, char *data, size_t n)
 {
-       size_t data_left = n;
-
        DEBUG(6,("write_to_pipe: %x", p->pnum));
 
        DEBUG(6,(" name: %s open: %s len: %d\n",
                 p->name, BOOLSTR(p->open), (int)n));
 
-       dump_data(50, data, n);
+       dump_data(50, (uint8 *)data, n);
+
+       return p->namedpipe_write(p->np_state, data, n);
+}
+
+/****************************************************************************
+ Accepts incoming data on an internal rpc pipe.
+****************************************************************************/
+
+ssize_t write_to_internal_pipe(struct pipes_struct *p, char *data, size_t n)
+{
+       size_t data_left = n;
 
        while(data_left) {
                ssize_t data_used;
 
                DEBUG(10,("write_to_pipe: data_left = %u\n", (unsigned int)data_left ));
 
-               /*
-                * Deal with the redirect to the remote RPC daemon.
-                */
-
-               if(p->m)
-                       data_used = write(p->m->fd, data, data_left);
-               else
-                       data_used = process_incoming_data(p, data, data_left);
+               data_used = process_incoming_data(p, data, data_left);
 
                DEBUG(10,("write_to_pipe: data_used = %d\n", (int)data_used ));
 
-               if(data_used < 0)
+               if(data_used < 0) {
                        return -1;
+               }
 
                data_left -= data_used;
                data += data_used;
@@ -709,67 +944,27 @@ ssize_t write_to_pipe(pipes_struct *p, char *data, size_t n)
 }
 
 /****************************************************************************
- Gets data from a remote TNG daemon. Gets data from the remote daemon into
- the outgoing prs_struct.
+ Replies to a request to read data from a pipe.
 
- NB. Note to Luke : This code will be broken until Luke implements a length
- field before reply data...
+ Headers are interspersed with the data at PDU intervals. By the time
+ this function is called, the start of the data could possibly have been
+ read by an SMBtrans (file_offset != 0).
 
+ Calling create_rpc_reply() here is a hack. The data should already
+ have been prepared into arrays of headers + data stream sections.
 ****************************************************************************/
 
-static BOOL read_from_remote(pipes_struct *p)
+ssize_t read_from_pipe(smb_np_struct *p, char *data, size_t n,
+               bool *is_data_outstanding)
 {
-       uint32 data_len;
-       uint32 data_len_left;
-
-       if(prs_offset(&p->out_data.rdata) == 0) {
-
-               ssize_t len = 0;
-
-               /*
-                * Read all the reply data as a stream of pre-created
-                * PDU's from the remote deamon into the rdata struct.
-                */
-
-           /*
-                * Create the response data buffer.
-                */
-
-               if(!pipe_init_outgoing_data(&p->out_data)) {
-                       DEBUG(0,("read_from_remote: failed to create outgoing buffer.\n"));
-                       return False;
-               }
-
-               /* Read from remote here. */
-               if((len = read_with_timeout(p->m->fd, prs_data_p(&p->out_data.rdata), 1, 65536, 10000)) < 0) {
-                       DEBUG(0,("read_from_remote: failed to read from external daemon.\n"));
-                       prs_mem_free(&p->out_data.rdata);
-                       return False;
-               }
-
-               /* Set the length we got. */
-               prs_set_offset(&p->out_data.rdata, (uint32)len);
-       }
-
-       /*
-        * 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,("read_from_remote: no data left to send !\n"));
-               return False;
+       if (!p || !p->open) {
+               DEBUG(0,("read_from_pipe: pipe not open\n"));
+               return -1;              
        }
 
-       data_len = MIN(data_len_left, MAX_PDU_FRAG_LEN);
+       DEBUG(6,("read_from_pipe: %x", p->pnum));
 
-       return False; /* Notfinished... */
+       return p->namedpipe_read(p->np_state, data, n, is_data_outstanding);
 }
 
 /****************************************************************************
@@ -783,18 +978,17 @@ static BOOL read_from_remote(pipes_struct *p)
  have been prepared into arrays of headers + data stream sections.
 ****************************************************************************/
 
-ssize_t read_from_pipe(pipes_struct *p, char *data, size_t n)
+ssize_t read_from_internal_pipe(struct pipes_struct *p, char *data, size_t n,
+                               bool *is_data_outstanding)
 {
        uint32 pdu_remaining = 0;
        ssize_t data_returned = 0;
 
-       if (!p || !p->open) {
+       if (!p) {
                DEBUG(0,("read_from_pipe: pipe not open\n"));
                return -1;              
        }
 
-       DEBUG(6,("read_from_pipe: %x", p->pnum));
-
        DEBUG(6,(" name: %s len: %u\n", p->name, (unsigned int)n));
 
        /*
@@ -802,10 +996,16 @@ ssize_t read_from_pipe(pipes_struct *p, char *data, size_t n)
         * read request.
         */
 
-       if(n > MAX_PDU_FRAG_LEN) {
-               DEBUG(0,("read_from_pipe: loo large read (%u) requested on pipe %s. We can \
-only service %d sized reads.\n", (unsigned int)n, p->name, MAX_PDU_FRAG_LEN ));
-               return -1;
+       /*
+        * This condition should result in the connection being closed.  
+        * Netapp filers seem to set it to 0xffff which results in domain
+        * authentications failing.  Just ignore it so things work.
+        */
+
+       if(n > RPC_MAX_PDU_FRAG_LEN) {
+                DEBUG(5,("read_from_pipe: too large read (%u) requested on \
+pipe %s. We can only service %d sized reads.\n", (unsigned int)n, p->name, RPC_MAX_PDU_FRAG_LEN ));
+               n = RPC_MAX_PDU_FRAG_LEN;
        }
 
        /*
@@ -825,7 +1025,7 @@ returning %d bytes.\n", p->name, (unsigned int)p->out_data.current_pdu_len,
 
                memcpy( data, &p->out_data.current_pdu[p->out_data.current_pdu_sent], (size_t)data_returned);
                p->out_data.current_pdu_sent += (uint32)data_returned;
-               return data_returned;
+               goto out;
        }
 
        /*
@@ -839,39 +1039,32 @@ returning %d bytes.\n", p->name, (unsigned int)p->out_data.current_pdu_len,
 
        if(p->out_data.data_sent_length >= prs_offset(&p->out_data.rdata)) {
                /*
-                * We have sent all possible data. Return 0.
+                * We have sent all possible data, return 0.
                 */
-               return 0;
+               data_returned = 0;
+               goto out;
        }
 
-       if(p->m) {
-               /*
-                * Remote to the RPC daemon.
-                */
-               if(!read_from_remote(p)) {
-                       DEBUG(0,("read_from_pipe: %s: read_from_remote failed.\n", p->name ));
-                       return -1;
-               }
-
-       } else {
-
-               /*
-                * We need to create a new PDU from the data left in p->rdata.
-                * Create the header/data/footers. This also sets up the fields
-                * p->current_pdu_len, p->current_pdu_sent, p->data_sent_length
-                * and stores the outgoing PDU in p->current_pdu.
-                */
+       /*
+        * We need to create a new PDU from the data left in p->rdata.
+        * Create the header/data/footers. This also sets up the fields
+        * p->current_pdu_len, p->current_pdu_sent, p->data_sent_length
+        * and stores the outgoing PDU in p->current_pdu.
+        */
 
-               if(!create_next_pdu(p)) {
-                       DEBUG(0,("read_from_pipe: %s: create_next_pdu failed.\n", p->name));
-                       return -1;
-               }
+       if(!create_next_pdu(p)) {
+               DEBUG(0,("read_from_pipe: %s: create_next_pdu failed.\n", p->name));
+               return -1;
        }
 
        data_returned = MIN(n, p->out_data.current_pdu_len);
 
        memcpy( data, p->out_data.current_pdu, (size_t)data_returned);
        p->out_data.current_pdu_sent += (uint32)data_returned;
+
+  out:
+
+       (*is_data_outstanding) = p->out_data.current_pdu_len > n;
        return data_returned;
 }
 
@@ -879,10 +1072,11 @@ returning %d bytes.\n", p->name, (unsigned int)p->out_data.current_pdu_len,
  Wait device state on a pipe. Exactly what this is for is unknown...
 ****************************************************************************/
 
-BOOL wait_rpc_pipe_hnd_state(pipes_struct *p, uint16 priority)
+bool wait_rpc_pipe_hnd_state(smb_np_struct *p, uint16 priority)
 {
-       if (p == NULL)
+       if (p == NULL) {
                return False;
+       }
 
        if (p->open) {
                DEBUG(3,("wait_rpc_pipe_hnd_state: Setting pipe wait state priority=%x on pipe (name=%s)\n",
@@ -903,10 +1097,11 @@ BOOL wait_rpc_pipe_hnd_state(pipes_struct *p, uint16 priority)
  Set device state on a pipe. Exactly what this is for is unknown...
 ****************************************************************************/
 
-BOOL set_rpc_pipe_hnd_state(pipes_struct *p, uint16 device_state)
+bool set_rpc_pipe_hnd_state(smb_np_struct *p, uint16 device_state)
 {
-       if (p == NULL)
+       if (p == NULL) {
                return False;
+       }
 
        if (p->open) {
                DEBUG(3,("set_rpc_pipe_hnd_state: Setting pipe device state=%x on pipe (name=%s)\n",
@@ -927,36 +1122,87 @@ BOOL set_rpc_pipe_hnd_state(pipes_struct *p, uint16 device_state)
  Close an rpc pipe.
 ****************************************************************************/
 
-BOOL close_rpc_pipe_hnd(pipes_struct *p, connection_struct *conn)
+bool close_rpc_pipe_hnd(smb_np_struct *p)
 {
        if (!p) {
                DEBUG(0,("Invalid pipe in close_rpc_pipe_hnd\n"));
                return False;
        }
 
-       prs_mem_free(&p->out_data.rdata);
-       prs_mem_free(&p->in_data.data);
+       TALLOC_FREE(p->np_state);
 
        bitmap_clear(bmap, p->pnum - pipe_handle_offset);
 
        pipes_open--;
 
-       if (p->m != NULL) {
-               DEBUG(4,("close_rpc_pipe_hnd: closing msrpc redirect: "));
-               if (msrpc_use_del(p->m->pipe_name, &p->m->usr, False, NULL))
-                       DEBUG(4,("OK\n"));
-               else
-                       DEBUG(4,("FAILED\n"));
-       }
-
        DEBUG(4,("closed pipe name %s pnum=%x (pipes_open=%d)\n", 
                 p->name, p->pnum, pipes_open));  
 
        DLIST_REMOVE(Pipes, p);
+       
+       /* TODO: Remove from pipe open db */
+       
+       if ( !delete_pipe_opendb( p ) ) {
+               DEBUG(3,("close_rpc_pipe_hnd: failed to delete %s "
+                       "pipe from open db.\n", p->name));
+       }
+
+       TALLOC_FREE(p);
+
+       return True;
+}
+
+/****************************************************************************
+ Close all pipes on a connection.
+****************************************************************************/
+
+void pipe_close_conn(connection_struct *conn)
+{
+       smb_np_struct *p, *next;
+
+       for (p=Pipes;p;p=next) {
+               next = p->next;
+               if (p->conn == conn) {
+                       close_rpc_pipe_hnd(p);
+               }
+       }
+}
+
+/****************************************************************************
+ Close an rpc pipe.
+****************************************************************************/
+
+static int close_internal_rpc_pipe_hnd(struct pipes_struct *p)
+{
+       if (!p) {
+               DEBUG(0,("Invalid pipe in close_internal_rpc_pipe_hnd\n"));
+               return False;
+       }
+
+       prs_mem_free(&p->out_data.rdata);
+       prs_mem_free(&p->in_data.data);
+
+       if (p->auth.auth_data_free_func) {
+               (*p->auth.auth_data_free_func)(&p->auth);
+       }
+
+       if (p->mem_ctx) {
+               talloc_destroy(p->mem_ctx);
+       }
+
+       free_pipe_rpc_context( p->contexts );
+
+       /* Free the handles database. */
+       close_policy_by_pipe(p);
+
+       TALLOC_FREE(p->pipe_user.nt_user_token);
+       SAFE_FREE(p->pipe_user.ut.groups);
+
+       DLIST_REMOVE(InternalPipes, p);
 
        ZERO_STRUCTP(p);
 
-       free(p);
+       TALLOC_FREE(p);
        
        return True;
 }
@@ -965,12 +1211,11 @@ BOOL close_rpc_pipe_hnd(pipes_struct *p, connection_struct *conn)
  Find an rpc pipe given a pipe handle in a buffer and an offset.
 ****************************************************************************/
 
-pipes_struct *get_rpc_pipe_p(char *buf, int where)
+smb_np_struct *get_rpc_pipe_p(uint16 pnum)
 {
-       int pnum = SVAL(buf,where);
-
-       if (chain_p)
+       if (chain_p) {
                return chain_p;
+       }
 
        return get_rpc_pipe(pnum);
 }
@@ -979,15 +1224,16 @@ pipes_struct *get_rpc_pipe_p(char *buf, int where)
  Find an rpc pipe given a pipe handle.
 ****************************************************************************/
 
-pipes_struct *get_rpc_pipe(int pnum)
+smb_np_struct *get_rpc_pipe(int pnum)
 {
-       pipes_struct *p;
+       smb_np_struct *p;
 
        DEBUG(4,("search for pipe pnum=%x\n", pnum));
 
-       for (p=Pipes;p;p=p->next)
+       for (p=Pipes;p;p=p->next) {
                DEBUG(5,("pipe name %s pnum=%x (pipes_open=%d)\n", 
                          p->name, p->pnum, pipes_open));  
+       }
 
        for (p=Pipes;p;p=p->next) {
                if (p->pnum == pnum) {
@@ -998,5 +1244,3 @@ pipes_struct *get_rpc_pipe(int pnum)
 
        return NULL;
 }
-
-#undef OLD_NTDOMAIN