Fix external np read after conversion to tevent_req
[samba.git] / source3 / rpc_server / srv_pipe_hnd.c
index 86a04e7ccbe9602be030f9fb824b52a78c6e3640..ffb7dde1c3633a4bc3567de5e0001096b6f33904 100644 (file)
@@ -7,7 +7,7 @@
  *  
  *  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"
+#include "librpc/gen_ndr/ndr_named_pipe_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
-#define        PIPE            "\\PIPE\\"
-#define        PIPELEN         strlen(PIPE)
-
-static smb_np_struct *chain_p;
 static int pipes_open;
 
-/*
- * 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 smb_np_struct *Pipes;
 static pipes_struct *InternalPipes;
-static struct bitmap *bmap;
 
 /* TODO
  * the following prototypes are declared here to avoid
@@ -62,26 +39,7 @@ static struct bitmap *bmap;
  * system _anyway_.  so that's the next step...
  */
 
-static ssize_t read_from_internal_pipe(void *np_conn, char *data, size_t n,
-               BOOL *is_data_outstanding);
-static ssize_t write_to_internal_pipe(void *np_conn, char *data, size_t n);
-static BOOL close_internal_rpc_pipe_hnd(void *np_conn);
-static void *make_internal_rpc_pipe_p(char *pipe_name, 
-                             connection_struct *conn, uint16 vuid);
-
-/****************************************************************************
- Pipe iterator functions.
-****************************************************************************/
-
-smb_np_struct *get_first_pipe(void)
-{
-       return Pipes;
-}
-
-smb_np_struct *get_next_pipe(smb_np_struct *p)
-{
-       return p->next;
-}
+static int close_internal_rpc_pipe_hnd(struct pipes_struct *p);
 
 /****************************************************************************
  Internal Pipe iterator functions.
@@ -97,57 +55,19 @@ 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;
-
-/****************************************************************************
- Set the pipe_handle_offset. Called from smbd/files.c
-****************************************************************************/
-
-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. :-) */
-       }
-}
-
-/****************************************************************************
- Reset pipe chain handle number.
-****************************************************************************/
-
-void reset_chain_p(void)
-{
-       chain_p = NULL;
-}
-
-/****************************************************************************
- Initialise pipe handle states.
-****************************************************************************/
-
-void init_rpc_pipe_hnd(void)
-{
-       bmap = bitmap_allocate(MAX_OPEN_PIPES);
-       if (!bmap) {
-               exit_server("out of memory in init_rpc_pipe_hnd");
-       }
-}
-
 /****************************************************************************
  Initialise an outgoing packet.
 ****************************************************************************/
 
-static BOOL pipe_init_outgoing_data(pipes_struct *p)
+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;
        o_data->current_pdu_sent = 0;
 
-       memset(o_data->current_pdu, '\0', sizeof(o_data->current_pdu));
+       prs_mem_free(&o_data->frag);
 
        /* Free any memory in the current return data buffer. */
        prs_mem_free(&o_data->rdata);
@@ -156,7 +76,7 @@ static BOOL pipe_init_outgoing_data(pipes_struct *p)
         * 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, RPC_MAX_PDU_FRAG_LEN, p->mem_ctx, MARSHALL)) {
+       if(!prs_init(&o_data->rdata, 128, p->mem_ctx, MARSHALL)) {
                DEBUG(0,("pipe_init_outgoing_data: malloc fail.\n"));
                return False;
        }
@@ -164,158 +84,39 @@ static BOOL pipe_init_outgoing_data(pipes_struct *p)
        return True;
 }
 
-/****************************************************************************
- Find first available pipe slot.
-****************************************************************************/
-
-smb_np_struct *open_rpc_pipe_p(char *pipe_name, 
-                             connection_struct *conn, uint16 vuid)
-{
-       int i;
-       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) {
-               next_pipe = (sys_getpid() ^ time(NULL)) % MAX_OPEN_PIPES;
-       }
-
-       i = bitmap_find(bmap, next_pipe);
-
-       if (i == -1) {
-               DEBUG(0,("ERROR! Out of pipe structures\n"));
-               return NULL;
-       }
-
-       next_pipe = (i+1) % MAX_OPEN_PIPES;
-
-       for (p = Pipes; p; p = p->next) {
-               DEBUG(5,("open_rpc_pipe_p: name %s pnum=%x\n", p->name, p->pnum));  
-       }
-
-       p = SMB_MALLOC_P(smb_np_struct);
-       if (!p) {
-               DEBUG(0,("ERROR! no memory for pipes_struct!\n"));
-               return NULL;
-       }
-
-       ZERO_STRUCTP(p);
-
-       /* 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->namedpipe_close = close_internal_rpc_pipe_hnd;
-
-       p->np_state = p->namedpipe_create(pipe_name, conn, vuid);
-
-       if (p->np_state == NULL) {
-               DEBUG(0,("open_rpc_pipe_p: make_internal_rpc_pipe_p failed.\n"));
-               SAFE_FREE(p);
-               return NULL;
-       }
-
-       DLIST_ADD(Pipes, p);
-
-       /*
-        * 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.
-        */
-
-       bitmap_set(bmap, i);
-       i += pipe_handle_offset;
-
-       pipes_open++;
-
-       p->pnum = i;
-
-       p->open = True;
-       p->device_state = 0;
-       p->priority = 0;
-       p->conn = conn;
-       p->vuid  = vuid;
-
-       p->max_trans_reply = 0;
-       
-       fstrcpy(p->name, pipe_name);
-       
-       DEBUG(4,("Opened pipe %s with handle %x (pipes_open=%d)\n",
-                pipe_name, i, pipes_open));
-       
-       chain_p = p;
-       
-       /* 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));  
-       }
-
-       return chain_p;
-}
-
 /****************************************************************************
  Make an internal namedpipes structure
 ****************************************************************************/
 
-static void *make_internal_rpc_pipe_p(char *pipe_name, 
-                             connection_struct *conn, uint16 vuid)
+static struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
+                                                    const struct ndr_syntax_id *syntax,
+                                                    const char *client_address,
+                                                    struct auth_serversupplied_info *server_info)
 {
        pipes_struct *p;
-       user_struct *vuser = get_valid_user_struct(vuid);
 
-       DEBUG(4,("Create pipe requested %s\n", pipe_name));
+       DEBUG(4,("Create pipe requested %s\n",
+                get_pipe_name_from_iface(syntax)));
 
-       if (!vuser && vuid != UID_FIELD_INVALID) {
-               DEBUG(0,("ERROR! vuid %d did not map to a valid vuser struct!\n", vuid));
-               return NULL;
-       }
-
-       p = SMB_MALLOC_P(pipes_struct);
+       p = TALLOC_ZERO_P(mem_ctx, struct pipes_struct);
 
        if (!p) {
                DEBUG(0,("ERROR! no memory for pipes_struct!\n"));
                return NULL;
        }
 
-       ZERO_STRUCTP(p);
-
-       if ((p->mem_ctx = talloc_init("pipe %s %p", pipe_name, p)) == NULL) {
-               DEBUG(0,("open_rpc_pipe_p: talloc_init failed.\n"));
-               SAFE_FREE(p);
-               return NULL;
-       }
-
-       if ((p->pipe_state_mem_ctx = talloc_init("pipe_state %s %p", pipe_name, p)) == NULL) {
+       if ((p->mem_ctx = talloc_init("pipe %s %p",
+                                     get_pipe_name_from_iface(syntax),
+                                     p)) == NULL) {
                DEBUG(0,("open_rpc_pipe_p: talloc_init failed.\n"));
-               talloc_destroy(p->mem_ctx);
-               SAFE_FREE(p);
+               TALLOC_FREE(p);
                return NULL;
        }
 
-       if (!init_pipe_handle_list(p, pipe_name)) {
+       if (!init_pipe_handle_list(p, syntax)) {
                DEBUG(0,("open_rpc_pipe_p: init_pipe_handles failed.\n"));
                talloc_destroy(p->mem_ctx);
-               talloc_destroy(p->pipe_state_mem_ctx);
-               SAFE_FREE(p);
+               TALLOC_FREE(p);
                return NULL;
        }
 
@@ -326,44 +127,42 @@ static void *make_internal_rpc_pipe_p(char *pipe_name,
         * change the type to UNMARSALLING before processing the stream.
         */
 
-       if(!prs_init(&p->in_data.data, RPC_MAX_PDU_FRAG_LEN, p->mem_ctx, MARSHALL)) {
+       if(!prs_init(&p->in_data.data, 128, p->mem_ctx, MARSHALL)) {
                DEBUG(0,("open_rpc_pipe_p: malloc fail for in_data struct.\n"));
                talloc_destroy(p->mem_ctx);
-               talloc_destroy(p->pipe_state_mem_ctx);
+               close_policy_by_pipe(p);
+               TALLOC_FREE(p);
                return NULL;
        }
 
-       DLIST_ADD(InternalPipes, p);
+       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;
+       }
 
-       p->conn = conn;
+       DLIST_ADD(InternalPipes, p);
 
-       p->vuid  = vuid;
+       memcpy(p->client_address, client_address, sizeof(p->client_address));
 
        p->endian = RPC_LITTLE_ENDIAN;
 
-       ZERO_STRUCT(p->pipe_user);
-
-       p->pipe_user.ut.uid = (uid_t)-1;
-       p->pipe_user.ut.gid = (gid_t)-1;
-       
-       /* Store the session key and NT_TOKEN */
-       if (vuser) {
-               p->session_key = data_blob(vuser->session_key.data, vuser->session_key.length);
-               p->pipe_user.nt_user_token = dup_nt_token(
-                       NULL, vuser->nt_user_token);
-       }
-
        /*
         * Initialize the outgoing RPC data buffer with no memory.
         */     
-       prs_init(&p->out_data.rdata, 0, p->mem_ctx, MARSHALL);
-       
-       fstrcpy(p->name, pipe_name);
-       
+       prs_init_empty(&p->out_data.rdata, p->mem_ctx, MARSHALL);
+
+       p->syntax = *syntax;
+
        DEBUG(4,("Created internal pipe %s (pipes_open=%d)\n",
-                pipe_name, pipes_open));
+                get_pipe_name_from_iface(syntax), pipes_open));
+
+       talloc_set_destructor(p, close_internal_rpc_pipe_hnd);
 
-       return (void*)p;
+       return p;
 }
 
 /****************************************************************************
@@ -376,8 +175,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 : vuid = 0x%x\n",
-               p->name, p->vuid ));
+       DEBUG(10, ("set_incoming_fault: Setting fault state on pipe %s\n",
+                  get_pipe_name_from_iface(&p->syntax)));
 }
 
 /****************************************************************************
@@ -392,6 +191,15 @@ static ssize_t fill_rpc_header(pipes_struct *p, char *data, size_t data_to_copy)
                        (unsigned int)data_to_copy, (unsigned int)len_needed_to_complete_hdr,
                        (unsigned int)p->in_data.pdu_received_len ));
 
+       if (p->in_data.current_in_pdu == NULL) {
+               p->in_data.current_in_pdu = talloc_array(p, uint8_t,
+                                                        RPC_HEADER_LEN);
+       }
+       if (p->in_data.current_in_pdu == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               return -1;
+       }
+
        memcpy((char *)&p->in_data.current_in_pdu[p->in_data.pdu_received_len], data, len_needed_to_complete_hdr);
        p->in_data.pdu_received_len += len_needed_to_complete_hdr;
 
@@ -416,7 +224,7 @@ static ssize_t unmarshall_rpc_header(pipes_struct *p)
                return -1;
        }
 
-       prs_init( &rpc_in, 0, p->mem_ctx, 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],
@@ -512,6 +320,14 @@ static ssize_t unmarshall_rpc_header(pipes_struct *p)
 
        prs_mem_free(&rpc_in);
 
+       p->in_data.current_in_pdu = TALLOC_REALLOC_ARRAY(
+               p, p->in_data.current_in_pdu, uint8_t, p->hdr.frag_len);
+       if (p->in_data.current_in_pdu == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               set_incoming_fault(p);
+               return -1;
+       }
+
        return 0; /* No extra data processed. */
 }
 
@@ -527,7 +343,8 @@ static void free_pipe_context(pipes_struct *p)
                         "%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);
+               p->mem_ctx = talloc_init(
+                       "pipe %s %p", get_pipe_name_from_iface(&p->syntax), p);
                if (p->mem_ctx == NULL) {
                        p->fault_state = True;
                }
@@ -539,7 +356,7 @@ static void free_pipe_context(pipes_struct *p)
  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)
 {
        uint32 ss_padding_len = 0;
        size_t data_len = p->hdr.frag_len - RPC_HEADER_LEN - RPC_HDR_REQ_LEN -
@@ -609,7 +426,7 @@ static BOOL process_request_pdu(pipes_struct *p, prs_struct *rpc_in_p)
         * will not fit in the initial buffer of size 0x1068   --jerry 22/01/2002
         */
        
-       if(prs_offset(&p->in_data.data) + data_len > 15*1024*1024) {
+       if(prs_offset(&p->in_data.data) + data_len > MAX_RPC_DATA_SIZE) {
                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);
@@ -628,7 +445,7 @@ static BOOL process_request_pdu(pipes_struct *p, prs_struct *rpc_in_p)
        }
 
        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.
@@ -691,17 +508,17 @@ static void process_complete_pdu(pipes_struct *p)
        prs_struct rpc_in;
        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;
+       bool reply = False;
 
        if(p->fault_state) {
                DEBUG(10,("process_complete_pdu: pipe %s in fault state.\n",
-                       p->name ));
+                        get_pipe_name_from_iface(&p->syntax)));
                set_incoming_fault(p);
-               setup_fault_pdu(p, NT_STATUS(0x1c010002));
+               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
                return;
        }
 
-       prs_init( &rpc_in, 0, p->mem_ctx, UNMARSHALL);
+       prs_init_empty( &rpc_in, p->mem_ctx, UNMARSHALL);
 
        /*
         * Ensure we're using the corrent endianness for both the 
@@ -723,12 +540,13 @@ static void process_complete_pdu(pipes_struct *p)
 
                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));
+                               (unsigned int)p->hdr.pkt_type,
+                               get_pipe_name_from_iface(&p->syntax)));
                        break;
 
                case RPC_RESPONSE: /* No responses here. */
                        DEBUG(0,("process_complete_pdu: Error. RPC_RESPONSE received from client on pipe %s.\n",
-                               p->name ));
+                               get_pipe_name_from_iface(&p->syntax)));
                        break;
 
                case RPC_FAULT:
@@ -740,7 +558,8 @@ static void process_complete_pdu(pipes_struct *p)
                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));
+                               (unsigned int)p->hdr.pkt_type,
+                               get_pipe_name_from_iface(&p->syntax)));
                        break;
 
                case RPC_BIND:
@@ -755,7 +574,8 @@ static void process_complete_pdu(pipes_struct *p)
                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));
+                               (unsigned int)p->hdr.pkt_type,
+                               get_pipe_name_from_iface(&p->syntax)));
                        break;
 
 
@@ -770,7 +590,7 @@ static void process_complete_pdu(pipes_struct *p)
 
                case RPC_ALTCONTRESP:
                        DEBUG(0,("process_complete_pdu: Error. RPC_ALTCONTRESP on pipe %s: Should only be server -> client.\n",
-                               p->name));
+                               get_pipe_name_from_iface(&p->syntax)));
                        break;
 
                case RPC_AUTH3:
@@ -784,7 +604,7 @@ static void process_complete_pdu(pipes_struct *p)
 
                case RPC_SHUTDOWN:
                        DEBUG(0,("process_complete_pdu: Error. RPC_SHUTDOWN on pipe %s: Should only be server -> client.\n",
-                               p->name));
+                               get_pipe_name_from_iface(&p->syntax)));
                        break;
 
                case RPC_CO_CANCEL:
@@ -822,14 +642,16 @@ static void process_complete_pdu(pipes_struct *p)
        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));
+               DEBUG(3,("process_complete_pdu: DCE/RPC fault sent on "
+                        "pipe %s\n", get_pipe_name_from_iface(&p->syntax)));
                set_incoming_fault(p);
-               setup_fault_pdu(p, NT_STATUS(0x1c010002));
+               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.
                 */
+               TALLOC_FREE(p->in_data.current_in_pdu);
                p->in_data.pdu_needed_len = 0;
                p->in_data.pdu_received_len = 0;
        }
@@ -926,29 +748,12 @@ incoming data size = %u\n", (unsigned int)p->in_data.pdu_received_len, (unsigned
        return (ssize_t)data_to_copy;
 }
 
-/****************************************************************************
- Accepts incoming data on an rpc pipe.
-****************************************************************************/
-
-ssize_t write_to_pipe(smb_np_struct *p, char *data, size_t 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);
-
-       return p->namedpipe_write(p->np_state, data, n);
-}
-
 /****************************************************************************
  Accepts incoming data on an internal rpc pipe.
 ****************************************************************************/
 
-static ssize_t write_to_internal_pipe(void *np_conn, char *data, size_t n)
+static ssize_t write_to_internal_pipe(struct pipes_struct *p, char *data, size_t n)
 {
-       pipes_struct *p = (pipes_struct*)np_conn;
        size_t data_left = n;
 
        while(data_left) {
@@ -982,34 +787,9 @@ static ssize_t write_to_internal_pipe(void *np_conn, char *data, size_t n)
  have been prepared into arrays of headers + data stream sections.
 ****************************************************************************/
 
-ssize_t read_from_pipe(smb_np_struct *p, char *data, size_t n,
-               BOOL *is_data_outstanding)
+static ssize_t read_from_internal_pipe(struct pipes_struct *p, char *data, size_t n,
+                                      bool *is_data_outstanding)
 {
-       if (!p || !p->open) {
-               DEBUG(0,("read_from_pipe: pipe not open\n"));
-               return -1;              
-       }
-
-       DEBUG(6,("read_from_pipe: %x", p->pnum));
-
-       return p->namedpipe_read(p->np_state, data, n, is_data_outstanding);
-}
-
-/****************************************************************************
- Replies to a request to read data from a pipe.
-
- 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 ssize_t read_from_internal_pipe(void *np_conn, char *data, size_t n,
-               BOOL *is_data_outstanding)
-{
-       pipes_struct *p = (pipes_struct*)np_conn;
        uint32 pdu_remaining = 0;
        ssize_t data_returned = 0;
 
@@ -1018,7 +798,8 @@ static ssize_t read_from_internal_pipe(void *np_conn, char *data, size_t n,
                return -1;              
        }
 
-       DEBUG(6,(" name: %s len: %u\n", p->name, (unsigned int)n));
+       DEBUG(6,(" name: %s len: %u\n", get_pipe_name_from_iface(&p->syntax),
+                (unsigned int)n));
 
        /*
         * We cannot return more than one PDU length per
@@ -1032,8 +813,11 @@ static ssize_t read_from_internal_pipe(void *np_conn, char *data, size_t n,
         */
 
        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 ));
+                DEBUG(5,("read_from_pipe: too large read (%u) requested on "
+                        "pipe %s. We can only service %d sized reads.\n",
+                        (unsigned int)n, get_pipe_name_from_iface(&p->syntax),
+                        RPC_MAX_PDU_FRAG_LEN ));
+               n = RPC_MAX_PDU_FRAG_LEN;
        }
 
        /*
@@ -1044,14 +828,24 @@ pipe %s. We can only service %d sized reads.\n", (unsigned int)n, p->name, RPC_M
         * PDU.
         */
 
-       if((pdu_remaining = p->out_data.current_pdu_len - p->out_data.current_pdu_sent) > 0) {
+       pdu_remaining = prs_offset(&p->out_data.frag)
+               - p->out_data.current_pdu_sent;
+
+       if (pdu_remaining > 0) {
                data_returned = (ssize_t)MIN(n, pdu_remaining);
 
-               DEBUG(10,("read_from_pipe: %s: current_pdu_len = %u, current_pdu_sent = %u \
-returning %d bytes.\n", p->name, (unsigned int)p->out_data.current_pdu_len, 
-                       (unsigned int)p->out_data.current_pdu_sent, (int)data_returned));
+               DEBUG(10,("read_from_pipe: %s: current_pdu_len = %u, "
+                         "current_pdu_sent = %u returning %d bytes.\n",
+                         get_pipe_name_from_iface(&p->syntax),
+                         (unsigned int)prs_offset(&p->out_data.frag),
+                         (unsigned int)p->out_data.current_pdu_sent,
+                         (int)data_returned));
+
+               memcpy(data,
+                      prs_data_p(&p->out_data.frag)
+                      + p->out_data.current_pdu_sent,
+                      data_returned);
 
-               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;
                goto out;
        }
@@ -1061,9 +855,11 @@ returning %d bytes.\n", p->name, (unsigned int)p->out_data.current_pdu_len,
         * may of course be zero if this is the first return fragment.
         */
 
-       DEBUG(10,("read_from_pipe: %s: fault_state = %d : data_sent_length \
-= %u, prs_offset(&p->out_data.rdata) = %u.\n",
-               p->name, (int)p->fault_state, (unsigned int)p->out_data.data_sent_length, (unsigned int)prs_offset(&p->out_data.rdata) ));
+       DEBUG(10,("read_from_pipe: %s: fault_state = %d : data_sent_length "
+                 "= %u, prs_offset(&p->out_data.rdata) = %u.\n",
+                 get_pipe_name_from_iface(&p->syntax), (int)p->fault_state,
+                 (unsigned int)p->out_data.data_sent_length,
+                 (unsigned int)prs_offset(&p->out_data.rdata) ));
 
        if(p->out_data.data_sent_length >= prs_offset(&p->out_data.rdata)) {
                /*
@@ -1081,197 +877,606 @@ returning %d bytes.\n", p->name, (unsigned int)p->out_data.current_pdu_len,
         */
 
        if(!create_next_pdu(p)) {
-               DEBUG(0,("read_from_pipe: %s: create_next_pdu failed.\n", p->name));
+               DEBUG(0,("read_from_pipe: %s: create_next_pdu failed.\n",
+                        get_pipe_name_from_iface(&p->syntax)));
                return -1;
        }
 
-       data_returned = MIN(n, p->out_data.current_pdu_len);
+       data_returned = MIN(n, prs_offset(&p->out_data.frag));
 
-       memcpy( data, p->out_data.current_pdu, (size_t)data_returned);
+       memcpy( data, prs_data_p(&p->out_data.frag), (size_t)data_returned);
        p->out_data.current_pdu_sent += (uint32)data_returned;
 
   out:
+       (*is_data_outstanding) = prs_offset(&p->out_data.frag) > n;
 
-       (*is_data_outstanding) = p->out_data.current_pdu_len > n;
        return data_returned;
 }
 
 /****************************************************************************
Wait device state on a pipe. Exactly what this is for is unknown...
Close an rpc pipe.
 ****************************************************************************/
 
-BOOL wait_rpc_pipe_hnd_state(smb_np_struct *p, uint16 priority)
+static int close_internal_rpc_pipe_hnd(struct pipes_struct *p)
 {
-       if (p == NULL) {
+       if (!p) {
+               DEBUG(0,("Invalid pipe in close_internal_rpc_pipe_hnd\n"));
                return False;
        }
 
-       if (p->open) {
-               DEBUG(3,("wait_rpc_pipe_hnd_state: Setting pipe wait state priority=%x on pipe (name=%s)\n",
-                        priority, p->name));
+       prs_mem_free(&p->out_data.frag);
+       prs_mem_free(&p->out_data.rdata);
+       prs_mem_free(&p->in_data.data);
 
-               p->priority = priority;
-               
-               return True;
-       } 
+       if (p->auth.auth_data_free_func) {
+               (*p->auth.auth_data_free_func)(&p->auth);
+       }
 
-       DEBUG(3,("wait_rpc_pipe_hnd_state: Error setting pipe wait state priority=%x (name=%s)\n",
-                priority, p->name));
-       return False;
-}
+       TALLOC_FREE(p->mem_ctx);
 
+       free_pipe_rpc_context( p->contexts );
 
-/****************************************************************************
- Set device state on a pipe. Exactly what this is for is unknown...
-****************************************************************************/
+       /* Free the handles database. */
+       close_policy_by_pipe(p);
+
+       DLIST_REMOVE(InternalPipes, p);
 
-BOOL set_rpc_pipe_hnd_state(smb_np_struct *p, uint16 device_state)
+       ZERO_STRUCTP(p);
+
+       TALLOC_FREE(p);
+       
+       return True;
+}
+
+bool fsp_is_np(struct files_struct *fsp)
 {
-       if (p == NULL) {
-               return False;
+       enum FAKE_FILE_TYPE type;
+
+       if ((fsp == NULL) || (fsp->fake_file_handle == NULL)) {
+               return false;
        }
 
-       if (p->open) {
-               DEBUG(3,("set_rpc_pipe_hnd_state: Setting pipe device state=%x on pipe (name=%s)\n",
-                        device_state, p->name));
+       type = fsp->fake_file_handle->type;
 
-               p->device_state = device_state;
-               
-               return True;
-       } 
+       return ((type == FAKE_FILE_TYPE_NAMED_PIPE)
+               || (type == FAKE_FILE_TYPE_NAMED_PIPE_PROXY));
+}
+
+struct np_proxy_state {
+       struct tevent_queue *read_queue;
+       struct tevent_queue *write_queue;
+       int fd;
+
+       uint8_t *msg;
+       size_t sent;
+};
 
-       DEBUG(3,("set_rpc_pipe_hnd_state: Error setting pipe device state=%x (name=%s)\n",
-                device_state, p->name));
-       return False;
+static int np_proxy_state_destructor(struct np_proxy_state *state)
+{
+       if (state->fd != -1) {
+               close(state->fd);
+       }
+       return 0;
 }
 
+static struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx,
+                                                      const char *pipe_name,
+                                                      struct auth_serversupplied_info *server_info)
+{
+       struct np_proxy_state *result;
+       struct sockaddr_un addr;
+       char *socket_path;
+       const char *socket_dir;
+
+       DATA_BLOB req_blob;
+       struct netr_SamInfo3 *info3;
+       struct named_pipe_auth_req req;
+       DATA_BLOB rep_blob;
+       uint8 rep_buf[20];
+       struct named_pipe_auth_rep rep;
+       enum ndr_err_code ndr_err;
+       NTSTATUS status;
+       ssize_t written;
+
+       result = talloc(mem_ctx, struct np_proxy_state);
+       if (result == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               return NULL;
+       }
 
-/****************************************************************************
- Close an rpc pipe.
-****************************************************************************/
+       result->fd = socket(AF_UNIX, SOCK_STREAM, 0);
+       if (result->fd == -1) {
+               DEBUG(10, ("socket(2) failed: %s\n", strerror(errno)));
+               goto fail;
+       }
+       talloc_set_destructor(result, np_proxy_state_destructor);
+
+       ZERO_STRUCT(addr);
+       addr.sun_family = AF_UNIX;
+
+       socket_dir = lp_parm_const_string(
+               GLOBAL_SECTION_SNUM, "external_rpc_pipe", "socket_dir",
+               get_dyn_NCALRPCDIR());
+       if (socket_dir == NULL) {
+               DEBUG(0, ("externan_rpc_pipe:socket_dir not set\n"));
+               goto fail;
+       }
+
+       socket_path = talloc_asprintf(talloc_tos(), "%s/np/%s",
+                                     socket_dir, pipe_name);
+       if (socket_path == NULL) {
+               DEBUG(0, ("talloc_asprintf failed\n"));
+               goto fail;
+       }
+       strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path));
+       TALLOC_FREE(socket_path);
+
+       become_root();
+       if (sys_connect(result->fd, (struct sockaddr *)&addr) == -1) {
+               unbecome_root();
+               DEBUG(0, ("connect(%s) failed: %s\n", addr.sun_path,
+                         strerror(errno)));
+               goto fail;
+       }
+       unbecome_root();
+
+       info3 = talloc(talloc_tos(), struct netr_SamInfo3);
+       if (info3 == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               goto fail;
+       }
+
+       status = serverinfo_to_SamInfo3(server_info, NULL, 0, info3);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(info3);
+               DEBUG(0, ("serverinfo_to_SamInfo3 failed: %s\n",
+                         nt_errstr(status)));
+               goto fail;
+       }
+
+       req.level = 1;
+       req.info.info1 = *info3;
+
+       ndr_err = ndr_push_struct_blob(
+               &req_blob, talloc_tos(), NULL, &req,
+               (ndr_push_flags_fn_t)ndr_push_named_pipe_auth_req);
+
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(10, ("ndr_push_named_pipe_auth_req failed: %s\n",
+                          ndr_errstr(ndr_err)));
+               goto fail;
+       }
+
+       DEBUG(10, ("named_pipe_auth_req(client)[%u]\n", (uint32_t)req_blob.length));
+       dump_data(10, req_blob.data, req_blob.length);
+
+       written = write_data(result->fd, (char *)req_blob.data,
+                            req_blob.length);
+       if (written == -1) {
+               DEBUG(3, ("Could not write auth req data to RPC server\n"));
+               goto fail;
+       }
+
+       status = read_data(result->fd, (char *)rep_buf, sizeof(rep_buf));
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(3, ("Could not read auth result\n"));
+               goto fail;
+       }
 
-BOOL close_rpc_pipe_hnd(smb_np_struct *p)
+       rep_blob = data_blob_const(rep_buf, sizeof(rep_buf));
+
+       DEBUG(10,("name_pipe_auth_rep(client)[%u]\n", (uint32_t)rep_blob.length));
+       dump_data(10, rep_blob.data, rep_blob.length);
+
+       ndr_err = ndr_pull_struct_blob(
+               &rep_blob, talloc_tos(), NULL, &rep,
+               (ndr_pull_flags_fn_t)ndr_pull_named_pipe_auth_rep);
+
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(0, ("ndr_pull_named_pipe_auth_rep failed: %s\n",
+                         ndr_errstr(ndr_err)));
+               goto fail;
+       }
+
+       if (rep.length != 16) {
+               DEBUG(0, ("req invalid length: %u != 16\n",
+                         rep.length));
+               goto fail;
+       }
+
+       if (strcmp(NAMED_PIPE_AUTH_MAGIC, rep.magic) != 0) {
+               DEBUG(0, ("req invalid magic: %s != %s\n",
+                         rep.magic, NAMED_PIPE_AUTH_MAGIC));
+               goto fail;
+       }
+
+       if (!NT_STATUS_IS_OK(rep.status)) {
+               DEBUG(0, ("req failed: %s\n",
+                         nt_errstr(rep.status)));
+               goto fail;
+       }
+
+       if (rep.level != 1) {
+               DEBUG(0, ("req invalid level: %u != 1\n",
+                         rep.level));
+               goto fail;
+       }
+
+       result->msg = NULL;
+
+       result->read_queue = tevent_queue_create(result, "np_read");
+       if (result->read_queue == NULL) {
+               goto fail;
+       }
+       result->write_queue = tevent_queue_create(result, "np_write");
+       if (result->write_queue == NULL) {
+               goto fail;
+       }
+
+       return result;
+
+ fail:
+       TALLOC_FREE(result);
+       return NULL;
+}
+
+NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
+                const char *client_address,
+                struct auth_serversupplied_info *server_info,
+                struct fake_file_handle **phandle)
 {
-       if (!p) {
-               DEBUG(0,("Invalid pipe in close_rpc_pipe_hnd\n"));
-               return False;
+       const char **proxy_list;
+       struct fake_file_handle *handle;
+
+       proxy_list = lp_parm_string_list(-1, "np", "proxy", NULL);
+
+       handle = talloc(mem_ctx, struct fake_file_handle);
+       if (handle == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       p->namedpipe_close(p->np_state);
+       if ((proxy_list != NULL) && str_list_check_ci(proxy_list, name)) {
+               struct np_proxy_state *p;
 
-       bitmap_clear(bmap, p->pnum - pipe_handle_offset);
+               p = make_external_rpc_pipe_p(handle, name, server_info);
 
-       pipes_open--;
+               handle->type = FAKE_FILE_TYPE_NAMED_PIPE_PROXY;
+               handle->private_data = p;
+       } else {
+               struct pipes_struct *p;
+               struct ndr_syntax_id syntax;
 
-       DEBUG(4,("closed pipe name %s pnum=%x (pipes_open=%d)\n", 
-                p->name, p->pnum, pipes_open));  
+               if (!is_known_pipename(name, &syntax)) {
+                       TALLOC_FREE(handle);
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+               }
 
-       DLIST_REMOVE(Pipes, p);
+               p = make_internal_rpc_pipe_p(handle, &syntax, client_address,
+                                            server_info);
 
-       ZERO_STRUCTP(p);
+               handle->type = FAKE_FILE_TYPE_NAMED_PIPE;
+               handle->private_data = p;
+       }
 
-       SAFE_FREE(p);
+       if (handle->private_data == NULL) {
+               TALLOC_FREE(handle);
+               return NT_STATUS_PIPE_NOT_AVAILABLE;
+       }
 
-       return True;
+       *phandle = handle;
+
+       return NT_STATUS_OK;
 }
 
-/****************************************************************************
- Close all pipes on a connection.
-****************************************************************************/
+struct np_write_state {
+       struct event_context *ev;
+       struct np_proxy_state *p;
+       struct iovec iov;
+       ssize_t nwritten;
+};
 
-void pipe_close_conn(connection_struct *conn)
+static void np_write_done(struct tevent_req *subreq);
+
+struct tevent_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+                                struct fake_file_handle *handle,
+                                const uint8_t *data, size_t len)
 {
-       smb_np_struct *p, *next;
+       struct tevent_req *req;
+       struct np_write_state *state;
+       NTSTATUS status;
+
+       DEBUG(6, ("np_write_send: len: %d\n", (int)len));
+       dump_data(50, data, len);
+
+       req = tevent_req_create(mem_ctx, &state, struct np_write_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       if (len == 0) {
+               state->nwritten = 0;
+               status = NT_STATUS_OK;
+               goto post_status;
+       }
 
-       for (p=Pipes;p;p=next) {
-               next = p->next;
-               if (p->conn == conn) {
-                       close_rpc_pipe_hnd(p);
+       if (handle->type == FAKE_FILE_TYPE_NAMED_PIPE) {
+               struct pipes_struct *p = talloc_get_type_abort(
+                       handle->private_data, struct pipes_struct);
+
+               state->nwritten = write_to_internal_pipe(p, (char *)data, len);
+
+               status = (state->nwritten >= 0)
+                       ? NT_STATUS_OK : NT_STATUS_UNEXPECTED_IO_ERROR;
+               goto post_status;
+       }
+
+       if (handle->type == FAKE_FILE_TYPE_NAMED_PIPE_PROXY) {
+               struct np_proxy_state *p = talloc_get_type_abort(
+                       handle->private_data, struct np_proxy_state);
+               struct tevent_req *subreq;
+
+               state->ev = ev;
+               state->p = p;
+               state->iov.iov_base = CONST_DISCARD(void *, data);
+               state->iov.iov_len = len;
+
+               subreq = writev_send(state, ev, p->write_queue, p->fd,
+                                    &state->iov, 1);
+               if (subreq == NULL) {
+                       goto fail;
                }
+               tevent_req_set_callback(subreq, np_write_done, req);
+               return req;
        }
+
+       status = NT_STATUS_INVALID_HANDLE;
+ post_status:
+       if (NT_STATUS_IS_OK(status)) {
+               tevent_req_done(req);
+       } else {
+               tevent_req_nterror(req, status);
+       }
+       return tevent_req_post(req, ev);
+ fail:
+       TALLOC_FREE(req);
+       return NULL;
 }
 
-/****************************************************************************
- Close an rpc pipe.
-****************************************************************************/
+static void np_write_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct np_write_state *state = tevent_req_data(
+               req, struct np_write_state);
+       ssize_t received;
+       int err;
+
+       received = writev_recv(subreq, &err);
+       if (received < 0) {
+               tevent_req_nterror(req, map_nt_error_from_unix(err));
+               return;
+       }
+       state->nwritten = received;
+       tevent_req_done(req);
+}
 
-static BOOL close_internal_rpc_pipe_hnd(void *np_conn)
+NTSTATUS np_write_recv(struct tevent_req *req, ssize_t *pnwritten)
 {
-       pipes_struct *p = (pipes_struct *)np_conn;
-       if (!p) {
-               DEBUG(0,("Invalid pipe in close_internal_rpc_pipe_hnd\n"));
-               return False;
+       struct np_write_state *state = tevent_req_data(
+               req, struct np_write_state);
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
        }
+       *pnwritten = state->nwritten;
+       return NT_STATUS_OK;
+}
 
-       prs_mem_free(&p->out_data.rdata);
-       prs_mem_free(&p->in_data.data);
+static ssize_t rpc_frag_more_fn(uint8_t *buf, size_t buflen, void *priv)
+{
+       prs_struct hdr_prs;
+       struct rpc_hdr_info hdr;
+       bool ret;
 
-       if (p->auth.auth_data_free_func) {
-               (*p->auth.auth_data_free_func)(&p->auth);
+       if (buflen > RPC_HEADER_LEN) {
+               return 0;
        }
+       prs_init_empty(&hdr_prs, talloc_tos(), UNMARSHALL);
+       prs_give_memory(&hdr_prs, (char *)buf, RPC_HEADER_LEN, false);
+       ret = smb_io_rpc_hdr("", &hdr, &hdr_prs, 0);
+       prs_mem_free(&hdr_prs);
 
-       if (p->mem_ctx) {
-               talloc_destroy(p->mem_ctx);
+       if (!ret) {
+               return -1;
        }
 
-       if (p->pipe_state_mem_ctx) {
-               talloc_destroy(p->pipe_state_mem_ctx);
+       return (hdr.frag_len - RPC_HEADER_LEN);
+}
+
+struct np_read_state {
+       struct event_context *ev;
+       struct np_proxy_state *p;
+       uint8_t *data;
+       size_t len;
+
+       size_t nread;
+       bool is_data_outstanding;
+};
+
+static void np_read_trigger(struct tevent_req *req, void *private_data);
+static void np_read_done(struct tevent_req *subreq);
+
+struct tevent_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+                               struct fake_file_handle *handle,
+                               uint8_t *data, size_t len)
+{
+       struct tevent_req *req;
+       struct np_read_state *state;
+       NTSTATUS status;
+
+       req = tevent_req_create(mem_ctx, &state, struct np_read_state);
+       if (req == NULL) {
+               return NULL;
        }
 
-       free_pipe_rpc_context( p->contexts );
+       if (handle->type == FAKE_FILE_TYPE_NAMED_PIPE) {
+               struct pipes_struct *p = talloc_get_type_abort(
+                       handle->private_data, struct pipes_struct);
 
-       /* Free the handles database. */
-       close_policy_by_pipe(p);
+               state->nread = read_from_internal_pipe(
+                       p, (char *)data, len, &state->is_data_outstanding);
 
-       talloc_free(p->pipe_user.nt_user_token);
-       data_blob_free(&p->session_key);
-       SAFE_FREE(p->pipe_user.ut.groups);
+               status = (state->nread >= 0)
+                       ? NT_STATUS_OK : NT_STATUS_UNEXPECTED_IO_ERROR;
+               goto post_status;
+       }
 
-       DLIST_REMOVE(InternalPipes, p);
+       if (handle->type == FAKE_FILE_TYPE_NAMED_PIPE_PROXY) {
+               struct np_proxy_state *p = talloc_get_type_abort(
+                       handle->private_data, struct np_proxy_state);
 
-       ZERO_STRUCTP(p);
+               if (p->msg != NULL) {
+                       size_t thistime;
 
-       SAFE_FREE(p);
-       
-       return True;
+                       thistime = MIN(talloc_get_size(p->msg) - p->sent,
+                                      len);
+
+                       memcpy(data, p->msg+p->sent, thistime);
+                       state->nread = thistime;
+                       p->sent += thistime;
+
+                       if (p->sent < talloc_get_size(p->msg)) {
+                               state->is_data_outstanding = true;
+                       } else {
+                               state->is_data_outstanding = false;
+                               TALLOC_FREE(p->msg);
+                       }
+                       status = NT_STATUS_OK;
+                       goto post_status;
+               }
+
+               state->ev = ev;
+               state->p = p;
+               state->data = data;
+               state->len = len;
+
+               if (!tevent_queue_add(p->read_queue, ev, req, np_read_trigger,
+                                     NULL)) {
+                       goto fail;
+               }
+               return req;
+       }
+
+       status = NT_STATUS_INVALID_HANDLE;
+ post_status:
+       if (NT_STATUS_IS_OK(status)) {
+               tevent_req_done(req);
+       } else {
+               tevent_req_nterror(req, status);
+       }
+       return tevent_req_post(req, ev);
+ fail:
+       TALLOC_FREE(req);
+       return NULL;
 }
 
-/****************************************************************************
- Find an rpc pipe given a pipe handle in a buffer and an offset.
-****************************************************************************/
+static void np_read_trigger(struct tevent_req *req, void *private_data)
+{
+       struct np_read_state *state = tevent_req_data(
+               req, struct np_read_state);
+       struct tevent_req *subreq;
 
-smb_np_struct *get_rpc_pipe_p(char *buf, int where)
+       subreq = read_packet_send(state, state->ev, state->p->fd,
+                                 RPC_HEADER_LEN, rpc_frag_more_fn, NULL);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, np_read_done, req);
+}
+
+static void np_read_done(struct tevent_req *subreq)
 {
-       int pnum = SVAL(buf,where);
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct np_read_state *state = tevent_req_data(
+               req, struct np_read_state);
+       ssize_t received;
+       size_t thistime;
+       int err;
+
+       received = read_packet_recv(subreq, state->p, &state->p->msg, &err);
+       TALLOC_FREE(subreq);
+       if (received == -1) {
+               tevent_req_nterror(req, map_nt_error_from_unix(err));
+               return;
+       }
 
-       if (chain_p) {
-               return chain_p;
+       thistime = MIN(received, state->len);
+
+       memcpy(state->data, state->p->msg, thistime);
+       state->p->sent = thistime;
+       state->nread = thistime;
+
+       if (state->p->sent < received) {
+               state->is_data_outstanding = true;
+       } else {
+               TALLOC_FREE(state->p->msg);
+               state->is_data_outstanding = false;
        }
 
-       return get_rpc_pipe(pnum);
+       tevent_req_done(req);
+       return;
 }
 
-/****************************************************************************
- Find an rpc pipe given a pipe handle.
-****************************************************************************/
-
-smb_np_struct *get_rpc_pipe(int pnum)
+NTSTATUS np_read_recv(struct tevent_req *req, ssize_t *nread,
+                     bool *is_data_outstanding)
 {
-       smb_np_struct *p;
+       struct np_read_state *state = tevent_req_data(
+               req, struct np_read_state);
+       NTSTATUS status;
 
-       DEBUG(4,("search for pipe pnum=%x\n", pnum));
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
+       *nread = state->nread;
+       *is_data_outstanding = state->is_data_outstanding;
+       return NT_STATUS_OK;
+}
+
+/**
+ * Create a new RPC client context which uses a local dispatch function.
+ */
+NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
+                               const struct ndr_syntax_id *abstract_syntax,
+                               NTSTATUS (*dispatch) (struct rpc_pipe_client *cli,
+                                                     TALLOC_CTX *mem_ctx,
+                                                     const struct ndr_interface_table *table,
+                                                     uint32_t opnum, void *r),
+                               struct auth_serversupplied_info *serversupplied_info,
+                               struct rpc_pipe_client **presult)
+{
+       struct rpc_pipe_client *result;
 
-       for (p=Pipes;p;p=p->next) {
-               DEBUG(5,("pipe name %s pnum=%x (pipes_open=%d)\n", 
-                         p->name, p->pnum, pipes_open));  
+       result = TALLOC_ZERO_P(mem_ctx, struct rpc_pipe_client);
+       if (result == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       for (p=Pipes;p;p=p->next) {
-               if (p->pnum == pnum) {
-                       chain_p = p;
-                       return p;
-               }
+       result->abstract_syntax = *abstract_syntax;
+       result->transfer_syntax = ndr_transfer_syntax;
+       result->dispatch = dispatch;
+
+       result->pipes_struct = make_internal_rpc_pipe_p(
+               result, abstract_syntax, "", serversupplied_info);
+       if (result->pipes_struct == NULL) {
+               TALLOC_FREE(result);
+               return NT_STATUS_NO_MEMORY;
        }
 
-       return NULL;
+       result->max_xmit_frag = -1;
+       result->max_recv_frag = -1;
+
+       *presult = result;
+       return NT_STATUS_OK;
 }