svn commit: samba r4316 - in branches/SAMBA_4_0/source/libcli/raw: .

tridge at samba.org tridge at samba.org
Tue Dec 21 11:47:08 GMT 2004


Author: tridge
Date: 2004-12-21 11:47:08 +0000 (Tue, 21 Dec 2004)
New Revision: 4316

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4316

Log:
- now that the trans2 code properly supports multi-part requests, we can set 
  a maximum sized max_data in libcli trans2 code

- fixed string termination in the EA_LIST trans2 findfirst level





Modified:
   branches/SAMBA_4_0/source/libcli/raw/rawacl.c
   branches/SAMBA_4_0/source/libcli/raw/rawfileinfo.c
   branches/SAMBA_4_0/source/libcli/raw/rawfsinfo.c
   branches/SAMBA_4_0/source/libcli/raw/rawsearch.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/rawacl.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/rawacl.c	2004-12-21 11:45:37 UTC (rev 4315)
+++ branches/SAMBA_4_0/source/libcli/raw/rawacl.c	2004-12-21 11:47:08 UTC (rev 4316)
@@ -34,7 +34,7 @@
 
 	nt.in.max_setup = 0;
 	nt.in.max_param = 4;
-	nt.in.max_data = smb_raw_max_trans_data(tree, 4);
+	nt.in.max_data = 0xFFFF;
 	nt.in.setup_count = 0;
 	nt.in.function = NT_TRANSACT_QUERY_SECURITY_DESC;
 	nt.in.setup = NULL;

Modified: branches/SAMBA_4_0/source/libcli/raw/rawfileinfo.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/rawfileinfo.c	2004-12-21 11:45:37 UTC (rev 4315)
+++ branches/SAMBA_4_0/source/libcli/raw/rawfileinfo.c	2004-12-21 11:47:08 UTC (rev 4316)
@@ -301,7 +301,7 @@
 	tp.in.setup_count = 1;
 	tp.in.data = data;
 	tp.in.max_param = 2;
-	tp.in.max_data = smb_raw_max_trans_data(tree, 2);
+	tp.in.max_data = 0xFFFF;
 	tp.in.setup = &setup;
 	
 	tp.in.params = data_blob_talloc(mem_ctx, NULL, 4);
@@ -355,7 +355,7 @@
 	tp.in.setup_count = 1;
 	tp.in.data = data;
 	tp.in.max_param = 2;
-	tp.in.max_data = smb_raw_max_trans_data(tree, 2);
+	tp.in.max_data = 0xFFFF;
 	tp.in.setup = &setup;
 	
 	tp.in.params = data_blob_talloc(mem_ctx, NULL, 6);

Modified: branches/SAMBA_4_0/source/libcli/raw/rawfsinfo.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/rawfsinfo.c	2004-12-21 11:45:37 UTC (rev 4315)
+++ branches/SAMBA_4_0/source/libcli/raw/rawfsinfo.c	2004-12-21 11:47:08 UTC (rev 4316)
@@ -78,7 +78,7 @@
 	tp.in.timeout = 0;
 	tp.in.setup_count = 1;
 	tp.in.max_param = 0;
-	tp.in.max_data = smb_raw_max_trans_data(tree, 0);
+	tp.in.max_data = 0xFFFF;
 	tp.in.setup = &setup;
 	tp.in.data = data_blob(NULL, 0);
 	tp.in.timeout = 0;

Modified: branches/SAMBA_4_0/source/libcli/raw/rawsearch.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/rawsearch.c	2004-12-21 11:45:37 UTC (rev 4315)
+++ branches/SAMBA_4_0/source/libcli/raw/rawsearch.c	2004-12-21 11:47:08 UTC (rev 4316)
@@ -208,7 +208,7 @@
 	tp.in.setup_count = 1;
 	tp.in.data = data_blob(NULL, 0);
 	tp.in.max_param = 10;
-	tp.in.max_data = smb_raw_max_trans_data(tree, 10);
+	tp.in.max_data = 0xFFFF;
 	tp.in.setup = &setup;
 
 	if (info_level == RAW_SEARCH_EA_LIST) {
@@ -269,7 +269,7 @@
 	tp.in.setup_count = 1;
 	tp.in.data = data_blob(NULL, 0);
 	tp.in.max_param = 10;
-	tp.in.max_data = smb_raw_max_trans_data(tree, 10);
+	tp.in.max_data = 0xFFFF;
 	tp.in.setup = &setup;
 
 	if (info_level == RAW_SEARCH_EA_LIST) {
@@ -416,7 +416,7 @@
 		len = smbcli_blob_pull_string(tree->session, mem_ctx, blob,
 					      &data->ea_list.name,
 					      22+ea_size, 23+ea_size, 
-					      STR_LEN8BIT | STR_TERMINATE | STR_NOALIGN);
+					      STR_LEN8BIT | STR_NOALIGN);
 		return len + ea_size + 23 + 1;
 
 	case RAW_SEARCH_DIRECTORY_INFO:



More information about the samba-cvs mailing list