Revert "smbd: explain that/why we use the raw tevent_context for lease_timeout_handler()"
[garming/samba-autobuild/.git] / source3 / smbd / pipes.c
index f43e243453caa900b24c6f235bf10641f3e08dd8..4be57bc2a5f0dea80515419bdaa2d8763be60958 100644 (file)
@@ -1,21 +1,21 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Pipe SMB reply routines
    Copyright (C) Andrew Tridgell 1992-1998
    Copyright (C) Luke Kenneth Casson Leighton 1996-1998
    Copyright (C) Paul Ashton  1997-1998.
    Copyright (C) Jeremy Allison 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 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.
 */
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "smbd/globals.h"
+#include "libcli/security/security.h"
+#include "rpc_server/srv_pipe_hnd.h"
 
-#define        PIPE            "\\PIPE\\"
-#define        PIPELEN         strlen(PIPE)
-
-#define MAX_PIPE_NAME_LEN      24
+NTSTATUS open_np_file(struct smb_request *smb_req, const char *name,
+                     struct files_struct **pfsp)
+{
+       struct connection_struct *conn = smb_req->conn;
+       struct files_struct *fsp;
+       struct smb_filename *smb_fname = NULL;
+       NTSTATUS status;
+
+       status = file_new(smb_req, conn, &fsp);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("file_new failed: %s\n", nt_errstr(status)));
+               return status;
+       }
 
-/* PIPE/<name>/<pid>/<pnum> */
-#define PIPEDB_KEY_FORMAT "PIPE/%s/%u/%d"
+       fsp->conn = conn;
+       fsp->fh->fd = -1;
+       fsp->vuid = smb_req->vuid;
+       fsp->can_lock = false;
+       fsp->access_mask = FILE_READ_DATA | FILE_WRITE_DATA;
 
-struct pipe_dbrec {
-       struct server_id pid;
-       int pnum;
-       uid_t uid;
+       smb_fname = synthetic_smb_fname(talloc_tos(), name, NULL, NULL, 0);
+       if (smb_fname == NULL) {
+               file_free(smb_req, fsp);
+               return NT_STATUS_NO_MEMORY;
+       }
+       status = fsp_set_smb_fname(fsp, smb_fname);
+       TALLOC_FREE(smb_fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               file_free(smb_req, fsp);
+               return status;
+       }
 
-       char name[MAX_PIPE_NAME_LEN];
-       fstring user;
-};
+       status = np_open(fsp, name,
+                        conn->sconn->remote_address,
+                        conn->sconn->local_address,
+                        conn->session_info,
+                        conn->sconn->ev_ctx,
+                        conn->sconn->msg_ctx,
+                        &fsp->fake_file_handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("np_open(%s) returned %s\n", name,
+                          nt_errstr(status)));
+               file_free(smb_req, fsp);
+               return status;
+       }
 
+       *pfsp = fsp;
 
-extern struct pipe_id_info pipe_names[];
+       return NT_STATUS_OK;
+}
 
 /****************************************************************************
  Reply to an open and X on a named pipe.
@@ -55,126 +90,169 @@ extern struct pipe_id_info pipe_names[];
 
 void reply_open_pipe_and_X(connection_struct *conn, struct smb_request *req)
 {
-       pstring fname;
-       pstring pipe_name;
-       smb_np_struct *p;
-       int size=0,fmode=0,mtime=0,rmode=0;
-       int i;
+       const char *fname = NULL;
+       char *pipe_name = NULL;
+       files_struct *fsp;
+       TALLOC_CTX *ctx = talloc_tos();
+       NTSTATUS status;
 
        /* XXXX we need to handle passed times, sattr and flags */
-       srvstr_pull_buf(req->inbuf, req->flags2, pipe_name,
-                       smb_buf(req->inbuf), sizeof(pipe_name), STR_TERMINATE);
+       srvstr_pull_req_talloc(ctx, req, &pipe_name, req->buf, STR_TERMINATE);
+       if (!pipe_name) {
+               reply_botherror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                               ERRDOS, ERRbadpipe);
+               return;
+       }
 
        /* If the name doesn't start \PIPE\ then this is directed */
        /* at a mailslot or something we really, really don't understand, */
        /* not just something we really don't understand. */
-       if ( strncmp(pipe_name,PIPE,PIPELEN) != 0 ) {
-               reply_doserror(req, ERRSRV, ERRaccess);
-               return;
-       }
 
-       DEBUG(4,("Opening pipe %s.\n", pipe_name));
+#define        PIPE            "PIPE\\"
+#define        PIPELEN         strlen(PIPE)
 
-       /* See if it is one we want to handle. */
-       for( i = 0; pipe_names[i].client_pipe ; i++ ) {
-               if( strequal(pipe_name,pipe_names[i].client_pipe)) {
-                       break;
-               }
+       fname = pipe_name;
+       while (fname[0] == '\\') {
+               fname++;
        }
-
-       if (pipe_names[i].client_pipe == NULL) {
-               reply_botherror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND,
-                               ERRDOS, ERRbadpipe);
+       if (!strnequal(fname, PIPE, PIPELEN)) {
+               reply_nterror(req, NT_STATUS_OBJECT_PATH_SYNTAX_BAD);
                return;
        }
+       fname += PIPELEN;
+       while (fname[0] == '\\') {
+               fname++;
+       }
 
-       /* Strip \PIPE\ off the name. */
-       pstrcpy(fname, pipe_name + PIPELEN);
+       DEBUG(4,("Opening pipe %s => %s.\n", pipe_name, fname));
 
 #if 0
        /*
         * Hack for NT printers... JRA.
         */
        if(should_fail_next_srvsvc_open(fname)) {
-               reply_doserror(req, ERRSRV, ERRaccess);
+               reply_nterror(req, NT_STATUS_ACCESS_DENIED);
                return;
        }
 #endif
 
-       /* Known pipes arrive with DIR attribs. Remove it so a regular file */
-       /* can be opened and add it in after the open. */
-       DEBUG(3,("Known pipe %s opening.\n",fname));
-
-       p = open_rpc_pipe_p(fname, conn, req->vuid);
-       if (!p) {
-               reply_doserror(req, ERRSRV, ERRnofids);
+       status = open_np_file(req, fname, &fsp);
+       if (!NT_STATUS_IS_OK(status)) {
+               if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                       reply_botherror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                                       ERRDOS, ERRbadpipe);
+                       return;
+               }
+               reply_nterror(req, status);
                return;
        }
 
        /* Prepare the reply */
        reply_outbuf(req, 15, 0);
 
+       SSVAL(req->outbuf, smb_vwv0, 0xff); /* andx chain ends */
+       SSVAL(req->outbuf, smb_vwv1, 0);    /* no andx offset */
+
        /* Mark the opened file as an existing named pipe in message mode. */
        SSVAL(req->outbuf,smb_vwv9,2);
        SSVAL(req->outbuf,smb_vwv10,0xc700);
 
-       if (rmode == 2) {
-               DEBUG(4,("Resetting open result to open from create.\n"));
-               rmode = 1;
-       }
-
-       SSVAL(req->outbuf,smb_vwv2, p->pnum);
-       SSVAL(req->outbuf,smb_vwv3,fmode);
-       srv_put_dos_date3((char *)req->outbuf,smb_vwv4,mtime);
-       SIVAL(req->outbuf,smb_vwv6,size);
-       SSVAL(req->outbuf,smb_vwv8,rmode);
-       SSVAL(req->outbuf,smb_vwv11,0x0001);
-
-       chain_reply(req);
-       return;
+       SSVAL(req->outbuf, smb_vwv2, fsp->fnum);
+       SSVAL(req->outbuf, smb_vwv3, 0);        /* fmode */
+       srv_put_dos_date3((char *)req->outbuf, smb_vwv4, 0);    /* mtime */
+       SIVAL(req->outbuf, smb_vwv6, 0);        /* size */
+       SSVAL(req->outbuf, smb_vwv8, 0);        /* rmode */
+       SSVAL(req->outbuf, smb_vwv11, 0x0001);
 }
 
 /****************************************************************************
  Reply to a write on a pipe.
 ****************************************************************************/
 
+struct pipe_write_state {
+       size_t numtowrite;
+};
+
+static void pipe_write_done(struct tevent_req *subreq);
+
 void reply_pipe_write(struct smb_request *req)
 {
-       smb_np_struct *p = get_rpc_pipe_p(SVAL(req->inbuf,smb_vwv0));
-       size_t numtowrite = SVAL(req->inbuf,smb_vwv1);
-       int nwritten;
-       char *data;
+       files_struct *fsp = file_fsp(req, SVAL(req->vwv+0, 0));
+       const uint8_t *data;
+       struct pipe_write_state *state;
+       struct tevent_req *subreq;
 
-       if (!p) {
-               reply_doserror(req, ERRDOS, ERRbadfid);
+       if (!fsp_is_np(fsp)) {
+               reply_nterror(req, NT_STATUS_INVALID_HANDLE);
                return;
        }
 
-       if (p->vuid != req->vuid) {
+       if (fsp->vuid != req->vuid) {
                reply_nterror(req, NT_STATUS_INVALID_HANDLE);
                return;
        }
 
-       data = smb_buf(req->inbuf) + 3;
-
-       if (numtowrite == 0) {
-               nwritten = 0;
-       } else {
-               nwritten = write_to_pipe(p, data, numtowrite);
+       state = talloc(req, struct pipe_write_state);
+       if (state == NULL) {
+               reply_nterror(req, NT_STATUS_NO_MEMORY);
+               return;
        }
+       req->async_priv = state;
+
+       state->numtowrite = SVAL(req->vwv+1, 0);
+
+       data = req->buf + 3;
 
-       if ((nwritten == 0 && numtowrite != 0) || (nwritten < 0)) {
-               reply_unixerror(req, ERRDOS, ERRnoaccess);
+       DEBUG(6, ("reply_pipe_write: %s, name: %s len: %d\n", fsp_fnum_dbg(fsp),
+                 fsp_str_dbg(fsp), (int)state->numtowrite));
+
+       subreq = np_write_send(state, req->sconn->ev_ctx,
+                              fsp->fake_file_handle, data, state->numtowrite);
+       if (subreq == NULL) {
+               TALLOC_FREE(state);
+               reply_nterror(req, NT_STATUS_NO_MEMORY);
                return;
        }
+       tevent_req_set_callback(subreq, pipe_write_done,
+                               talloc_move(req->conn, &req));
+}
+
+static void pipe_write_done(struct tevent_req *subreq)
+{
+       struct smb_request *req = tevent_req_callback_data(
+               subreq, struct smb_request);
+       struct pipe_write_state *state = talloc_get_type_abort(
+               req->async_priv, struct pipe_write_state);
+       NTSTATUS status;
+       ssize_t nwritten = -1;
+
+       status = np_write_recv(subreq, &nwritten);
+       TALLOC_FREE(subreq);
+       if (nwritten < 0) {
+               reply_nterror(req, status);
+               goto send;
+       }
+
+       /* Looks bogus to me now. Needs to be removed ? JRA. */
+       if ((nwritten == 0 && state->numtowrite != 0)) {
+               reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+               goto send;
+       }
 
        reply_outbuf(req, 1, 0);
 
        SSVAL(req->outbuf,smb_vwv0,nwritten);
-  
-       DEBUG(3,("write-IPC pnum=%04x nwritten=%d\n", p->pnum, nwritten));
 
-       return;
+       DEBUG(3,("write-IPC nwritten=%d\n", (int)nwritten));
+
+ send:
+       if (!srv_send_smb(req->xconn, (char *)req->outbuf,
+                         true, req->seqnum+1,
+                         IS_CONN_ENCRYPTED(req->conn)||req->encrypted,
+                         &req->pcd)) {
+               exit_server_cleanly("construct_reply: srv_send_smb failed.");
+       }
+       TALLOC_FREE(req);
 }
 
 /****************************************************************************
@@ -184,67 +262,116 @@ void reply_pipe_write(struct smb_request *req)
  wrinkles to handle pipes.
 ****************************************************************************/
 
+struct pipe_write_andx_state {
+       bool pipe_start_message_raw;
+       size_t numtowrite;
+};
+
+static void pipe_write_andx_done(struct tevent_req *subreq);
+
 void reply_pipe_write_and_X(struct smb_request *req)
 {
-       smb_np_struct *p = get_rpc_pipe_p(SVAL(req->inbuf,smb_vwv2));
-       size_t numtowrite = SVAL(req->inbuf,smb_vwv10);
-       int nwritten = -1;
-       int smb_doff = SVAL(req->inbuf, smb_vwv11);
-       BOOL pipe_start_message_raw =
-               ((SVAL(req->inbuf, smb_vwv7)
-                 & (PIPE_START_MESSAGE|PIPE_RAW_MODE))
-                == (PIPE_START_MESSAGE|PIPE_RAW_MODE));
-       char *data;
+       files_struct *fsp = file_fsp(req, SVAL(req->vwv+2, 0));
+       int smb_doff = SVAL(req->vwv+11, 0);
+       const uint8_t *data;
+       struct pipe_write_andx_state *state;
+       struct tevent_req *subreq;
 
-       if (!p) {
-               reply_doserror(req, ERRDOS, ERRbadfid);
+       if (!fsp_is_np(fsp)) {
+               reply_nterror(req, NT_STATUS_INVALID_HANDLE);
                return;
        }
 
-       if (p->vuid != req->vuid) {
+       if (fsp->vuid != req->vuid) {
                reply_nterror(req, NT_STATUS_INVALID_HANDLE);
                return;
        }
 
-       data = smb_base(req->inbuf) + smb_doff;
-
-       if (numtowrite == 0) {
-               nwritten = 0;
-       } else {
-               if(pipe_start_message_raw) {
-                       /*
-                        * For the start of a message in named pipe byte mode,
-                        * the first two bytes are a length-of-pdu field. Ignore
-                        * them (we don't trust the client). JRA.
-                        */
-                      if(numtowrite < 2) {
-                               DEBUG(0,("reply_pipe_write_and_X: start of "
-                                        "message set and not enough data "
-                                        "sent.(%u)\n",
-                                        (unsigned int)numtowrite ));
-                               reply_unixerror(req, ERRDOS, ERRnoaccess);
-                               return;
-                       }
-
-                       data += 2;
-                       numtowrite -= 2;
-               }                        
-               nwritten = write_to_pipe(p, data, numtowrite);
+       state = talloc(req, struct pipe_write_andx_state);
+       if (state == NULL) {
+               reply_nterror(req, NT_STATUS_NO_MEMORY);
+               return;
        }
+       req->async_priv = state;
+
+       state->numtowrite = SVAL(req->vwv+10, 0);
+       state->pipe_start_message_raw =
+               ((SVAL(req->vwv+7, 0) & (PIPE_START_MESSAGE|PIPE_RAW_MODE))
+                == (PIPE_START_MESSAGE|PIPE_RAW_MODE));
+
+       DEBUG(6, ("reply_pipe_write_and_X: %s, name: %s len: %d\n",
+                 fsp_fnum_dbg(fsp), fsp_str_dbg(fsp), (int)state->numtowrite));
+
+       data = (const uint8_t *)smb_base(req->inbuf) + smb_doff;
+
+       if (state->pipe_start_message_raw) {
+               /*
+                * For the start of a message in named pipe byte mode,
+                * the first two bytes are a length-of-pdu field. Ignore
+                * them (we don't trust the client). JRA.
+                */
+               if (state->numtowrite < 2) {
+                       DEBUG(0,("reply_pipe_write_and_X: start of message "
+                                "set and not enough data sent.(%u)\n",
+                                (unsigned int)state->numtowrite ));
+                       reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
 
-       if ((nwritten == 0 && numtowrite != 0) || (nwritten < 0)) {
-               reply_unixerror(req, ERRDOS,ERRnoaccess);
+               data += 2;
+               state->numtowrite -= 2;
+       }
+
+       subreq = np_write_send(state, req->sconn->ev_ctx,
+                              fsp->fake_file_handle, data, state->numtowrite);
+       if (subreq == NULL) {
+               TALLOC_FREE(state);
+               reply_nterror(req, NT_STATUS_NO_MEMORY);
                return;
        }
+       tevent_req_set_callback(subreq, pipe_write_andx_done,
+                               talloc_move(req->conn, &req));
+}
+
+static void pipe_write_andx_done(struct tevent_req *subreq)
+{
+       struct smb_request *req = tevent_req_callback_data(
+               subreq, struct smb_request);
+       struct pipe_write_andx_state *state = talloc_get_type_abort(
+               req->async_priv, struct pipe_write_andx_state);
+       NTSTATUS status;
+       ssize_t nwritten = -1;
+
+       status = np_write_recv(subreq, &nwritten);
+       TALLOC_FREE(subreq);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               reply_nterror(req, status);
+               goto done;
+       }
+
+       /* Looks bogus to me now. Is this error message correct ? JRA. */
+       if (nwritten != state->numtowrite) {
+               reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+               goto done;
+       }
 
        reply_outbuf(req, 6, 0);
 
-       nwritten = (pipe_start_message_raw ? nwritten + 2 : nwritten);
+       SSVAL(req->outbuf, smb_vwv0, 0xff); /* andx chain ends */
+       SSVAL(req->outbuf, smb_vwv1, 0);    /* no andx offset */
+
+       nwritten = (state->pipe_start_message_raw ? nwritten + 2 : nwritten);
        SSVAL(req->outbuf,smb_vwv2,nwritten);
-  
-       DEBUG(3,("writeX-IPC pnum=%04x nwritten=%d\n", p->pnum, nwritten));
 
-       chain_reply(req);
+       DEBUG(3,("writeX-IPC nwritten=%d\n", (int)nwritten));
+
+ done:
+       /*
+        * We must free here as the ownership of req was
+        * moved to the connection struct in reply_pipe_write_and_X().
+        */
+       smb_request_done(req);
 }
 
 /****************************************************************************
@@ -253,72 +380,126 @@ void reply_pipe_write_and_X(struct smb_request *req)
  wrinkles to handle pipes.
 ****************************************************************************/
 
+struct pipe_read_andx_state {
+       uint8_t *outbuf;
+       int smb_mincnt;
+       int smb_maxcnt;
+};
+
+static void pipe_read_andx_done(struct tevent_req *subreq);
+
 void reply_pipe_read_and_X(struct smb_request *req)
 {
-       smb_np_struct *p = get_rpc_pipe_p(SVAL(req->inbuf,smb_vwv2));
-       int smb_maxcnt = SVAL(req->inbuf,smb_vwv5);
-       int smb_mincnt = SVAL(req->inbuf,smb_vwv6);
-       int nread = -1;
-       char *data;
-       BOOL unused;
+       files_struct *fsp = file_fsp(req, SVAL(req->vwv+0, 0));
+       uint8_t *data;
+       struct pipe_read_andx_state *state;
+       struct tevent_req *subreq;
 
        /* we don't use the offset given to use for pipe reads. This
            is deliberate, instead we always return the next lump of
            data on the pipe */
 #if 0
-       uint32 smb_offs = IVAL(req->inbuf,smb_vwv3);
+       uint32_t smb_offs = IVAL(req->vwv+3, 0);
 #endif
 
-       if (!p) {
-               reply_doserror(req, ERRDOS, ERRbadfid);
+       if (!fsp_is_np(fsp)) {
+               reply_nterror(req, NT_STATUS_INVALID_HANDLE);
                return;
        }
 
-       reply_outbuf(req, 12, smb_maxcnt);
-
-       data = smb_buf(req->outbuf);
-
-       nread = read_from_pipe(p, data, smb_maxcnt, &unused);
-
-       if (nread < 0) {
-               reply_doserror(req, ERRDOS, ERRnoaccess);
+       if (fsp->vuid != req->vuid) {
+               reply_nterror(req, NT_STATUS_INVALID_HANDLE);
                return;
        }
 
-       set_message(NULL, (char *)req->outbuf, 12, nread, False);
-  
-       SSVAL(req->outbuf,smb_vwv5,nread);
-       SSVAL(req->outbuf,smb_vwv6,smb_offset(data,req->outbuf));
-       SSVAL(smb_buf(req->outbuf),-2,nread);
-  
-       DEBUG(3,("readX-IPC pnum=%04x min=%d max=%d nread=%d\n",
-                p->pnum, smb_mincnt, smb_maxcnt, nread));
+       state = talloc(req, struct pipe_read_andx_state);
+       if (state == NULL) {
+               reply_nterror(req, NT_STATUS_NO_MEMORY);
+               return;
+       }
+       req->async_priv = state;
 
-       chain_reply(req);
-}
+       state->smb_maxcnt = SVAL(req->vwv+5, 0);
+       state->smb_mincnt = SVAL(req->vwv+6, 0);
 
-/****************************************************************************
- Reply to a close.
-****************************************************************************/
+       reply_outbuf(req, 12, state->smb_maxcnt + 1 /* padding byte */);
+       SSVAL(req->outbuf, smb_vwv0, 0xff); /* andx chain ends */
+       SSVAL(req->outbuf, smb_vwv1, 0);    /* no andx offset */
+       SCVAL(smb_buf(req->outbuf), 0, 0); /* padding byte */
 
-void reply_pipe_close(connection_struct *conn, struct smb_request *req)
-{
-       smb_np_struct *p = get_rpc_pipe_p(SVAL(req->inbuf,smb_vwv0));
+       data = (uint8_t *)smb_buf(req->outbuf) + 1 /* padding byte */;
 
-       if (!p) {
-               reply_doserror(req, ERRDOS, ERRbadfid);
+       /*
+        * We have to tell the upper layers that we're async.
+        */
+       state->outbuf = req->outbuf;
+       req->outbuf = NULL;
+
+       subreq = np_read_send(state, req->sconn->ev_ctx,
+                             fsp->fake_file_handle, data,
+                             state->smb_maxcnt);
+       if (subreq == NULL) {
+               reply_nterror(req, NT_STATUS_NO_MEMORY);
                return;
        }
+       tevent_req_set_callback(subreq, pipe_read_andx_done,
+                               talloc_move(req->conn, &req));
+}
 
-       DEBUG(5,("reply_pipe_close: pnum:%x\n", p->pnum));
+static void pipe_read_andx_done(struct tevent_req *subreq)
+{
+       struct smb_request *req = tevent_req_callback_data(
+               subreq, struct smb_request);
+       struct pipe_read_andx_state *state = talloc_get_type_abort(
+               req->async_priv, struct pipe_read_andx_state);
+       NTSTATUS status;
+       ssize_t nread;
+       bool is_data_outstanding;
+
+       status = np_read_recv(subreq, &nread, &is_data_outstanding);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               NTSTATUS old = status;
+               status = nt_status_np_pipe(old);
+               reply_nterror(req, status);
+               goto done;
+       }
 
-       if (!close_rpc_pipe_hnd(p)) {
-               reply_doserror(req, ERRDOS, ERRbadfid);
-               return;
+       req->outbuf = state->outbuf;
+       state->outbuf = NULL;
+
+       srv_set_message((char *)req->outbuf, 12, nread + 1 /* padding byte */,
+                       false);
+
+#if 0
+       /*
+        * we should return STATUS_BUFFER_OVERFLOW if there's
+        * out standing data.
+        *
+        * But we can't enable it yet, as it has bad interactions
+        * with fixup_chain_error_packet() in chain_reply().
+        */
+       if (is_data_outstanding) {
+               error_packet_set((char *)req->outbuf, ERRDOS, ERRmoredata,
+                                STATUS_BUFFER_OVERFLOW, __LINE__, __FILE__);
        }
-       
-       /* TODO: REMOVE PIPE FROM DB */
+#endif
+
+       SSVAL(req->outbuf,smb_vwv5,nread);
+       SSVAL(req->outbuf,smb_vwv6,
+             (smb_wct - 4)     /* offset from smb header to wct */
+             + 1               /* the wct field */
+             + 12 * sizeof(uint16_t) /* vwv */
+             + 2               /* the buflen field */
+             + 1);             /* padding byte */
 
-       reply_outbuf(req, 0, 0);
-       return;
+       DEBUG(3,("readX-IPC min=%d max=%d nread=%d\n",
+                state->smb_mincnt, state->smb_maxcnt, (int)nread));
+
+ done:
+       /*
+        * We must free here as the ownership of req was
+        * moved to the connection struct in reply_pipe_read_and_X().
+        */
+       smb_request_done(req);
 }