]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:torture/vfs/fruit: update test "SMB2/CREATE context AAPL" to work against macOS
authorRalph Boehme <slow@samba.org>
Mon, 15 Oct 2018 13:31:21 +0000 (15:31 +0200)
committerKarolin Seeger <kseeger@samba.org>
Tue, 6 Nov 2018 08:10:23 +0000 (09:10 +0100)
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)

source4/torture/vfs/fruit.c

index a37e2680d2c5f9d0ac735daf2c9deb9ce044d3b2..f563fb87643774233187ee3d59cdc576596eb83a 100644 (file)
@@ -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",