diff options
| author | Ralph Boehme <slow@samba.org> | 2015-12-18 17:23:40 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2016-01-06 10:07:16 +0100 |
| commit | b8512d414b933e30be9e3b9effee1df1311777da (patch) | |
| tree | 865c79b77aaf4a45203b4970b96c703005f93108 | |
| parent | 08f61fa47ed6ac6acd23d62b6f12e6186730c987 (diff) | |
| download | samba-b8512d414b933e30be9e3b9effee1df1311777da.tar.gz | |
s4:torture:vfs_fruit: fix test_aapl() to work with OS X
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 0fc2ed8f01f2e510ee58ad2ea9209d2fec10fd3f)
| -rw-r--r-- | source4/torture/vfs/fruit.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c index a82ae2ea90e..b86c4b4ded3 100644 --- a/source4/torture/vfs/fruit.c +++ b/source4/torture/vfs/fruit.c @@ -1874,8 +1874,9 @@ static bool test_aapl(struct torture_context *tctx, * uint32_t ModelStringLen = 10; * ucs2_t ModelString[5] = "Samba"; */ - ret = false; - goto done; + torture_warning(tctx, + "(%s) unexpected AAPL context length: %zd, expected 50", + __location__, aapl->data.length); } aapl_cmd = IVAL(aapl->data.data, 0); @@ -1913,11 +1914,9 @@ static bool test_aapl(struct torture_context *tctx, aapl_vol_caps = BVAL(aapl->data.data, 24); if (aapl_vol_caps != SMB2_CRTCTX_AAPL_CASE_SENSITIVE) { /* this will fail on a case insensitive fs ... */ - torture_result(tctx, TORTURE_FAIL, - "(%s) unexpected vol_caps: %d", - __location__, (int)aapl_vol_caps); - ret = false; - goto done; + torture_warning(tctx, + "(%s) unexpected vol_caps: %d", + __location__, (int)aapl_vol_caps); } ret = convert_string_talloc(mem_ctx, @@ -1983,7 +1982,7 @@ static bool test_aapl(struct torture_context *tctx, */ ZERO_STRUCT(io); - io.in.desired_access = SEC_RIGHTS_DIR_ALL; + io.in.desired_access = SEC_RIGHTS_DIR_READ; io.in.create_options = NTCREATEX_OPTIONS_DIRECTORY; io.in.file_attributes = FILE_ATTRIBUTE_DIRECTORY; io.in.share_access = (NTCREATEX_SHARE_ACCESS_READ | |