From 101d0333a333cee6d3fc33cb4655976145fb87e8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 21 Dec 2004 11:47:08 +0000 Subject: r4316: - 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 (This used to be commit a2a5f147f4faac8a48ff8f1b3e5f1334c92575bb) --- source4/libcli/raw/rawacl.c | 2 +- source4/libcli/raw/rawfileinfo.c | 4 ++-- source4/libcli/raw/rawfsinfo.c | 2 +- source4/libcli/raw/rawsearch.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source4/libcli/raw') diff --git a/source4/libcli/raw/rawacl.c b/source4/libcli/raw/rawacl.c index 253a3cbbe7..97e0212137 100644 --- a/source4/libcli/raw/rawacl.c +++ b/source4/libcli/raw/rawacl.c @@ -34,7 +34,7 @@ struct smbcli_request *smb_raw_query_secdesc_send(struct smbcli_tree *tree, 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; diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c index ad7b9b900a..3befb8ee4d 100644 --- a/source4/libcli/raw/rawfileinfo.c +++ b/source4/libcli/raw/rawfileinfo.c @@ -301,7 +301,7 @@ static struct smbcli_request *smb_raw_fileinfo_blob_send(struct smbcli_tree *tre 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 @@ static struct smbcli_request *smb_raw_pathinfo_blob_send(struct smbcli_tree *tre 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); diff --git a/source4/libcli/raw/rawfsinfo.c b/source4/libcli/raw/rawfsinfo.c index 7cec93b6bc..fd99c4aeb9 100644 --- a/source4/libcli/raw/rawfsinfo.c +++ b/source4/libcli/raw/rawfsinfo.c @@ -78,7 +78,7 @@ static struct smbcli_request *smb_raw_qfsinfo_send(struct smbcli_tree *tree, 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; diff --git a/source4/libcli/raw/rawsearch.c b/source4/libcli/raw/rawsearch.c index 3c271253e5..90715ca8e2 100644 --- a/source4/libcli/raw/rawsearch.c +++ b/source4/libcli/raw/rawsearch.c @@ -208,7 +208,7 @@ static NTSTATUS smb_raw_search_first_blob(struct smbcli_tree *tree, 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 @@ static NTSTATUS smb_raw_search_next_blob(struct smbcli_tree *tree, 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 @@ static int parse_trans2_search(struct smbcli_tree *tree, 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: -- cgit