diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-08-31 03:16:52 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-08-31 03:16:52 +0000 |
| commit | 11c5869a450d5f78a9395889ec03f77732cc8be5 (patch) | |
| tree | d3fd5854dd61dc36f3d83064fdf04dc34c81234e /source4/libcli/raw/rawsearch.c | |
| parent | a8a5ac2bd218d5bc3985ffbe118111c9b4649860 (diff) | |
| download | samba-11c5869a450d5f78a9395889ec03f77732cc8be5.tar.gz samba-11c5869a450d5f78a9395889ec03f77732cc8be5.tar.bz2 samba-11c5869a450d5f78a9395889ec03f77732cc8be5.zip | |
I think I've finally got the ascii/unicode issues right in trans2 find
first
Also expanded the rename test a little
(This used to be commit 723af7f097a8c7f23dac23039e479811559ac3cb)
Diffstat (limited to 'source4/libcli/raw/rawsearch.c')
| -rw-r--r-- | source4/libcli/raw/rawsearch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/libcli/raw/rawsearch.c b/source4/libcli/raw/rawsearch.c index bdc39bb68c..222bf53623 100644 --- a/source4/libcli/raw/rawsearch.c +++ b/source4/libcli/raw/rawsearch.c @@ -263,8 +263,8 @@ static int parse_trans2_search(struct cli_tree *tree, data->standard.attrib = SVAL(blob->data, 20); len = cli_blob_pull_string(tree->session, mem_ctx, blob, &data->standard.name, - 22, 23, STR_LEN8BIT); - return (len + 23 + 3) & ~3; + 22, 23, STR_LEN8BIT | STR_TERMINATE | STR_LEN_NOTERM); + return len + 23; case RAW_SEARCH_EA_SIZE: if (flags & FLAG_TRANS2_FIND_REQUIRE_RESUME) { @@ -283,8 +283,8 @@ static int parse_trans2_search(struct cli_tree *tree, data->ea_size.ea_size = IVAL(blob->data, 22); len = cli_blob_pull_string(tree->session, mem_ctx, blob, &data->ea_size.name, - 26, 27, STR_LEN8BIT | STR_NOALIGN); - return len + 27; + 26, 27, STR_LEN8BIT | STR_TERMINATE | STR_NOALIGN); + return len + 27 + 1; case RAW_SEARCH_DIRECTORY_INFO: if (blob->length < 65) return -1; |