r3383: avoid multi-part SMBtrans and SMBtrans2 replies until our client library can handle

them properly (they are difficult to do in an async fashion).

By choosing trans.in.max_data to fix in the negotiated buffer size a
server won't send us multi-part replies.

I notice that windows seems to avoid them too :)
(This used to be commit e23edf762cace35f937959c9ffbef718431a79b9)

3 files changed, 10 insertions, 10 deletions

diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index 4f63b366a5..b63a1555f3 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -86,7 +86,7 @@ static void qfsinfo_aliases(struct smbcli_state *cli)
 	d_printf("\nChecking for QFSINFO aliases\n");
 
 	t2.in.max_param = 0;
-	t2.in.max_data = 0x8000;
+	t2.in.max_data = smb_raw_max_trans_data(cli->tree, 0);
 	t2.in.max_setup = 0;
 	t2.in.flags = 0;
 	t2.in.timeout = 0;
@@ -109,7 +109,7 @@ static void qfileinfo_aliases(struct smbcli_state *cli)
 	d_printf("\nChecking for QFILEINFO aliases\n");
 
 	t2.in.max_param = 2;
-	t2.in.max_data = 0x8000;
+	t2.in.max_data = smb_raw_max_trans_data(cli->tree, 2);
 	t2.in.max_setup = 0;
 	t2.in.flags = 0;
 	t2.in.timeout = 0;
@@ -149,7 +149,7 @@ static void qpathinfo_aliases(struct smbcli_state *cli)
 	d_printf("\nChecking for QPATHINFO aliases\n");
 
 	t2.in.max_param = 2;
-	t2.in.max_data = 0x8000;
+	t2.in.max_data = smb_raw_max_trans_data(cli->tree, 2);
 	t2.in.max_setup = 0;
 	t2.in.flags = 0;
 	t2.in.timeout = 0;
@@ -193,7 +193,7 @@ static void findfirst_aliases(struct smbcli_state *cli)
 	d_printf("\nChecking for FINDFIRST aliases\n");
 
 	t2.in.max_param = 16;
-	t2.in.max_data = 0x8000;
+	t2.in.max_data = smb_raw_max_trans_data(cli->tree, 16);
 	t2.in.max_setup = 0;
 	t2.in.flags = 0;
 	t2.in.timeout = 0;
@@ -345,7 +345,7 @@ static void setpathinfo_aliases(struct smbcli_state *cli)
 	d_printf("\nChecking for SETPATHINFO aliases\n");
 
 	t2.in.max_param = 32;
-	t2.in.max_data = 0x8000;
+	t2.in.max_data = smb_raw_max_trans_data(cli->tree, 32);
 	t2.in.max_setup = 0;
 	t2.in.flags = 0;
 	t2.in.timeout = 0;
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index cd53cb3979..0e79e94f82 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -58,8 +58,8 @@ static NTSTATUS try_trans2(struct smbcli_state *cli,
 
 	mem_ctx = talloc_init("try_trans2");
 
-	t2.in.max_param = 1024;
-	t2.in.max_data = 0x8000;
+	t2.in.max_param = 64;
+	t2.in.max_data = smb_raw_max_trans_data(cli->tree, 64);
 	t2.in.max_setup = 10;
 	t2.in.flags = 0;
 	t2.in.timeout = 0;
@@ -339,8 +339,8 @@ static NTSTATUS try_nttrans(struct smbcli_state *cli,
 	ntdata_blob.length = data_len;
 	ntdata_blob.data = data;
 
-	parms.in.max_param = 1024;
-	parms.in.max_data = 1024;
+	parms.in.max_param = 64;
+	parms.in.max_data = smb_raw_max_trans_data(cli->tree, 64);
 	parms.in.max_setup = 0;
 	parms.in.setup_count = 0;
 	parms.in.function = op;
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index a74acdb331..1ae92a6034 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -172,7 +172,7 @@ static NTSTATUS rap_cli_do_call(struct smbcli_state *cli, TALLOC_CTX *mem_ctx,
 	params->flags = RAPNDR_FLAGS;
 
 	trans.in.max_param = call->rcv_paramlen;
-	trans.in.max_data = call->rcv_datalen;
+	trans.in.max_data = smb_raw_max_trans_data(cli->tree, call->rcv_paramlen);
 	trans.in.max_setup = 0;
 	trans.in.flags = 0;
 	trans.in.timeout = 0;