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

s4:torture:vfs_fruit: add --option=torture:osx for enable_aapl()

Browse Source 
Check if the server is OS X and don't check the AAPL context size if it
is.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=11347

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2015-12-18 17:08:32 +01:00 committed by Jeremy Allison
parent fdf937e77d
commit 3c0ac9b389
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source4/torture/vfs/fruit.c
View File

@ -1207,6 +1207,7 @@ static bool enable_aapl(struct torture_context *tctx,
SMB2_CRTCTX_AAPL_SUPPORTS_READ_DIR_ATTR |
SMB2_CRTCTX_AAPL_SUPPORTS_NFS_ACE |
SMB2_CRTCTX_AAPL_SUPPORTS_OSX_COPYFILE);
bool is_osx_server = torture_setting_bool(tctx, "osx", false);
ZERO_STRUCT(io);
io.in.desired_access = SEC_FLAG_MAXIMUM_ALLOWED;
@ -1249,7 +1250,10 @@ static bool enable_aapl(struct torture_context *tctx,
aapl = smb2_create_blob_find(&io.out.blobs,
SMB2_CREATE_TAG_AAPL);
torture_assert_goto(tctx, aapl != NULL, ret, done, "missing AAPL context");
torture_assert_goto(tctx, aapl->data.length == 50, ret, done, "bad AAPL size");
if (!is_osx_server) {
torture_assert_goto(tctx, aapl->data.length == 50, ret, done, "bad AAPL size");
}
aapl_server_caps = BVAL(aapl->data.data, 16);
torture_assert_goto(tctx, aapl_server_caps == expexted_scaps,
@ -2746,6 +2750,8 @@ static bool test_rename_dir_openfile(struct torture_context *torture,
* some tests torture must be run on the host it tests and takes an additional
* argument with the local path to the share:
* "--option=torture:localdir=<SHAREPATH>".
*
* When running against an OS X SMB server add "--option=torture:osx=true"
*/
struct torture_suite *torture_vfs_fruit(void)
{