sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r8729: make the RAW-SEARCH test more robust to servers with hash based directory ordering

Browse Source 
(This used to be commit 8c4d0cd7b7)
This commit is contained in:
Andrew Tridgell 2005-07-24 01:01:00 +00:00 committed by Gerald (Jerry) Carter
parent 9abc667c71
commit 6b2d6ce604
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source4/torture/raw/search.c
View File

@ -550,6 +550,7 @@ static NTSTATUS multiple_search(struct smbcli_state *cli,
printf("(%s) Incorrect value %s=%d - should be %d\n", \
__location__, #v, v, (int)correct); \
ret = False; \
goto done; \
}} while (0)
#define CHECK_STRING(v, correct) do { \
@ -791,11 +792,7 @@ static BOOL test_modify_search(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
io2.t2fnext.in.max_count = 1;
io2.t2fnext.in.resume_key = 0;
io2.t2fnext.in.flags = 0;
if (result.count == 0) {
io2.t2fnext.in.last_name = "";
} else {
io2.t2fnext.in.last_name = result.list[result.count-1].both_directory_info.name.s;
}
io2.t2fnext.in.last_name = result.list[result.count-1].both_directory_info.name.s;
status = smb_raw_search_next(cli->tree, mem_ctx,
&io2, &result, multiple_search_callback);
@ -819,15 +816,15 @@ static BOOL test_modify_search(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
io2.generic.level = RAW_SEARCH_BOTH_DIRECTORY_INFO;
io2.t2fnext.in.handle = io.t2ffirst.out.handle;
io2.t2fnext.in.max_count = num_files - 1;
io2.t2fnext.in.max_count = num_files + 3;
io2.t2fnext.in.resume_key = 0;
io2.t2fnext.in.flags = 0;
io2.t2fnext.in.last_name = result.list[result.count-2].both_directory_info.name.s;
io2.t2fnext.in.last_name = ".";
status = smb_raw_search_next(cli->tree, mem_ctx,
&io2, &result, multiple_search_callback);
CHECK_STATUS(status, NT_STATUS_OK);
CHECK_VALUE(result.count, 21);
CHECK_VALUE(result.count, 22);
ret &= check_result(&result, "t009-9.txt", True, FILE_ATTRIBUTE_ARCHIVE);
ret &= check_result(&result, "t014-14.txt", False, 0);