summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2018-10-15 15:31:21 +0200
committerKarolin Seeger <kseeger@samba.org>2018-11-06 09:10:23 +0100
commit2fcc620a77455c413451800d33f07871956b4831 (patch)
tree65254fcc28c1621e8dba9f732478a8a821a8770a /source4/torture
parent8651d0e97b483ee742f7b2c7410125b4997cd307 (diff)
downloadsamba-2fcc620a77455c413451800d33f07871956b4831.tar.gz
s4:torture/vfs/fruit: update test "SMB2/CREATE context AAPL" to work against macOS
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13646 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit dba9a4743fc42b57f03b6ace24753ce8091f629f)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/vfs/fruit.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index a37e2680d2c..f563fb87643 100644
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -2306,6 +2306,7 @@ static bool test_aapl(struct torture_context *tctx,
uint32_t aapl_reply_bitmap;
uint32_t aapl_server_caps;
uint32_t aapl_vol_caps;
+ uint32_t expected_vol_caps = 0;
char *model;
struct smb2_find f;
unsigned int count;
@@ -2424,8 +2425,11 @@ static bool test_aapl(struct torture_context *tctx,
goto done;
}
+ if (is_osx_server) {
+ expected_vol_caps = 5;
+ }
aapl_vol_caps = BVAL(aapl->data.data, 24);
- if (aapl_vol_caps != 0) {
+ if (aapl_vol_caps != expected_vol_caps) {
/* this will fail on a case insensitive fs ... */
torture_result(tctx, TORTURE_FAIL,
"(%s) unexpected vol_caps: %d",