diff options
| author | Ralph Boehme <slow@samba.org> | 2015-12-18 17:08:32 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2016-01-06 10:07:15 +0100 |
| commit | 432e9a1157c7264af5457456bd2d85003cca6bb9 (patch) | |
| tree | a3573466cfe919de0a2ffefb891a692527842ca2 | |
| parent | 3bf18468484cc38ef8f85df6730f1088d6b3244e (diff) | |
| download | samba-432e9a1157c7264af5457456bd2d85003cca6bb9.tar.gz | |
s4:torture:vfs_fruit: add --option=torture:osx for enable_aapl()
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>
(cherry picked from commit 3c0ac9b3899aa06315e592253c858f31d4bd2ae3)
| -rw-r--r-- | source4/torture/vfs/fruit.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c index a102026f58c..6de564c3e56 100644 --- a/source4/torture/vfs/fruit.c +++ b/source4/torture/vfs/fruit.c @@ -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, @@ -2752,6 +2756,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) { |