Fix signing problem in the client with transs requests
[samba.git] / source / libsmb / clitrans.c
index 5cd6ae30ce0938d7e09b4fdc7fb608cf15da8aa4..441f5a0a8925b493ce27859fe6ee3de552fd0cce 100644 (file)
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
+   Unix SMB/CIFS implementation.
    client transaction calls
    Copyright (C) Andrew Tridgell 1994-1998
    
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#define NO_SYSLOG
-
 #include "includes.h"
 
 
 /****************************************************************************
-  send a SMB trans or trans2 request
-  ****************************************************************************/
+ Send a SMB trans or trans2 request.
+****************************************************************************/
+
 BOOL cli_send_trans(struct cli_state *cli, int trans, 
-                   char *name, int pipe_name_len
+                   const char *pipe_name
                    int fid, int flags,
-                   uint16 *setup, int lsetup, int msetup,
-                   char *param, int lparam, int mparam,
-                   char *data, int ldata, int mdata)
+                   uint16 *setup, unsigned int lsetup, unsigned int msetup,
+                   const char *param, unsigned int lparam, unsigned int mparam,
+                   const char *data, unsigned int ldata, unsigned int mdata)
 {
-       int i;
-       int this_ldata,this_lparam;
-       int tot_data=0,tot_param=0;
+       unsigned int i;
+       unsigned int this_ldata,this_lparam;
+       unsigned int tot_data=0,tot_param=0;
        char *outdata,*outparam;
        char *p;
+       int pipe_name_len=0;
+       uint16 mid;
 
        this_lparam = MIN(lparam,cli->max_xmit - (500+lsetup*2)); /* hack */
        this_ldata = MIN(ldata,cli->max_xmit - (500+lsetup*2+this_lparam));
 
        memset(cli->outbuf,'\0',smb_size);
        set_message(cli->outbuf,14+lsetup,0,True);
-       CVAL(cli->outbuf,smb_com) = trans;
+       SCVAL(cli->outbuf,smb_com,trans);
        SSVAL(cli->outbuf,smb_tid, cli->cnum);
        cli_setup_packet(cli);
 
-       outparam = smb_buf(cli->outbuf)+(trans==SMBtrans ? pipe_name_len+1 : 3);
+       /*
+        * Save the mid we're using. We need this for finding
+        * signing replies.
+        */
+
+       mid = cli->mid;
+
+       if (pipe_name) {
+               pipe_name_len = clistr_push(cli, smb_buf(cli->outbuf), pipe_name, -1, STR_TERMINATE);
+       }
+
+       outparam = smb_buf(cli->outbuf)+(trans==SMBtrans ? pipe_name_len : 3);
        outdata = outparam+this_lparam;
 
        /* primary request */
@@ -68,9 +79,7 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
        for (i=0;i<lsetup;i++)          /* setup[] */
                SSVAL(cli->outbuf,smb_setup+i*2,setup[i]);
        p = smb_buf(cli->outbuf);
-       if (trans==SMBtrans) {
-               memcpy(p,name, pipe_name_len + 1);  /* name[] */
-       } else {
+       if (trans != SMBtrans) {
                *p++ = 0;  /* put in a null smb_name */
                *p++ = 'D'; *p++ = ' '; /* observed in OS/2 */
        }
@@ -78,18 +87,24 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
                memcpy(outparam,param,this_lparam);
        if (this_ldata)                 /* data[] */
                memcpy(outdata,data,this_ldata);
-       set_message(cli->outbuf,14+lsetup,              /* wcnt, bcc */
-                   PTR_DIFF(outdata+this_ldata,smb_buf(cli->outbuf)),False);
+       cli_setup_bcc(cli, outdata+this_ldata);
 
        show_msg(cli->outbuf);
-       cli_send_smb(cli);
+
+       if (!cli_send_smb(cli)) {
+               return False;
+       }
+
+       /* Note we're in a trans state. Save the sequence
+        * numbers for replies. */
+       client_set_trans_sign_state_on(cli, mid);
 
        if (this_ldata < ldata || this_lparam < lparam) {
                /* receive interim response */
-               if (!cli_receive_smb(cli) || 
-                   CVAL(cli->inbuf,smb_rcls) != 0) {
+               if (!cli_receive_smb(cli) || cli_is_error(cli)) {
+                       client_set_trans_sign_state_off(cli, mid);
                        return(False);
-               }      
+               }
 
                tot_data = this_ldata;
                tot_param = this_lparam;
@@ -98,8 +113,11 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
                        this_lparam = MIN(lparam-tot_param,cli->max_xmit - 500); /* hack */
                        this_ldata = MIN(ldata-tot_data,cli->max_xmit - (500+this_lparam));
 
+                       client_set_trans_sign_state_off(cli, mid);
+                       client_set_trans_sign_state_on(cli, mid);
+
                        set_message(cli->outbuf,trans==SMBtrans?8:9,0,True);
-                       CVAL(cli->outbuf,smb_com) = trans==SMBtrans ? SMBtranss : SMBtranss2;
+                       SCVAL(cli->outbuf,smb_com,(trans==SMBtrans ? SMBtranss : SMBtranss2));
                        
                        outparam = smb_buf(cli->outbuf);
                        outdata = outparam+this_lparam;
@@ -119,11 +137,22 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
                                memcpy(outparam,param+tot_param,this_lparam);
                        if (this_ldata)                 /* data[] */
                                memcpy(outdata,data+tot_data,this_ldata);
-                       set_message(cli->outbuf,trans==SMBtrans?8:9, /* wcnt, bcc */
-                                   PTR_DIFF(outdata+this_ldata,smb_buf(cli->outbuf)),False);
+                       cli_setup_bcc(cli, outdata+this_ldata);
                        
+                       /*
+                        * Save the mid we're using. We need this for finding
+                        * signing replies.
+                        */
+                       mid = cli->mid;
+
                        show_msg(cli->outbuf);
-                       cli_send_smb(cli);
+                       if (!cli_send_smb(cli)) {
+                               client_set_trans_sign_state_off(cli, mid);
+                               return False;
+                       }
+
+                       /* Ensure we use the same mid for the secondaries. */
+                       cli->mid = mid;
                        
                        tot_data += this_ldata;
                        tot_param += this_lparam;
@@ -133,24 +162,25 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
        return(True);
 }
 
-
 /****************************************************************************
-  receive a SMB trans or trans2 response allocating the necessary memory
-  ****************************************************************************/
+ Receive a SMB trans or trans2 response allocating the necessary memory.
+****************************************************************************/
+
 BOOL cli_receive_trans(struct cli_state *cli,int trans,
-                              char **param, int *param_len,
-                              char **data, int *data_len)
+                              char **param, unsigned int *param_len,
+                              char **data, unsigned int *data_len)
 {
-       int total_data=0;
-       int total_param=0;
-       int this_data,this_param;
-       uint8 eclass;
-       uint32 ecode;
+       unsigned int total_data=0;
+       unsigned int total_param=0;
+       unsigned int this_data,this_param;
+       NTSTATUS status;
+       BOOL ret = False;
 
        *data_len = *param_len = 0;
 
-       if (!cli_receive_smb(cli))
+       if (!cli_receive_smb(cli)) {
                return False;
+       }
 
        show_msg(cli->inbuf);
        
@@ -159,24 +189,21 @@ BOOL cli_receive_trans(struct cli_state *cli,int trans,
                DEBUG(0,("Expected %s response, got command 0x%02x\n",
                         trans==SMBtrans?"SMBtrans":"SMBtrans2", 
                         CVAL(cli->inbuf,smb_com)));
-               return(False);
+               return False;
        }
 
        /*
         * An NT RPC pipe call can return ERRDOS, ERRmoredata
         * to a trans call. This is not an error and should not
-        * be treated as such.
+        * be treated as such. Note that STATUS_NO_MORE_FILES is
+        * returned when a trans2 findfirst/next finishes.
         */
-
-       if (cli_error(cli, &eclass, &ecode, NULL))
-       {
-        if(cli->nt_pipe_fnum == 0)
-                       return(False);
-
-        if(!(eclass == ERRDOS && ecode == ERRmoredata)) {
-                       if (eclass != 0 && (ecode != (0x80000000 | STATUS_BUFFER_OVERFLOW)))
-                               return(False);
-               }
+       status = cli_nt_error(cli);
+       
+       if (NT_STATUS_IS_ERR(status) ||
+            NT_STATUS_EQUAL(status,STATUS_NO_MORE_FILES) ||
+            NT_STATUS_EQUAL(status,STATUS_INACCESSIBLE_SYSTEM_SHORTCUT)) {
+               goto out;
        }
 
        /* parse out the lengths */
@@ -184,39 +211,93 @@ BOOL cli_receive_trans(struct cli_state *cli,int trans,
        total_param = SVAL(cli->inbuf,smb_tprcnt);
 
        /* allocate it */
-       *data = Realloc(*data,total_data);
-       *param = Realloc(*param,total_param);
+       if (total_data!=0) {
+               *data = (char *)SMB_REALLOC(*data,total_data);
+               if (!(*data)) {
+                       DEBUG(0,("cli_receive_trans: failed to enlarge data buffer\n"));
+                       goto out;
+               }
+       }
 
-       while (1)  {
+       if (total_param!=0) {
+               *param = (char *)SMB_REALLOC(*param,total_param);
+               if (!(*param)) {
+                       DEBUG(0,("cli_receive_trans: failed to enlarge param buffer\n"));
+                       goto out;
+               }
+       }
+
+       for (;;)  {
                this_data = SVAL(cli->inbuf,smb_drcnt);
                this_param = SVAL(cli->inbuf,smb_prcnt);
 
                if (this_data + *data_len > total_data ||
                    this_param + *param_len > total_param) {
                        DEBUG(1,("Data overflow in cli_receive_trans\n"));
-                       return False;
+                       goto out;
+               }
+
+               if (this_data + *data_len < this_data ||
+                               this_data + *data_len < *data_len ||
+                               this_param + *param_len < this_param ||
+                               this_param + *param_len < *param_len) {
+                       DEBUG(1,("Data overflow in cli_receive_trans\n"));
+                       goto out;
                }
 
-               if (this_data)
-                       memcpy(*data + SVAL(cli->inbuf,smb_drdisp),
-                              smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_droff),
-                              this_data);
-               if (this_param)
-                       memcpy(*param + SVAL(cli->inbuf,smb_prdisp),
-                              smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_proff),
-                              this_param);
+               if (this_data) {
+                       unsigned int data_offset_out = SVAL(cli->inbuf,smb_drdisp);
+                       unsigned int data_offset_in = SVAL(cli->inbuf,smb_droff);
+
+                       if (data_offset_out > total_data ||
+                                       data_offset_out + this_data > total_data ||
+                                       data_offset_out + this_data < data_offset_out ||
+                                       data_offset_out + this_data < this_data) {
+                               DEBUG(1,("Data overflow in cli_receive_trans\n"));
+                               goto out;
+                       }
+                       if (data_offset_in > cli->bufsize ||
+                                       data_offset_in + this_data >  cli->bufsize ||
+                                       data_offset_in + this_data < data_offset_in ||
+                                       data_offset_in + this_data < this_data) {
+                               DEBUG(1,("Data overflow in cli_receive_trans\n"));
+                               goto out;
+                       }
+
+                       memcpy(*data + data_offset_out, smb_base(cli->inbuf) + data_offset_in, this_data);
+               }
+               if (this_param) {
+                       unsigned int param_offset_out = SVAL(cli->inbuf,smb_prdisp);
+                       unsigned int param_offset_in = SVAL(cli->inbuf,smb_proff);
+
+                       if (param_offset_out > total_param ||
+                                       param_offset_out + this_param > total_param ||
+                                       param_offset_out + this_param < param_offset_out ||
+                                       param_offset_out + this_param < this_param) {
+                               DEBUG(1,("Param overflow in cli_receive_trans\n"));
+                               goto out;
+                       }
+                       if (param_offset_in > cli->bufsize ||
+                                       param_offset_in + this_param >  cli->bufsize ||
+                                       param_offset_in + this_param < param_offset_in ||
+                                       param_offset_in + this_param < this_param) {
+                               DEBUG(1,("Param overflow in cli_receive_trans\n"));
+                               goto out;
+                       }
+
+                       memcpy(*param + param_offset_out, smb_base(cli->inbuf) + param_offset_in, this_param);
+               }
                *data_len += this_data;
                *param_len += this_param;
 
-               /* parse out the total lengths again - they can shrink! */
-               total_data = SVAL(cli->inbuf,smb_tdrcnt);
-               total_param = SVAL(cli->inbuf,smb_tprcnt);
-               
-               if (total_data <= *data_len && total_param <= *param_len)
+               if (total_data <= *data_len && total_param <= *param_len) {
+                       ret = True;
                        break;
+               }
                
-               if (!cli_receive_smb(cli))
-                       return False;
+               if (!cli_receive_smb(cli)) {
+                       goto out;
+               }
 
                show_msg(cli->inbuf);
                
@@ -225,34 +306,45 @@ BOOL cli_receive_trans(struct cli_state *cli,int trans,
                        DEBUG(0,("Expected %s response, got command 0x%02x\n",
                                 trans==SMBtrans?"SMBtrans":"SMBtrans2", 
                                 CVAL(cli->inbuf,smb_com)));
-                       return(False);
+                       goto out;
                }
-               if (cli_error(cli, &eclass, &ecode, NULL))
-               {
-               if(cli->nt_pipe_fnum == 0 || !(eclass == ERRDOS && ecode == ERRmoredata))
-                               return(False);
+               if (NT_STATUS_IS_ERR(cli_nt_error(cli))) {
+                       goto out;
                }
-       }
-       
-       return(True);
-}
 
+               /* parse out the total lengths again - they can shrink! */
+               if (SVAL(cli->inbuf,smb_tdrcnt) < total_data)
+                       total_data = SVAL(cli->inbuf,smb_tdrcnt);
+               if (SVAL(cli->inbuf,smb_tprcnt) < total_param)
+                       total_param = SVAL(cli->inbuf,smb_tprcnt);
+               
+               if (total_data <= *data_len && total_param <= *param_len) {
+                       ret = True;
+                       break;
+               }
+       }
 
+  out:
 
+       client_set_trans_sign_state_off(cli, SVAL(cli->inbuf,smb_mid));
+       return ret;
+}
 
 /****************************************************************************
-  send a SMB nttrans request
-  ****************************************************************************/
+ Send a SMB nttrans request.
+****************************************************************************/
+
 BOOL cli_send_nt_trans(struct cli_state *cli, 
                       int function, 
                       int flags,
-                      uint16 *setup, int lsetup, int msetup,
-                      char *param, int lparam, int mparam,
-                      char *data, int ldata, int mdata)
+                      uint16 *setup, unsigned int lsetup, unsigned int msetup,
+                      char *param, unsigned int lparam, unsigned int mparam,
+                      char *data, unsigned int ldata, unsigned int mdata)
 {
-       int i;
-       int this_ldata,this_lparam;
-       int tot_data=0,tot_param=0;
+       unsigned int i;
+       unsigned int this_ldata,this_lparam;
+       unsigned int tot_data=0,tot_param=0;
+       uint16 mid;
        char *outdata,*outparam;
 
        this_lparam = MIN(lparam,cli->max_xmit - (500+lsetup*2)); /* hack */
@@ -260,10 +352,17 @@ BOOL cli_send_nt_trans(struct cli_state *cli,
 
        memset(cli->outbuf,'\0',smb_size);
        set_message(cli->outbuf,19+lsetup,0,True);
-       CVAL(cli->outbuf,smb_com) = SMBnttrans;
+       SCVAL(cli->outbuf,smb_com,SMBnttrans);
        SSVAL(cli->outbuf,smb_tid, cli->cnum);
        cli_setup_packet(cli);
 
+       /*
+        * Save the mid we're using. We need this for finding
+        * signing replies.
+        */
+
+       mid = cli->mid;
+
        outparam = smb_buf(cli->outbuf)+3;
        outdata = outparam+this_lparam;
 
@@ -288,18 +387,23 @@ BOOL cli_send_nt_trans(struct cli_state *cli,
        if (this_ldata)                 /* data[] */
                memcpy(outdata,data,this_ldata);
 
-       set_message(cli->outbuf,19+lsetup,              /* wcnt, bcc */
-                   PTR_DIFF(outdata+this_ldata,smb_buf(cli->outbuf)),False);
+       cli_setup_bcc(cli, outdata+this_ldata);
 
        show_msg(cli->outbuf);
-       cli_send_smb(cli);
+       if (!cli_send_smb(cli)) {
+               return False;
+       }       
+
+       /* Note we're in a trans state. Save the sequence
+        * numbers for replies. */
+       client_set_trans_sign_state_on(cli, mid);
 
        if (this_ldata < ldata || this_lparam < lparam) {
                /* receive interim response */
-               if (!cli_receive_smb(cli) || 
-                   CVAL(cli->inbuf,smb_rcls) != 0) {
+               if (!cli_receive_smb(cli) || cli_is_error(cli)) {
+                       client_set_trans_sign_state_off(cli, mid);
                        return(False);
-               }      
+               }
 
                tot_data = this_ldata;
                tot_param = this_lparam;
@@ -309,7 +413,7 @@ BOOL cli_send_nt_trans(struct cli_state *cli,
                        this_ldata = MIN(ldata-tot_data,cli->max_xmit - (500+this_lparam));
 
                        set_message(cli->outbuf,18,0,True);
-                       CVAL(cli->outbuf,smb_com) = SMBnttranss;
+                       SCVAL(cli->outbuf,smb_com,SMBnttranss);
 
                        /* XXX - these should probably be aligned */
                        outparam = smb_buf(cli->outbuf);
@@ -328,11 +432,23 @@ BOOL cli_send_nt_trans(struct cli_state *cli,
                                memcpy(outparam,param+tot_param,this_lparam);
                        if (this_ldata)                 /* data[] */
                                memcpy(outdata,data+tot_data,this_ldata);
-                       set_message(cli->outbuf,18,
-                                   PTR_DIFF(outdata+this_ldata,smb_buf(cli->outbuf)),False);
+                       cli_setup_bcc(cli, outdata+this_ldata);
                        
+                       /*
+                        * Save the mid we're using. We need this for finding
+                        * signing replies.
+                        */
+                       mid = cli->mid;
+
                        show_msg(cli->outbuf);
-                       cli_send_smb(cli);
+
+                       if (!cli_send_smb(cli)) {
+                               client_set_trans_sign_state_off(cli, mid);
+                               return False;
+                       }
+                       
+                       /* Ensure we use the same mid for the secondaries. */
+                       cli->mid = mid;
                        
                        tot_data += this_ldata;
                        tot_param += this_lparam;
@@ -342,25 +458,26 @@ BOOL cli_send_nt_trans(struct cli_state *cli,
        return(True);
 }
 
-
-
 /****************************************************************************
-  receive a SMB nttrans response allocating the necessary memory
-  ****************************************************************************/
+ Receive a SMB nttrans response allocating the necessary memory.
+****************************************************************************/
+
 BOOL cli_receive_nt_trans(struct cli_state *cli,
-                         char **param, int *param_len,
-                         char **data, int *data_len)
+                         char **param, unsigned int *param_len,
+                         char **data, unsigned int *data_len)
 {
-       int total_data=0;
-       int total_param=0;
-       int this_data,this_param;
+       unsigned int total_data=0;
+       unsigned int total_param=0;
+       unsigned int this_data,this_param;
        uint8 eclass;
        uint32 ecode;
+       BOOL ret = False;
 
        *data_len = *param_len = 0;
 
-       if (!cli_receive_smb(cli))
+       if (!cli_receive_smb(cli)) {
                return False;
+       }
 
        show_msg(cli->inbuf);
        
@@ -376,9 +493,21 @@ BOOL cli_receive_nt_trans(struct cli_state *cli,
         * to a trans call. This is not an error and should not
         * be treated as such.
         */
-       if (cli_error(cli, &eclass, &ecode, NULL)) {
-               if (cli->nt_pipe_fnum == 0 || !(eclass == ERRDOS && ecode == ERRmoredata))
-                       return(False);
+       if (cli_is_dos_error(cli)) {
+                cli_dos_error(cli, &eclass, &ecode);
+               if (!(eclass == ERRDOS && ecode == ERRmoredata)) {
+                       goto out;
+               }
+       }
+
+       /*
+        * Likewise for NT_STATUS_BUFFER_TOO_SMALL
+        */
+       if (cli_is_nt_error(cli)) {
+               if (!NT_STATUS_EQUAL(cli_nt_error(cli),
+                                    NT_STATUS_BUFFER_TOO_SMALL)) {
+                       goto out;
+               }
        }
 
        /* parse out the lengths */
@@ -386,8 +515,21 @@ BOOL cli_receive_nt_trans(struct cli_state *cli,
        total_param = SVAL(cli->inbuf,smb_ntr_TotalParameterCount);
 
        /* allocate it */
-       *data = Realloc(*data,total_data);
-       *param = Realloc(*param,total_param);
+       if (total_data) {
+               *data = (char *)SMB_REALLOC(*data,total_data);
+               if (!(*data)) {
+                       DEBUG(0,("cli_receive_nt_trans: failed to enlarge data buffer to %d\n",total_data));
+                       goto out;
+               }
+       }
+
+       if (total_param) {
+               *param = (char *)SMB_REALLOC(*param,total_param);
+               if (!(*param)) {
+                       DEBUG(0,("cli_receive_nt_trans: failed to enlarge param buffer to %d\n", total_param));
+                       goto out;
+               }
+       }
 
        while (1)  {
                this_data = SVAL(cli->inbuf,smb_ntr_DataCount);
@@ -395,30 +537,73 @@ BOOL cli_receive_nt_trans(struct cli_state *cli,
 
                if (this_data + *data_len > total_data ||
                    this_param + *param_len > total_param) {
-                       DEBUG(1,("Data overflow in cli_receive_trans\n"));
-                       return False;
+                       DEBUG(1,("Data overflow in cli_receive_nt_trans\n"));
+                       goto out;
+               }
+
+               if (this_data + *data_len < this_data ||
+                               this_data + *data_len < *data_len ||
+                               this_param + *param_len < this_param ||
+                               this_param + *param_len < *param_len) {
+                       DEBUG(1,("Data overflow in cli_receive_nt_trans\n"));
+                       goto out;
+               }
+
+               if (this_data) {
+                       unsigned int data_offset_out = SVAL(cli->inbuf,smb_ntr_DataDisplacement);
+                       unsigned int data_offset_in = SVAL(cli->inbuf,smb_ntr_DataOffset);
+
+                       if (data_offset_out > total_data ||
+                                       data_offset_out + this_data > total_data ||
+                                       data_offset_out + this_data < data_offset_out ||
+                                       data_offset_out + this_data < this_data) {
+                               DEBUG(1,("Data overflow in cli_receive_nt_trans\n"));
+                               goto out;
+                       }
+                       if (data_offset_in > cli->bufsize ||
+                                       data_offset_in + this_data >  cli->bufsize ||
+                                       data_offset_in + this_data < data_offset_in ||
+                                       data_offset_in + this_data < this_data) {
+                               DEBUG(1,("Data overflow in cli_receive_nt_trans\n"));
+                               goto out;
+                       }
+
+                       memcpy(*data + data_offset_out, smb_base(cli->inbuf) + data_offset_in, this_data);
+               }
+
+               if (this_param) {
+                       unsigned int param_offset_out = SVAL(cli->inbuf,smb_ntr_ParameterDisplacement);
+                       unsigned int param_offset_in = SVAL(cli->inbuf,smb_ntr_ParameterOffset);
+
+                       if (param_offset_out > total_param ||
+                                       param_offset_out + this_param > total_param ||
+                                       param_offset_out + this_param < param_offset_out ||
+                                       param_offset_out + this_param < this_param) {
+                               DEBUG(1,("Param overflow in cli_receive_nt_trans\n"));
+                               goto out;
+                       }
+                       if (param_offset_in > cli->bufsize ||
+                                       param_offset_in + this_param >  cli->bufsize ||
+                                       param_offset_in + this_param < param_offset_in ||
+                                       param_offset_in + this_param < this_param) {
+                               DEBUG(1,("Param overflow in cli_receive_nt_trans\n"));
+                               goto out;
+                       }
+
+                       memcpy(*param + param_offset_out, smb_base(cli->inbuf) + param_offset_in, this_param);
                }
 
-               if (this_data)
-                       memcpy(*data + SVAL(cli->inbuf,smb_ntr_DataDisplacement),
-                              smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_ntr_DataOffset),
-                              this_data);
-               if (this_param)
-                       memcpy(*param + SVAL(cli->inbuf,smb_ntr_ParameterDisplacement),
-                              smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_ntr_ParameterOffset),
-                              this_param);
                *data_len += this_data;
                *param_len += this_param;
 
-               /* parse out the total lengths again - they can shrink! */
-               total_data = SVAL(cli->inbuf,smb_ntr_TotalDataCount);
-               total_param = SVAL(cli->inbuf,smb_ntr_TotalParameterCount);
-               
-               if (total_data <= *data_len && total_param <= *param_len)
+               if (total_data <= *data_len && total_param <= *param_len) {
+                       ret = True;
                        break;
+               }
                
-               if (!cli_receive_smb(cli))
-                       return False;
+               if (!cli_receive_smb(cli)) {
+                       goto out;
+               }
 
                show_msg(cli->inbuf);
                
@@ -426,13 +611,38 @@ BOOL cli_receive_nt_trans(struct cli_state *cli,
                if (CVAL(cli->inbuf,smb_com) != SMBnttrans) {
                        DEBUG(0,("Expected SMBnttrans response, got command 0x%02x\n",
                                 CVAL(cli->inbuf,smb_com)));
-                       return(False);
+                       goto out;
+               }
+               if (cli_is_dos_error(cli)) {
+                        cli_dos_error(cli, &eclass, &ecode);
+                       if(!(eclass == ERRDOS && ecode == ERRmoredata)) {
+                               goto out;
+                       }
                }
-               if (cli_error(cli, &eclass, &ecode, NULL)) {
-                       if(cli->nt_pipe_fnum == 0 || !(eclass == ERRDOS && ecode == ERRmoredata))
-                               return(False);
+               /*
+                * Likewise for NT_STATUS_BUFFER_TOO_SMALL
+                */
+               if (cli_is_nt_error(cli)) {
+                       if (!NT_STATUS_EQUAL(cli_nt_error(cli),
+                                            NT_STATUS_BUFFER_TOO_SMALL)) {
+                               goto out;
+                       }
+               }
+
+               /* parse out the total lengths again - they can shrink! */
+               if (SVAL(cli->inbuf,smb_ntr_TotalDataCount) < total_data)
+                       total_data = SVAL(cli->inbuf,smb_ntr_TotalDataCount);
+               if (SVAL(cli->inbuf,smb_ntr_TotalParameterCount) < total_param)
+                       total_param = SVAL(cli->inbuf,smb_ntr_TotalParameterCount);
+               
+               if (total_data <= *data_len && total_param <= *param_len) {
+                       ret = True;
+                       break;
                }
        }
-       
-       return(True);
+
+  out:
+
+       client_set_trans_sign_state_off(cli, SVAL(cli->inbuf,smb_mid));
+       return ret;
 }