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

s4: torture: Fix raw.search:test_one_file() by using the SMB1+POSIX connection for POSIX info levels.

Browse Source 
Remove the following entry in knownfail.d/posix_infolevel_fails.

	^samba3.raw.search.one\ file\ search.*

from knownfail.d/posix_infolevel_fails

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2021-11-19 14:51:39 -08:00 committed by Ralph Boehme
parent aaa6d09f6f
commit 397cc7599b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/knownfail.d/posix_infolevel_fails
View File

@ -5,4 +5,3 @@
^samba3.blackbox.inherit_owner.*.NT1.*verify.*unix\ owner.*
^samba3.unix.info2.info2\(nt4_dc_smb1\)
^samba3.unix.info2.info2\(ad_dc_smb1\)
^samba3.raw.search.one\ file\ search.*

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

@ -389,10 +389,19 @@ static bool test_one_file(struct torture_context *tctx,
for (i=0;i<ARRAY_SIZE(levels);i++) {
NTSTATUS expected_status;
uint32_t cap = cli->transport->negotiate.capabilities;
struct smbcli_state *cli_search = cli;
torture_comment(tctx, "Testing %s\n", levels[i].name);
levels[i].status = torture_single_search(cli, tctx, fname,
if (levels[i].data_level == RAW_SEARCH_DATA_UNIX_INFO) {
/*
* For an SMB1+POSIX info level, use the cli_unix
* connection.
*/
cli_search = cli_unix;
}
levels[i].status = torture_single_search(cli_search, tctx, fname,
levels[i].level,
levels[i].data_level,
0,
@ -416,7 +425,7 @@ static bool test_one_file(struct torture_context *tctx,
continue;
}
status = torture_single_search(cli, tctx, fname2,
status = torture_single_search(cli_search, tctx, fname2,
levels[i].level,
levels[i].data_level,
0,