libcli/smb: pass down smbXcli_session to smb1cli_req_create/send() and smb1cli_trans*
[kai/samba.git] / source3 / libsmb / clitrans.c
index 5d3710b92e260f055c87e66e95ae9546d37b3134..5a27678310d77883318f9dfe0cbf8f33a35fafbb 100644 (file)
-/* 
+/*
    Unix SMB/CIFS implementation.
    client transaction calls
    Copyright (C) Andrew Tridgell 1994-1998
-   
+
    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,
    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, 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"
-
-
-/****************************************************************************
- Send a SMB trans or trans2 request.
-****************************************************************************/
-
-BOOL cli_send_trans(struct cli_state *cli, int trans, 
-                   const char *pipe_name, 
-                   int fid, int flags,
-                   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)
+#include "libsmb/libsmb.h"
+#include "../lib/util/tevent_ntstatus.h"
+#include "async_smb.h"
+#include "../libcli/smb/smbXcli_base.h"
+
+struct cli_trans_state {
+       struct cli_state *cli;
+       struct tevent_req *req;
+       struct cli_trans_state **ptr;
+};
+
+static int cli_trans_state_destructor(struct cli_trans_state *state)
 {
-       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);
-       SCVAL(cli->outbuf,smb_com,trans);
-       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;
-
-       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 */
-       SSVAL(cli->outbuf,smb_tpscnt,lparam);   /* tpscnt */
-       SSVAL(cli->outbuf,smb_tdscnt,ldata);    /* tdscnt */
-       SSVAL(cli->outbuf,smb_mprcnt,mparam);   /* mprcnt */
-       SSVAL(cli->outbuf,smb_mdrcnt,mdata);    /* mdrcnt */
-       SCVAL(cli->outbuf,smb_msrcnt,msetup);   /* msrcnt */
-       SSVAL(cli->outbuf,smb_flags,flags);     /* flags */
-       SIVAL(cli->outbuf,smb_timeout,0);               /* timeout */
-       SSVAL(cli->outbuf,smb_pscnt,this_lparam);       /* pscnt */
-       SSVAL(cli->outbuf,smb_psoff,smb_offset(outparam,cli->outbuf)); /* psoff */
-       SSVAL(cli->outbuf,smb_dscnt,this_ldata);        /* dscnt */
-       SSVAL(cli->outbuf,smb_dsoff,smb_offset(outdata,cli->outbuf)); /* dsoff */
-       SCVAL(cli->outbuf,smb_suwcnt,lsetup);   /* suwcnt */
-       for (i=0;i<lsetup;i++)          /* setup[] */
-               SSVAL(cli->outbuf,smb_setup+i*2,setup[i]);
-       p = smb_buf(cli->outbuf);
-       if (trans != SMBtrans) {
-               *p++ = 0;  /* put in a null smb_name */
-               *p++ = 'D'; *p++ = ' '; /* observed in OS/2 */
-       }
-       if (this_lparam)                        /* param[] */
-               memcpy(outparam,param,this_lparam);
-       if (this_ldata)                 /* data[] */
-               memcpy(outdata,data,this_ldata);
-       cli_setup_bcc(cli, outdata+this_ldata);
-
-       show_msg(cli->outbuf);
-
-       if (!cli_send_smb(cli)) {
-               return False;
-       }
-
-       if (this_ldata < ldata || this_lparam < lparam) {
-               /* receive interim response */
-               if (!cli_receive_smb(cli) || cli_is_error(cli)) {
-                       return(False);
-               }
-
-               tot_data = this_ldata;
-               tot_param = this_lparam;
-               
-               while (tot_data < ldata || tot_param < lparam)  {
-                       this_lparam = MIN(lparam-tot_param,cli->max_xmit - 500); /* hack */
-                       this_ldata = MIN(ldata-tot_data,cli->max_xmit - (500+this_lparam));
-
-                       set_message(cli->outbuf,trans==SMBtrans?8:9,0,True);
-                       SCVAL(cli->outbuf,smb_com,(trans==SMBtrans ? SMBtranss : SMBtranss2));
-                       
-                       outparam = smb_buf(cli->outbuf);
-                       outdata = outparam+this_lparam;
-                       
-                       /* secondary request */
-                       SSVAL(cli->outbuf,smb_tpscnt,lparam);   /* tpscnt */
-                       SSVAL(cli->outbuf,smb_tdscnt,ldata);    /* tdscnt */
-                       SSVAL(cli->outbuf,smb_spscnt,this_lparam);      /* pscnt */
-                       SSVAL(cli->outbuf,smb_spsoff,smb_offset(outparam,cli->outbuf)); /* psoff */
-                       SSVAL(cli->outbuf,smb_spsdisp,tot_param);       /* psdisp */
-                       SSVAL(cli->outbuf,smb_sdscnt,this_ldata);       /* dscnt */
-                       SSVAL(cli->outbuf,smb_sdsoff,smb_offset(outdata,cli->outbuf)); /* dsoff */
-                       SSVAL(cli->outbuf,smb_sdsdisp,tot_data);        /* dsdisp */
-                       if (trans==SMBtrans2)
-                               SSVALS(cli->outbuf,smb_sfid,fid);               /* fid */
-                       if (this_lparam)                        /* param[] */
-                               memcpy(outparam,param+tot_param,this_lparam);
-                       if (this_ldata)                 /* data[] */
-                               memcpy(outdata,data+tot_data,this_ldata);
-                       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);
-                       if (!cli_send_smb(cli)) {
-                               return False;
-                       }
-
-                       /* Ensure we use the same mid for the secondaries. */
-                       cli->mid = mid;
-                       
-                       tot_data += this_ldata;
-                       tot_param += this_lparam;
-               }
-       }
-
-       /* Note we're in a trans state. Save the sequence
-        * numbers for replies. */
-
-       cli_signing_trans_start(cli, mid);
-       return(True);
+       talloc_set_destructor(state->ptr, NULL);
+       talloc_free(state->ptr);
+       return 0;
 }
 
-/****************************************************************************
- Receive a SMB trans or trans2 response allocating the necessary memory.
-****************************************************************************/
-
-BOOL cli_receive_trans(struct cli_state *cli,int trans,
-                              char **param, unsigned int *param_len,
-                              char **data, unsigned int *data_len)
+static int cli_trans_state_ptr_destructor(struct cli_trans_state **ptr)
 {
-       unsigned int total_data=0;
-       unsigned int total_param=0;
-       unsigned int this_data,this_param;
-       NTSTATUS status;
-       char *tdata;
-       char *tparam;
-
-       *data_len = *param_len = 0;
+       struct cli_trans_state *state = *ptr;
+       void *parent = talloc_parent(state);
 
-       if (!cli_receive_smb(cli)) {
-               cli_signing_trans_stop(cli);
-               return False;
-       }
-
-       show_msg(cli->inbuf);
-       
-       /* sanity check */
-       if (CVAL(cli->inbuf,smb_com) != trans) {
-               DEBUG(0,("Expected %s response, got command 0x%02x\n",
-                        trans==SMBtrans?"SMBtrans":"SMBtrans2", 
-                        CVAL(cli->inbuf,smb_com)));
-               cli_signing_trans_stop(cli);
-               return(False);
-       }
+       talloc_set_destructor(state, NULL);
 
-       /*
-        * 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. Note that STATUS_NO_MORE_FILES is
-        * returned when a trans2 findfirst/next finishes.
-        */
-       status = cli_nt_error(cli);
-       
-       if (NT_STATUS_IS_ERR(status) || NT_STATUS_EQUAL(status,STATUS_NO_MORE_FILES)) {
-               cli_signing_trans_stop(cli);
-               return False;
-       }
-
-       /* parse out the lengths */
-       total_data = SVAL(cli->inbuf,smb_tdrcnt);
-       total_param = SVAL(cli->inbuf,smb_tprcnt);
-
-       /* allocate it */
-       if (total_data!=0) {
-               tdata = SMB_REALLOC(*data,total_data);
-               if (!tdata) {
-                       DEBUG(0,("cli_receive_trans: failed to enlarge data buffer\n"));
-                       cli_signing_trans_stop(cli);
-                       return False;
-               }
-               else
-                       *data = tdata;
-       }
-
-       if (total_param!=0) {
-               tparam = SMB_REALLOC(*param,total_param);
-               if (!tparam) {
-                       DEBUG(0,("cli_receive_trans: failed to enlarge param buffer\n"));
-                       cli_signing_trans_stop(cli);
-                       return False;
-               }
-               else
-                       *param = tparam;
-       }
-
-       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"));
-                       cli_signing_trans_stop(cli);
-                       return False;
-               }
-
-               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"));
-                       cli_signing_trans_stop(cli);
-                       return False;
-               }
-
-               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"));
-                               cli_signing_trans_stop(cli);
-                               return False;
-                       }
-                       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"));
-                               cli_signing_trans_stop(cli);
-                               return False;
-                       }
-
-                       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"));
-                               cli_signing_trans_stop(cli);
-                               return False;
-                       }
-                       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"));
-                               cli_signing_trans_stop(cli);
-                               return False;
-                       }
-
-                       memcpy(*param + param_offset_out, smb_base(cli->inbuf) + param_offset_in, this_param);
-               }
-               *data_len += this_data;
-               *param_len += this_param;
-
-               if (total_data <= *data_len && total_param <= *param_len)
-                       break;
-               
-               if (!cli_receive_smb(cli)) {
-                       cli_signing_trans_stop(cli);
-                       return False;   
-               }
-
-               show_msg(cli->inbuf);
-               
-               /* sanity check */
-               if (CVAL(cli->inbuf,smb_com) != trans) {
-                       DEBUG(0,("Expected %s response, got command 0x%02x\n",
-                                trans==SMBtrans?"SMBtrans":"SMBtrans2", 
-                                CVAL(cli->inbuf,smb_com)));
-                       cli_signing_trans_stop(cli);
-                       return(False);
-               }
-               if (NT_STATUS_IS_ERR(cli_nt_error(cli))) {
-                       cli_signing_trans_stop(cli);
-                       return(False);
-               }
-
-               /* 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)
-                       break;
-               
-       }
-       
-       cli_signing_trans_stop(cli);
-       return(True);
+       talloc_reparent(state, parent, state->req);
+       talloc_free(state);
+       return 0;
 }
 
-/****************************************************************************
- Send a SMB nttrans request.
-****************************************************************************/
-
-BOOL cli_send_nt_trans(struct cli_state *cli, 
-                      int function, 
-                      int flags,
-                      uint16 *setup, unsigned int lsetup, unsigned int msetup,
-                      char *param, unsigned int lparam, unsigned int mparam,
-                      char *data, unsigned int ldata, unsigned int mdata)
+struct tevent_req *cli_trans_send(
+       TALLOC_CTX *mem_ctx, struct tevent_context *ev,
+       struct cli_state *cli, uint8_t cmd,
+       const char *pipe_name, uint16_t fid, uint16_t function, int flags,
+       uint16_t *setup, uint8_t num_setup, uint8_t max_setup,
+       uint8_t *param, uint32_t num_param, uint32_t max_param,
+       uint8_t *data, uint32_t num_data, uint32_t max_data)
 {
-       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 */
-       this_ldata = MIN(ldata,cli->max_xmit - (500+lsetup*2+this_lparam));
-
-       memset(cli->outbuf,'\0',smb_size);
-       set_message(cli->outbuf,19+lsetup,0,True);
-       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;
-
-       /* primary request */
-       SCVAL(cli->outbuf,smb_nt_MaxSetupCount,msetup);
-       SCVAL(cli->outbuf,smb_nt_Flags,flags);
-       SIVAL(cli->outbuf,smb_nt_TotalParameterCount, lparam);
-       SIVAL(cli->outbuf,smb_nt_TotalDataCount, ldata);
-       SIVAL(cli->outbuf,smb_nt_MaxParameterCount, mparam);
-       SIVAL(cli->outbuf,smb_nt_MaxDataCount, mdata);
-       SIVAL(cli->outbuf,smb_nt_ParameterCount, this_lparam);
-       SIVAL(cli->outbuf,smb_nt_ParameterOffset, smb_offset(outparam,cli->outbuf));
-       SIVAL(cli->outbuf,smb_nt_DataCount, this_ldata);
-       SIVAL(cli->outbuf,smb_nt_DataOffset, smb_offset(outdata,cli->outbuf));
-       SIVAL(cli->outbuf,smb_nt_SetupCount, lsetup);
-       SIVAL(cli->outbuf,smb_nt_Function, function);
-       for (i=0;i<lsetup;i++)          /* setup[] */
-               SSVAL(cli->outbuf,smb_nt_SetupStart+i*2,setup[i]);
-       
-       if (this_lparam)                        /* param[] */
-               memcpy(outparam,param,this_lparam);
-       if (this_ldata)                 /* data[] */
-               memcpy(outdata,data,this_ldata);
-
-       cli_setup_bcc(cli, outdata+this_ldata);
-
-       show_msg(cli->outbuf);
-       if (!cli_send_smb(cli)) {
-               return False;
-       }       
-
-       if (this_ldata < ldata || this_lparam < lparam) {
-               /* receive interim response */
-               if (!cli_receive_smb(cli) || cli_is_error(cli)) {
-                       return(False);
-               }
-
-               tot_data = this_ldata;
-               tot_param = this_lparam;
-               
-               while (tot_data < ldata || tot_param < lparam)  {
-                       this_lparam = MIN(lparam-tot_param,cli->max_xmit - 500); /* hack */
-                       this_ldata = MIN(ldata-tot_data,cli->max_xmit - (500+this_lparam));
-
-                       set_message(cli->outbuf,18,0,True);
-                       SCVAL(cli->outbuf,smb_com,SMBnttranss);
-
-                       /* XXX - these should probably be aligned */
-                       outparam = smb_buf(cli->outbuf);
-                       outdata = outparam+this_lparam;
-                       
-                       /* secondary request */
-                       SIVAL(cli->outbuf,smb_nts_TotalParameterCount,lparam);
-                       SIVAL(cli->outbuf,smb_nts_TotalDataCount,ldata);
-                       SIVAL(cli->outbuf,smb_nts_ParameterCount,this_lparam);
-                       SIVAL(cli->outbuf,smb_nts_ParameterOffset,smb_offset(outparam,cli->outbuf));
-                       SIVAL(cli->outbuf,smb_nts_ParameterDisplacement,tot_param);
-                       SIVAL(cli->outbuf,smb_nts_DataCount,this_ldata);
-                       SIVAL(cli->outbuf,smb_nts_DataOffset,smb_offset(outdata,cli->outbuf));
-                       SIVAL(cli->outbuf,smb_nts_DataDisplacement,tot_data);
-                       if (this_lparam)                        /* param[] */
-                               memcpy(outparam,param+tot_param,this_lparam);
-                       if (this_ldata)                 /* data[] */
-                               memcpy(outdata,data+tot_data,this_ldata);
-                       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);
-
-                       if (!cli_send_smb(cli)) {
-                               return False;
-                       }
-                       
-                       /* Ensure we use the same mid for the secondaries. */
-                       cli->mid = mid;
-                       
-                       tot_data += this_ldata;
-                       tot_param += this_lparam;
-               }
-       }
-
-       /* Note we're in a trans state. Save the sequence
-        * numbers for replies. */
-
-       cli_signing_trans_start(cli, mid);
-       return(True);
+       struct cli_trans_state *state;
+       uint8_t additional_flags = 0;
+       uint8_t clear_flags = 0;
+       uint16_t additional_flags2 = 0;
+       uint16_t clear_flags2 = 0;
+
+       state = talloc_zero(mem_ctx, struct cli_trans_state);
+       if (state == NULL) {
+               return NULL;
+       }
+       state->cli = cli;
+       state->ptr = talloc(state, struct cli_trans_state *);
+       if (state->ptr == NULL) {
+               talloc_free(state);
+               return NULL;
+       }
+       *state->ptr = state;
+       if (cli->case_sensitive) {
+               clear_flags |= FLAG_CASELESS_PATHNAMES;
+       } else {
+               /* Default setting, case insensitive. */
+               additional_flags |= FLAG_CASELESS_PATHNAMES;
+       }
+
+       if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) {
+               additional_flags2 |= FLAGS2_DFS_PATHNAMES;
+       }
+
+       state->req = smb1cli_trans_send(state, ev,
+                                       cli->conn, cmd,
+                                       additional_flags, clear_flags,
+                                       additional_flags2, clear_flags2,
+                                       cli->timeout,
+                                       cli->smb1.pid, cli->smb1.tid,
+                                       cli->smb1.session,
+                                       pipe_name, fid, function, flags,
+                                       setup, num_setup, max_setup,
+                                       param, num_param, max_param,
+                                       data, num_data, max_data);
+       if (state->req == NULL) {
+               talloc_free(state);
+               return NULL;
+       }
+
+       talloc_reparent(state, state->req, state->ptr);
+       talloc_set_destructor(state, cli_trans_state_destructor);
+       talloc_set_destructor(state->ptr, cli_trans_state_ptr_destructor);
+
+       return state->req;
 }
 
-/****************************************************************************
- Receive a SMB nttrans response allocating the necessary memory.
-****************************************************************************/
-
-BOOL cli_receive_nt_trans(struct cli_state *cli,
-                         char **param, unsigned int *param_len,
-                         char **data, unsigned int *data_len)
+NTSTATUS cli_trans_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                       uint16_t *recv_flags2,
+                       uint16_t **setup, uint8_t min_setup,
+                       uint8_t *num_setup,
+                       uint8_t **param, uint32_t min_param,
+                       uint32_t *num_param,
+                       uint8_t **data, uint32_t min_data,
+                       uint32_t *num_data)
 {
-       unsigned int total_data=0;
-       unsigned int total_param=0;
-       unsigned int this_data,this_param;
-       uint8 eclass;
-       uint32 ecode;
-       char *tdata;
-       char *tparam;
-
-       *data_len = *param_len = 0;
-
-       if (!cli_receive_smb(cli)) {
-               cli_signing_trans_stop(cli);
-               return False;
-       }
-
-       show_msg(cli->inbuf);
-       
-       /* sanity check */
-       if (CVAL(cli->inbuf,smb_com) != SMBnttrans) {
-               DEBUG(0,("Expected SMBnttrans response, got command 0x%02x\n",
-                        CVAL(cli->inbuf,smb_com)));
-               cli_signing_trans_stop(cli);
-               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.
-        */
-       if (cli_is_dos_error(cli)) {
-                cli_dos_error(cli, &eclass, &ecode);
-               if (!(eclass == ERRDOS && ecode == ERRmoredata)) {
-                       cli_signing_trans_stop(cli);
-                       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)) {
-                       cli_signing_trans_stop(cli);
-                       return(False);
-               }
-       }
-
-       /* parse out the lengths */
-       total_data = SVAL(cli->inbuf,smb_ntr_TotalDataCount);
-       total_param = SVAL(cli->inbuf,smb_ntr_TotalParameterCount);
-
-       /* allocate it */
-       if (total_data) {
-               tdata = SMB_REALLOC(*data,total_data);
-               if (!tdata) {
-                       DEBUG(0,("cli_receive_nt_trans: failed to enlarge data buffer to %d\n",total_data));
-                       cli_signing_trans_stop(cli);
-                       return False;
-               } else {
-                       *data = tdata;
-               }
-       }
-
-       if (total_param) {
-               tparam = SMB_REALLOC(*param,total_param);
-               if (!tparam) {
-                       DEBUG(0,("cli_receive_nt_trans: failed to enlarge param buffer to %d\n", total_param));
-                       cli_signing_trans_stop(cli);
-                       return False;
-               } else {
-                       *param = tparam;
-               }
+       NTSTATUS status;
+       void *parent = talloc_parent(req);
+       struct cli_trans_state *state =
+               talloc_get_type(parent,
+               struct cli_trans_state);
+       bool map_dos_errors = true;
+
+       status = smb1cli_trans_recv(req, mem_ctx, recv_flags2,
+                                   setup, min_setup, num_setup,
+                                   param, min_param, num_param,
+                                   data, min_data, num_data);
+
+       if (state) {
+               map_dos_errors = state->cli->map_dos_errors;
+               state->cli->raw_status = status;
+               talloc_free(state->ptr);
+               state = NULL;
+       }
+
+       if (NT_STATUS_IS_DOS(status) && map_dos_errors) {
+               uint8_t eclass = NT_STATUS_DOS_CLASS(status);
+               uint16_t ecode = NT_STATUS_DOS_CODE(status);
+               /*
+                * TODO: is it really a good idea to do a mapping here?
+                *
+                * The old cli_pull_error() also does it, so I do not change
+                * the behavior yet.
+                */
+               status = dos_to_ntstatus(eclass, ecode);
        }
 
-       while (1)  {
-               this_data = SVAL(cli->inbuf,smb_ntr_DataCount);
-               this_param = SVAL(cli->inbuf,smb_ntr_ParameterCount);
-
-               if (this_data + *data_len > total_data ||
-                   this_param + *param_len > total_param) {
-                       DEBUG(1,("Data overflow in cli_receive_nt_trans\n"));
-                       cli_signing_trans_stop(cli);
-                       return False;
-               }
-
-               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"));
-                       cli_signing_trans_stop(cli);
-                       return False;
-               }
-
-               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"));
-                               cli_signing_trans_stop(cli);
-                               return False;
-                       }
-                       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"));
-                               cli_signing_trans_stop(cli);
-                               return False;
-                       }
-
-                       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"));
-                               cli_signing_trans_stop(cli);
-                               return False;
-                       }
-                       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"));
-                               cli_signing_trans_stop(cli);
-                               return False;
-                       }
-
-                       memcpy(*param + param_offset_out, smb_base(cli->inbuf) + param_offset_in, this_param);
-               }
-
-               *data_len += this_data;
-               *param_len += this_param;
-
-               if (total_data <= *data_len && total_param <= *param_len)
-                       break;
-               
-               if (!cli_receive_smb(cli)) {
-                       cli_signing_trans_stop(cli);
-                       return False;
-               }
+       return status;
+}
 
-               show_msg(cli->inbuf);
-               
-               /* sanity check */
-               if (CVAL(cli->inbuf,smb_com) != SMBnttrans) {
-                       DEBUG(0,("Expected SMBnttrans response, got command 0x%02x\n",
-                                CVAL(cli->inbuf,smb_com)));
-                       cli_signing_trans_stop(cli);
-                       return(False);
-               }
-               if (cli_is_dos_error(cli)) {
-                        cli_dos_error(cli, &eclass, &ecode);
-                       if(!(eclass == ERRDOS && ecode == ERRmoredata)) {
-                               cli_signing_trans_stop(cli);
-                               return(False);
-                       }
-               }
+NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli,
+                  uint8_t trans_cmd,
+                  const char *pipe_name, uint16_t fid, uint16_t function,
+                  int flags,
+                  uint16_t *setup, uint8_t num_setup, uint8_t max_setup,
+                  uint8_t *param, uint32_t num_param, uint32_t max_param,
+                  uint8_t *data, uint32_t num_data, uint32_t max_data,
+                  uint16_t *recv_flags2,
+                  uint16_t **rsetup, uint8_t min_rsetup, uint8_t *num_rsetup,
+                  uint8_t **rparam, uint32_t min_rparam, uint32_t *num_rparam,
+                  uint8_t **rdata, uint32_t min_rdata, uint32_t *num_rdata)
+{
+       NTSTATUS status;
+       uint8_t additional_flags = 0;
+       uint8_t clear_flags = 0;
+       uint16_t additional_flags2 = 0;
+       uint16_t clear_flags2 = 0;
+
+       if (cli->case_sensitive) {
+               clear_flags |= FLAG_CASELESS_PATHNAMES;
+       } else {
+               /* Default setting, case insensitive. */
+               additional_flags |= FLAG_CASELESS_PATHNAMES;
+       }
+
+       if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) {
+               additional_flags2 |= FLAGS2_DFS_PATHNAMES;
+       }
+
+       status = smb1cli_trans(mem_ctx,
+                              cli->conn, trans_cmd,
+                              additional_flags, clear_flags,
+                              additional_flags2, clear_flags2,
+                              cli->timeout,
+                              cli->smb1.pid, cli->smb1.tid,
+                              cli->smb1.session,
+                              pipe_name, fid, function, flags,
+                              setup, num_setup, max_setup,
+                              param, num_param, max_param,
+                              data, num_data, max_data,
+                              recv_flags2,
+                              rsetup, min_rsetup, num_rsetup,
+                              rparam, min_rparam, num_rparam,
+                              rdata, min_rdata, num_rdata);
+
+       cli->raw_status = status;
+
+       if (NT_STATUS_IS_DOS(status) && cli->map_dos_errors) {
+               uint8_t eclass = NT_STATUS_DOS_CLASS(status);
+               uint16_t ecode = NT_STATUS_DOS_CODE(status);
                /*
-                * Likewise for NT_STATUS_BUFFER_TOO_SMALL
+                * TODO: is it really a good idea to do a mapping here?
+                *
+                * The old cli_pull_error() also does it, so I do not change
+                * the behavior yet.
                 */
-               if (cli_is_nt_error(cli)) {
-                       if (!NT_STATUS_EQUAL(cli_nt_error(cli),
-                                            NT_STATUS_BUFFER_TOO_SMALL)) {
-                               cli_signing_trans_stop(cli);
-                               return(False);
-                       }
-               }
-
-               /* 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)
-                       break;
+               status = dos_to_ntstatus(eclass, ecode);
        }
-       
-       cli_signing_trans_stop(cli);
-       return(True);
+
+       return status;
 }