r23445: Fix suggested by Volker. Don't call rename_open_files
[tprouty/samba.git] / source / smbd / ipc.c
index c4a12ab531b50d50d3a2998ae69b0e9e7885f72b..6b647fc72b665d383bc8cd3e1a335d1506716fa2 100644 (file)
@@ -29,8 +29,6 @@
 
 extern int max_send;
 
-extern fstring local_machine;
-
 #define NERR_notsupported 50
 
 extern int smb_read_error;
@@ -74,10 +72,13 @@ static void copy_trans_params_and_data(char *outbuf, int align,
  Send a trans reply.
  ****************************************************************************/
 
-void send_trans_reply(char *outbuf,
-                               char *rparam, int rparam_len,
-                               char *rdata, int rdata_len,
-                               BOOL buffer_too_large)
+void send_trans_reply(const char *inbuf,
+                       char *outbuf,
+                       char *rparam,
+                       int rparam_len,
+                       char *rdata,
+                       int rdata_len,
+                       BOOL buffer_too_large)
 {
        int this_ldata,this_lparam;
        int tot_data_sent = 0;
@@ -96,14 +97,14 @@ void send_trans_reply(char *outbuf,
        align = ((this_lparam)%4);
 
        if (buffer_too_large) {
-               ERROR_NT(STATUS_BUFFER_OVERFLOW);
+               ERROR_BOTH(STATUS_BUFFER_OVERFLOW,ERRDOS,ERRmoredata);
        }
 
-       set_message(outbuf,10,1+align+this_ldata+this_lparam,True);
+       set_message(inbuf,outbuf,10,1+align+this_ldata+this_lparam,True);
 
        copy_trans_params_and_data(outbuf, align,
-                                                               rparam, tot_param_sent, this_lparam,
-                                                               rdata, tot_data_sent, this_ldata);
+                               rparam, tot_param_sent, this_lparam,
+                               rdata, tot_data_sent, this_ldata);
 
        SSVAL(outbuf,smb_vwv0,lparam);
        SSVAL(outbuf,smb_vwv1,ldata);
@@ -117,7 +118,7 @@ void send_trans_reply(char *outbuf,
 
        show_msg(outbuf);
        if (!send_smb(smbd_server_fd(),outbuf))
-               exit_server("send_trans_reply: send_smb failed.");
+               exit_server_cleanly("send_trans_reply: send_smb failed.");
 
        tot_data_sent = this_ldata;
        tot_param_sent = this_lparam;
@@ -135,12 +136,12 @@ void send_trans_reply(char *outbuf,
 
                align = (this_lparam%4);
 
-               set_message(outbuf,10,1+this_ldata+this_lparam+align,False);
+               set_message(inbuf,outbuf,10,1+this_ldata+this_lparam+align,False);
 
                copy_trans_params_and_data(outbuf, align,
-                                                                       rparam, tot_param_sent, this_lparam,
-                                                                       rdata, tot_data_sent, this_ldata);
-
+                                          rparam, tot_param_sent, this_lparam,
+                                          rdata, tot_data_sent, this_ldata);
+               
                SSVAL(outbuf,smb_vwv3,this_lparam);
                SSVAL(outbuf,smb_vwv4,smb_offset(smb_buf(outbuf)+1,outbuf));
                SSVAL(outbuf,smb_vwv5,tot_param_sent);
@@ -151,7 +152,7 @@ void send_trans_reply(char *outbuf,
 
                show_msg(outbuf);
                if (!send_smb(smbd_server_fd(),outbuf))
-                       exit_server("send_trans_reply: send_smb failed.");
+                       exit_server_cleanly("send_trans_reply: send_smb failed.");
 
                tot_data_sent  += this_ldata;
                tot_param_sent += this_lparam;
@@ -162,10 +163,12 @@ void send_trans_reply(char *outbuf,
  Start the first part of an RPC reply which began with an SMBtrans request.
 ****************************************************************************/
 
-static BOOL api_rpc_trans_reply(char *outbuf, smb_np_struct *p)
+static BOOL api_rpc_trans_reply(const char *inbuf,
+                               char *outbuf,
+                               smb_np_struct *p)
 {
        BOOL is_data_outstanding;
-       char *rdata = malloc(p->max_trans_reply);
+       char *rdata = (char *)SMB_MALLOC(p->max_trans_reply);
        int data_len;
 
        if(rdata == NULL) {
@@ -179,7 +182,7 @@ static BOOL api_rpc_trans_reply(char *outbuf, smb_np_struct *p)
                return False;
        }
 
-       send_trans_reply(outbuf, NULL, 0, rdata, data_len, is_data_outstanding);
+       send_trans_reply(inbuf, outbuf, NULL, 0, rdata, data_len, is_data_outstanding);
 
        SAFE_FREE(rdata);
        return True;
@@ -189,7 +192,11 @@ static BOOL api_rpc_trans_reply(char *outbuf, smb_np_struct *p)
  WaitNamedPipeHandleState 
 ****************************************************************************/
 
-static BOOL api_WNPHS(char *outbuf, smb_np_struct *p, char *param, int param_len)
+static BOOL api_WNPHS(const char *inbuf,
+                       char *outbuf,
+                       smb_np_struct *p,
+                       char *param,
+                       int param_len)
 {
        uint16 priority;
 
@@ -201,7 +208,7 @@ static BOOL api_WNPHS(char *outbuf, smb_np_struct *p, char *param, int param_len
 
        if (wait_rpc_pipe_hnd_state(p, priority)) {
                /* now send the reply */
-               send_trans_reply(outbuf, NULL, 0, NULL, 0, False);
+               send_trans_reply(inbuf, outbuf, NULL, 0, NULL, 0, False);
                return True;
        }
        return False;
@@ -212,7 +219,11 @@ static BOOL api_WNPHS(char *outbuf, smb_np_struct *p, char *param, int param_len
  SetNamedPipeHandleState 
 ****************************************************************************/
 
-static BOOL api_SNPHS(char *outbuf, smb_np_struct *p, char *param, int param_len)
+static BOOL api_SNPHS(const char *inbuf,
+                       char *outbuf,
+                       smb_np_struct *p,
+                       char *param,
+                       int param_len)
 {
        uint16 id;
 
@@ -224,7 +235,7 @@ static BOOL api_SNPHS(char *outbuf, smb_np_struct *p, char *param, int param_len
 
        if (set_rpc_pipe_hnd_state(p, id)) {
                /* now send the reply */
-               send_trans_reply(outbuf, NULL, 0, NULL, 0, False);
+               send_trans_reply(inbuf, outbuf, NULL, 0, NULL, 0, False);
                return True;
        }
        return False;
@@ -235,7 +246,7 @@ static BOOL api_SNPHS(char *outbuf, smb_np_struct *p, char *param, int param_len
  When no reply is generated, indicate unsupported.
  ****************************************************************************/
 
-static BOOL api_no_reply(char *outbuf, int max_rdata_len)
+static BOOL api_no_reply(const char *inbuf, char *outbuf, int max_rdata_len)
 {
        char rparam[4];
 
@@ -246,7 +257,7 @@ static BOOL api_no_reply(char *outbuf, int max_rdata_len)
        DEBUG(3,("Unsupported API fd command\n"));
 
        /* now send the reply */
-       send_trans_reply(outbuf, rparam, 4, NULL, 0, False);
+       send_trans_reply(inbuf, outbuf, rparam, 4, NULL, 0, False);
 
        return -1;
 }
@@ -255,9 +266,18 @@ static BOOL api_no_reply(char *outbuf, int max_rdata_len)
  Handle remote api calls delivered to a named pipe already opened.
  ****************************************************************************/
 
-static int api_fd_reply(connection_struct *conn,uint16 vuid,char *outbuf,
-                       uint16 *setup,char *data,char *params,
-                       int suwcnt,int tdscnt,int tpscnt,int mdrcnt,int mprcnt)
+static int api_fd_reply(connection_struct *conn,
+                       uint16 vuid,
+                       const char *inbuf,
+                       char *outbuf,
+                       uint16 *setup,
+                       char *data,
+                       char *params,
+                       int suwcnt,
+                       int tdscnt,
+                       int tpscnt,
+                       int mdrcnt,
+                       int mprcnt)
 {
        BOOL reply = False;
        smb_np_struct *p = NULL;
@@ -269,7 +289,7 @@ static int api_fd_reply(connection_struct *conn,uint16 vuid,char *outbuf,
        /* First find out the name of this file. */
        if (suwcnt != 2) {
                DEBUG(0,("Unexpected named pipe transaction.\n"));
-               return(-1);
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
        /* Get the file handle and hence the file name. */
@@ -281,11 +301,25 @@ static int api_fd_reply(connection_struct *conn,uint16 vuid,char *outbuf,
        subcommand = ((int)setup[0]) & 0xFFFF;
 
        if(!(p = get_rpc_pipe(pnum))) {
+               if (subcommand == TRANSACT_WAITNAMEDPIPEHANDLESTATE) {
+                       /* Win9x does this call with a unicode pipe name, not a pnum. */
+                       /* Just return success for now... */
+                       DEBUG(3,("Got TRANSACT_WAITNAMEDPIPEHANDLESTATE on text pipe name\n"));
+                       send_trans_reply(inbuf, outbuf, NULL, 0, NULL, 0, False);
+                       return -1;
+               }
+
                DEBUG(1,("api_fd_reply: INVALID PIPE HANDLE: %x\n", pnum));
-               return api_no_reply(outbuf, mdrcnt);
+               return ERROR_NT(NT_STATUS_INVALID_HANDLE);
+       }
+
+       if (vuid != p->vuid) {
+               DEBUG(1, ("Got pipe request (pnum %x) using invalid VUID %d, "
+                         "expected %d\n", pnum, vuid, p->vuid));
+               return ERROR_NT(NT_STATUS_INVALID_HANDLE);
        }
 
-       DEBUG(3,("Got API command 0x%x on pipe \"%s\" (pnum %x)", subcommand, p->name, pnum));
+       DEBUG(3,("Got API command 0x%x on pipe \"%s\" (pnum %x)\n", subcommand, p->name, pnum));
 
        /* record maximum data length that can be transmitted in an SMBtrans */
        p->max_trans_reply = mdrcnt;
@@ -297,49 +331,94 @@ static int api_fd_reply(connection_struct *conn,uint16 vuid,char *outbuf,
                /* dce/rpc command */
                reply = write_to_pipe(p, data, tdscnt);
                if (reply)
-                       reply = api_rpc_trans_reply(outbuf, p);
+                       reply = api_rpc_trans_reply(inbuf, outbuf, p);
                break;
        case TRANSACT_WAITNAMEDPIPEHANDLESTATE:
                /* Wait Named Pipe Handle state */
-               reply = api_WNPHS(outbuf, p, params, tpscnt);
+               reply = api_WNPHS(inbuf, outbuf, p, params, tpscnt);
                break;
        case TRANSACT_SETNAMEDPIPEHANDLESTATE:
                /* Set Named Pipe Handle state */
-               reply = api_SNPHS(outbuf, p, params, tpscnt);
+               reply = api_SNPHS(inbuf, outbuf, p, params, tpscnt);
                break;
+       default:
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
        if (!reply)
-               return api_no_reply(outbuf, mdrcnt);
+               return api_no_reply(inbuf, outbuf, mdrcnt);
 
        return -1;
 }
 
 /****************************************************************************
-  handle named pipe commands
-  ****************************************************************************/
-static int named_pipe(connection_struct *conn,uint16 vuid, char *outbuf,char *name,
-                     uint16 *setup,char *data,char *params,
-                     int suwcnt,int tdscnt,int tpscnt,
-                     int msrcnt,int mdrcnt,int mprcnt)
+ Handle named pipe commands.
+****************************************************************************/
+
+static int named_pipe(connection_struct *conn,
+                       uint16 vuid,
+                       const char *inbuf,
+                       char *outbuf,
+                       char *name,
+                       uint16 *setup,
+                       char *data,
+                       char *params,
+                       int suwcnt,
+                       int tdscnt,
+                       int tpscnt,
+                       int msrcnt,
+                       int mdrcnt,
+                       int mprcnt)
 {
        DEBUG(3,("named pipe command on <%s> name\n", name));
 
-       if (strequal(name,"LANMAN"))
-               return api_reply(conn,vuid,outbuf,data,params,tdscnt,tpscnt,mdrcnt,mprcnt);
+       if (strequal(name,"LANMAN")) {
+               return api_reply(conn,
+                               vuid,
+                               inbuf,
+                               outbuf,
+                               data,
+                               params,
+                               tdscnt,
+                               tpscnt,
+                               mdrcnt,
+                               mprcnt);
+       }
 
        if (strequal(name,"WKSSVC") ||
            strequal(name,"SRVSVC") ||
            strequal(name,"WINREG") ||
            strequal(name,"SAMR") ||
-           strequal(name,"LSARPC"))
-       {
+           strequal(name,"LSARPC")) {
                DEBUG(4,("named pipe command from Win95 (wow!)\n"));
-               return api_fd_reply(conn,vuid,outbuf,setup,data,params,suwcnt,tdscnt,tpscnt,mdrcnt,mprcnt);
+               return api_fd_reply(conn,
+                                       vuid,
+                                       inbuf,
+                                       outbuf,
+                                       setup,
+                                       data,
+                                       params,
+                                       suwcnt,
+                                       tdscnt,
+                                       tpscnt,
+                                       mdrcnt,
+                                       mprcnt);
        }
 
-       if (strlen(name) < 1)
-               return api_fd_reply(conn,vuid,outbuf,setup,data,params,suwcnt,tdscnt,tpscnt,mdrcnt,mprcnt);
+       if (strlen(name) < 1) {
+               return api_fd_reply(conn,
+                                       vuid,
+                                       inbuf,
+                                       outbuf,
+                                       setup,
+                                       data,
+                                       params,
+                                       suwcnt,
+                                       tdscnt,
+                                       tpscnt,
+                                       mdrcnt,
+                                       mprcnt);
+       }
 
        if (setup)
                DEBUG(3,("unknown named pipe: setup 0x%X setup1=%d\n", (int)setup[0],(int)setup[1]));
@@ -347,224 +426,362 @@ static int named_pipe(connection_struct *conn,uint16 vuid, char *outbuf,char *na
        return 0;
 }
 
+static NTSTATUS handle_trans(connection_struct *conn,
+                               struct trans_state *state,
+                               const char *inbuf,
+                               char *outbuf,
+                               int *outsize)
+{
+       char *local_machine_name;
+       int name_offset = 0;
+
+       DEBUG(3,("trans <%s> data=%u params=%u setup=%u\n",
+                state->name,(unsigned int)state->total_data,(unsigned int)state->total_param,
+                (unsigned int)state->setup_count));
+
+       /*
+        * WinCE wierdness....
+        */
+
+       local_machine_name = talloc_asprintf(state, "\\%s\\",
+                                            get_local_machine_name());
+
+       if (local_machine_name == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (strnequal(state->name, local_machine_name,
+                     strlen(local_machine_name))) {
+               name_offset = strlen(local_machine_name)-1;
+       }
+
+       if (!strnequal(&state->name[name_offset], "\\PIPE",
+                      strlen("\\PIPE"))) {
+               return NT_STATUS_NOT_SUPPORTED;
+       }
+       
+       name_offset += strlen("\\PIPE");
+
+       /* Win9x weirdness.  When talking to a unicode server Win9x
+          only sends \PIPE instead of \PIPE\ */
+
+       if (state->name[name_offset] == '\\')
+               name_offset++;
+
+       DEBUG(5,("calling named_pipe\n"));
+       *outsize = named_pipe(conn,
+                               state->vuid,
+                               inbuf,
+                               outbuf,
+                               state->name+name_offset,
+                               state->setup,state->data,
+                               state->param,
+                               state->setup_count,state->total_data,
+                               state->total_param,
+                               state->max_setup_return,
+                               state->max_data_return,
+                               state->max_param_return);
+
+       if (*outsize == 0) {
+               return NT_STATUS_NOT_SUPPORTED;
+       }
+
+       if (state->close_on_completion)
+               close_cnum(conn,state->vuid);
+
+       return NT_STATUS_OK;
+}
 
 /****************************************************************************
  Reply to a SMBtrans.
  ****************************************************************************/
 
-int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int bufsize)
+int reply_trans(connection_struct *conn,
+               char *inbuf,
+               char *outbuf,
+               int size,
+               int bufsize)
 {
-       fstring name;
-       int name_offset = 0;
-       char *data=NULL,*params=NULL;
-       uint16 *setup=NULL;
        int outsize = 0;
-       uint16 vuid = SVAL(inbuf,smb_uid);
-       unsigned int tpscnt = SVAL(inbuf,smb_vwv0);
-       unsigned int tdscnt = SVAL(inbuf,smb_vwv1);
-       unsigned int mprcnt = SVAL(inbuf,smb_vwv2);
-       unsigned int mdrcnt = SVAL(inbuf,smb_vwv3);
-       unsigned int msrcnt = CVAL(inbuf,smb_vwv4);
-       BOOL close_on_completion = BITSETW(inbuf+smb_vwv5,0);
-       BOOL one_way = BITSETW(inbuf+smb_vwv5,1);
-       unsigned int pscnt = SVAL(inbuf,smb_vwv9);
-       unsigned int psoff = SVAL(inbuf,smb_vwv10);
-       unsigned int dscnt = SVAL(inbuf,smb_vwv11);
-       unsigned int dsoff = SVAL(inbuf,smb_vwv12);
-       unsigned int suwcnt = CVAL(inbuf,smb_vwv13);
+       unsigned int dsoff = SVAL(inbuf, smb_dsoff);
+       unsigned int dscnt = SVAL(inbuf, smb_dscnt);
+       unsigned int psoff = SVAL(inbuf, smb_psoff);
+       unsigned int pscnt = SVAL(inbuf, smb_pscnt);
+       struct trans_state *state;
+       NTSTATUS result;
+
        START_PROFILE(SMBtrans);
 
-       memset(name, '\0',sizeof(name));
-       srvstr_pull_buf(inbuf, name, smb_buf(inbuf), sizeof(name), STR_TERMINATE);
+       result = allow_new_trans(conn->pending_trans, SVAL(inbuf, smb_mid));
+       if (!NT_STATUS_IS_OK(result)) {
+               DEBUG(2, ("Got invalid trans request: %s\n",
+                         nt_errstr(result)));
+               END_PROFILE(SMBtrans);
+               return ERROR_NT(result);
+       }
 
-       if (dscnt > tdscnt || pscnt > tpscnt)
+       if ((state = TALLOC_P(conn->mem_ctx, struct trans_state)) == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               END_PROFILE(SMBtrans);
+               return ERROR_NT(NT_STATUS_NO_MEMORY);
+       }
+
+       state->cmd = SMBtrans;
+
+       state->mid = SVAL(inbuf, smb_mid);
+       state->vuid = SVAL(inbuf, smb_uid);
+       state->setup_count = CVAL(inbuf, smb_suwcnt);
+       state->setup = NULL;
+       state->total_param = SVAL(inbuf, smb_tpscnt);
+       state->param = NULL;
+       state->total_data = SVAL(inbuf, smb_tdscnt);
+       state->data = NULL;
+       state->max_param_return = SVAL(inbuf, smb_mprcnt);
+       state->max_data_return = SVAL(inbuf, smb_mdrcnt);
+       state->max_setup_return = CVAL(inbuf, smb_msrcnt);
+       state->close_on_completion = BITSETW(inbuf+smb_vwv5,0);
+       state->one_way = BITSETW(inbuf+smb_vwv5,1);
+
+       memset(state->name, '\0',sizeof(state->name));
+       srvstr_pull_buf(inbuf, state->name, smb_buf(inbuf),
+                       sizeof(state->name), STR_TERMINATE);
+       
+       if ((dscnt > state->total_data) || (pscnt > state->total_param))
                goto bad_param;
-  
-       if (tdscnt)  {
-               if((data = (char *)malloc(tdscnt)) == NULL) {
-                       DEBUG(0,("reply_trans: data malloc fail for %u bytes !\n", tdscnt));
+
+       if (state->total_data)  {
+               /* Can't use talloc here, the core routines do realloc on the
+                * params and data. Out of paranoia, 100 bytes too many. */
+               state->data = (char *)SMB_MALLOC(state->total_data+100);
+               if (state->data == NULL) {
+                       DEBUG(0,("reply_trans: data malloc fail for %u "
+                                "bytes !\n", (unsigned int)state->total_data));
+                       TALLOC_FREE(state);
                        END_PROFILE(SMBtrans);
                        return(ERROR_DOS(ERRDOS,ERRnomem));
                } 
+               /* null-terminate the slack space */
+               memset(&state->data[state->total_data], 0, 100);
                if ((dsoff+dscnt < dsoff) || (dsoff+dscnt < dscnt))
                        goto bad_param;
-               if (smb_base(inbuf)+dsoff+dscnt > inbuf + size)
+               if ((smb_base(inbuf)+dsoff+dscnt > inbuf + size) ||
+                   (smb_base(inbuf)+dsoff+dscnt < smb_base(inbuf)))
                        goto bad_param;
 
-               memcpy(data,smb_base(inbuf)+dsoff,dscnt);
+               memcpy(state->data,smb_base(inbuf)+dsoff,dscnt);
        }
 
-       if (tpscnt) {
-               if((params = (char *)malloc(tpscnt)) == NULL) {
-                       DEBUG(0,("reply_trans: param malloc fail for %u bytes !\n", tpscnt));
-                       SAFE_FREE(data);
+       if (state->total_param) {
+               /* Can't use talloc here, the core routines do realloc on the
+                * params and data. Out of paranoia, 100 bytes too many */
+               state->param = (char *)SMB_MALLOC(state->total_param+100);
+               if (state->param == NULL) {
+                       DEBUG(0,("reply_trans: param malloc fail for %u "
+                                "bytes !\n", (unsigned int)state->total_param));
+                       SAFE_FREE(state->data);
+                       TALLOC_FREE(state);
                        END_PROFILE(SMBtrans);
                        return(ERROR_DOS(ERRDOS,ERRnomem));
                } 
+               /* null-terminate the slack space */
+               memset(&state->param[state->total_param], 0, 100);
                if ((psoff+pscnt < psoff) || (psoff+pscnt < pscnt))
-                        goto bad_param;
-               if (smb_base(inbuf)+psoff+pscnt > inbuf + size)
+                       goto bad_param;
+               if ((smb_base(inbuf)+psoff+pscnt > inbuf + size) ||
+                   (smb_base(inbuf)+psoff+pscnt < smb_base(inbuf)))
                        goto bad_param;
 
-               memcpy(params,smb_base(inbuf)+psoff,pscnt);
+               memcpy(state->param,smb_base(inbuf)+psoff,pscnt);
        }
 
-       if (suwcnt) {
+       state->received_data  = dscnt;
+       state->received_param = pscnt;
+
+       if (state->setup_count) {
                unsigned int i;
-               if((setup = (uint16 *)malloc(suwcnt*sizeof(uint16))) == NULL) {
-                       DEBUG(0,("reply_trans: setup malloc fail for %u bytes !\n", (unsigned int)(suwcnt * sizeof(uint16))));
-                       SAFE_FREE(data);
-                       SAFE_FREE(params);
+               if((state->setup = TALLOC_ARRAY(
+                           state, uint16, state->setup_count)) == NULL) {
+                       DEBUG(0,("reply_trans: setup malloc fail for %u "
+                                "bytes !\n", (unsigned int)
+                                (state->setup_count * sizeof(uint16))));
+                       TALLOC_FREE(state);
                        END_PROFILE(SMBtrans);
                        return(ERROR_DOS(ERRDOS,ERRnomem));
                } 
-               if (inbuf+smb_vwv14+(suwcnt*SIZEOFWORD) > inbuf + size)
+               if (inbuf+smb_vwv14+(state->setup_count*SIZEOFWORD) >
+                   inbuf + size)
                        goto bad_param;
-               if ((smb_vwv14+(suwcnt*SIZEOFWORD) < smb_vwv14) || (smb_vwv14+(suwcnt*SIZEOFWORD) < (suwcnt*SIZEOFWORD)))
+               if ((smb_vwv14+(state->setup_count*SIZEOFWORD) < smb_vwv14) ||
+                   (smb_vwv14+(state->setup_count*SIZEOFWORD) <
+                    (state->setup_count*SIZEOFWORD)))
                        goto bad_param;
 
-               for (i=0;i<suwcnt;i++)
-                       setup[i] = SVAL(inbuf,smb_vwv14+i*SIZEOFWORD);
+               for (i=0;i<state->setup_count;i++)
+                       state->setup[i] = SVAL(inbuf,smb_vwv14+i*SIZEOFWORD);
        }
 
+       state->received_param = pscnt;
 
-       if (pscnt < tpscnt || dscnt < tdscnt) {
-               /* We need to send an interim response then receive the rest
-                  of the parameter/data bytes */
-               outsize = set_message(outbuf,0,0,True);
-               show_msg(outbuf);
-               if (!send_smb(smbd_server_fd(),outbuf))
-                       exit_server("reply_trans: send_smb failed.");
-       }
+       if ((state->received_param == state->total_param) &&
+           (state->received_data == state->total_data)) {
+
+               result = handle_trans(conn, state, inbuf, outbuf, &outsize);
+
+               SAFE_FREE(state->data);
+               SAFE_FREE(state->param);
+               TALLOC_FREE(state);
 
-       /* receive the rest of the trans packet */
-       while (pscnt < tpscnt || dscnt < tdscnt) {
-               BOOL ret;
-               unsigned int pcnt,poff,dcnt,doff,pdisp,ddisp;
-      
-               ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT);
-
-               if ((ret && (CVAL(inbuf, smb_com) != SMBtranss)) || !ret) {
-                       if(ret) {
-                               DEBUG(0,("reply_trans: Invalid secondary trans packet\n"));
-                       } else {
-                               DEBUG(0,("reply_trans: %s in getting secondary trans response.\n",
-                                        (smb_read_error == READ_ERROR) ? "error" : "timeout" ));
-                       }
-                       SAFE_FREE(params);
-                       SAFE_FREE(data);
-                       SAFE_FREE(setup);
+               if (!NT_STATUS_IS_OK(result)) {
                        END_PROFILE(SMBtrans);
-                       return(ERROR_DOS(ERRSRV,ERRerror));
+                       return ERROR_NT(result);
                }
 
-               show_msg(inbuf);
-      
-               /* Revise total_params and total_data in case they have changed downwards */
-               if (SVAL(inbuf,smb_vwv0) < tpscnt)
-                       tpscnt = SVAL(inbuf,smb_vwv0);
-               if (SVAL(inbuf,smb_vwv1) < tdscnt)
-                       tdscnt = SVAL(inbuf,smb_vwv1);
-
-               pcnt = SVAL(inbuf,smb_vwv2);
-               poff = SVAL(inbuf,smb_vwv3);
-               pdisp = SVAL(inbuf,smb_vwv4);
-               
-               dcnt = SVAL(inbuf,smb_vwv5);
-               doff = SVAL(inbuf,smb_vwv6);
-               ddisp = SVAL(inbuf,smb_vwv7);
-               
-               pscnt += pcnt;
-               dscnt += dcnt;
-               
-               if (dscnt > tdscnt || pscnt > tpscnt)
-                       goto bad_param;
-               
-               if (pcnt) {
-                       if (pdisp+pcnt >= tpscnt)
-                               goto bad_param;
-                       if ((pdisp+pcnt < pdisp) || (pdisp+pcnt < pcnt))
-                                goto bad_param;
-                       if (smb_base(inbuf) + poff + pcnt >= inbuf + bufsize)
-                               goto bad_param;
-                       if (params + pdisp < params)
-                               goto bad_param;
-
-                       memcpy(params+pdisp,smb_base(inbuf)+poff,pcnt);
+               if (outsize == 0) {
+                       END_PROFILE(SMBtrans);
+                       return ERROR_NT(NT_STATUS_INTERNAL_ERROR);
                }
 
-               if (dcnt) {
-                       if (ddisp+dcnt >= tdscnt)
-                               goto bad_param;
-                       if ((ddisp+dcnt < ddisp) || (ddisp+dcnt < dcnt))
-                               goto bad_param;
-                       if (smb_base(inbuf) + doff + dcnt >= inbuf + bufsize)
-                               goto bad_param;
-                       if (data + ddisp < data)
-                               goto bad_param;
-
-                       memcpy(data+ddisp,smb_base(inbuf)+doff,dcnt);      
+               END_PROFILE(SMBtrans);
+               return outsize;
+       }
+
+       DLIST_ADD(conn->pending_trans, state);
+
+       /* We need to send an interim response then receive the rest
+          of the parameter/data bytes */
+       outsize = set_message(inbuf,outbuf,0,0,True);
+       show_msg(outbuf);
+       END_PROFILE(SMBtrans);
+       return outsize;
+
+  bad_param:
+
+       DEBUG(0,("reply_trans: invalid trans parameters\n"));
+       SAFE_FREE(state->data);
+       SAFE_FREE(state->param);
+       TALLOC_FREE(state);
+       END_PROFILE(SMBtrans);
+       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+}
+
+/****************************************************************************
+ Reply to a secondary SMBtrans.
+ ****************************************************************************/
+
+int reply_transs(connection_struct *conn, char *inbuf,char *outbuf,
+                int size, int bufsize)
+{
+       int outsize = 0;
+       unsigned int pcnt,poff,dcnt,doff,pdisp,ddisp;
+       struct trans_state *state;
+       NTSTATUS result;
+
+       START_PROFILE(SMBtranss);
+
+       show_msg(inbuf);
+
+       for (state = conn->pending_trans; state != NULL;
+            state = state->next) {
+               if (state->mid == SVAL(inbuf,smb_mid)) {
+                       break;
                }
        }
-       
-       
-       DEBUG(3,("trans <%s> data=%u params=%u setup=%u\n",
-                name,tdscnt,tpscnt,suwcnt));
-       
-       /*
-        * WinCE wierdness....
-        */
 
-       if (name[0] == '\\' && (StrnCaseCmp(&name[1],local_machine, strlen(local_machine)) == 0) &&
-                       (name[strlen(local_machine)+1] == '\\'))
-               name_offset = strlen(local_machine)+1;
+       if ((state == NULL) || (state->cmd != SMBtrans)) {
+               END_PROFILE(SMBtranss);
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       }
 
-       if (strnequal(&name[name_offset], "\\PIPE", strlen("\\PIPE"))) {
-               name_offset += strlen("\\PIPE");
+       /* Revise total_params and total_data in case they have changed
+        * downwards */
 
-               /* Win9x weirdness.  When talking to a unicode server Win9x
-                  only sends \PIPE instead of \PIPE\ */
+       if (SVAL(inbuf, smb_vwv0) < state->total_param)
+               state->total_param = SVAL(inbuf,smb_vwv0);
+       if (SVAL(inbuf, smb_vwv1) < state->total_data)
+               state->total_data = SVAL(inbuf,smb_vwv1);
 
-               if (name[name_offset] == '\\')
-                       name_offset++;
+       pcnt = SVAL(inbuf, smb_spscnt);
+       poff = SVAL(inbuf, smb_spsoff);
+       pdisp = SVAL(inbuf, smb_spsdisp);
 
-               DEBUG(5,("calling named_pipe\n"));
-               outsize = named_pipe(conn,vuid,outbuf,
-                                    name+name_offset,setup,data,params,
-                                    suwcnt,tdscnt,tpscnt,msrcnt,mdrcnt,mprcnt);
-       } else {
-               DEBUG(3,("invalid pipe name\n"));
-               outsize = 0;
+       dcnt = SVAL(inbuf, smb_sdscnt);
+       doff = SVAL(inbuf, smb_sdsoff);
+       ddisp = SVAL(inbuf, smb_sdsdisp);
+
+       state->received_param += pcnt;
+       state->received_data += dcnt;
+               
+       if ((state->received_data > state->total_data) ||
+           (state->received_param > state->total_param))
+               goto bad_param;
+               
+       if (pcnt) {
+               if (pdisp+pcnt > state->total_param)
+                       goto bad_param;
+               if ((pdisp+pcnt < pdisp) || (pdisp+pcnt < pcnt))
+                       goto bad_param;
+               if (pdisp > state->total_param)
+                       goto bad_param;
+               if ((smb_base(inbuf) + poff + pcnt > inbuf + size) ||
+                   (smb_base(inbuf) + poff + pcnt < smb_base(inbuf)))
+                       goto bad_param;
+               if (state->param + pdisp < state->param)
+                       goto bad_param;
+
+               memcpy(state->param+pdisp,smb_base(inbuf)+poff,
+                      pcnt);
        }
 
-       
-       SAFE_FREE(data);
-       SAFE_FREE(params);
-       SAFE_FREE(setup);
-       
-       if (close_on_completion)
-               close_cnum(conn,vuid);
+       if (dcnt) {
+               if (ddisp+dcnt > state->total_data)
+                       goto bad_param;
+               if ((ddisp+dcnt < ddisp) || (ddisp+dcnt < dcnt))
+                       goto bad_param;
+               if (ddisp > state->total_data)
+                       goto bad_param;
+               if ((smb_base(inbuf) + doff + dcnt > inbuf + size) ||
+                   (smb_base(inbuf) + doff + dcnt < smb_base(inbuf)))
+                       goto bad_param;
+               if (state->data + ddisp < state->data)
+                       goto bad_param;
 
-       if (one_way) {
-               END_PROFILE(SMBtrans);
-               return(-1);
+               memcpy(state->data+ddisp, smb_base(inbuf)+doff,
+                      dcnt);      
        }
-       
-       if (outsize == 0) {
-               END_PROFILE(SMBtrans);
+
+       if ((state->received_param < state->total_param) ||
+           (state->received_data < state->total_data)) {
+               END_PROFILE(SMBtranss);
+               return -1;
+       }
+
+       /* construct_reply_common has done us the favor to pre-fill the
+        * command field with SMBtranss which is wrong :-)
+        */
+       SCVAL(outbuf,smb_com,SMBtrans);
+
+       result = handle_trans(conn, state, inbuf, outbuf, &outsize);
+
+       DLIST_REMOVE(conn->pending_trans, state);
+       SAFE_FREE(state->data);
+       SAFE_FREE(state->param);
+       TALLOC_FREE(state);
+
+       if ((outsize == 0) || !NT_STATUS_IS_OK(result)) {
+               END_PROFILE(SMBtranss);
                return(ERROR_DOS(ERRSRV,ERRnosupport));
        }
        
-       END_PROFILE(SMBtrans);
+       END_PROFILE(SMBtranss);
        return(outsize);
 
-
   bad_param:
 
-       DEBUG(0,("reply_trans: invalid trans parameters\n"));
-       SAFE_FREE(data);
-       SAFE_FREE(params);
-       SAFE_FREE(setup);
-       END_PROFILE(SMBtrans);
+       DEBUG(0,("reply_transs: invalid trans parameters\n"));
+       DLIST_REMOVE(conn->pending_trans, state);
+       SAFE_FREE(state->data);
+       SAFE_FREE(state->param);
+       TALLOC_FREE(state);
+       END_PROFILE(SMBtranss);
        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 }