]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:torture/raw: assert to get LOCK_NOT_GRANTED in torture_samba3_posixtimedlock()
authorStefan Metzmacher <metze@samba.org>
Mon, 19 Aug 2019 14:30:16 +0000 (16:30 +0200)
committerStefan Metzmacher <metze@samba.org>
Mon, 9 Sep 2019 14:23:40 +0000 (14:23 +0000)
There should not be a different if the blocker is a posix process
instead of another smbd.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14113

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
selftest/knownfail.d/samba3posixtimedlock [new file with mode: 0644]
source4/torture/raw/samba3misc.c

diff --git a/selftest/knownfail.d/samba3posixtimedlock b/selftest/knownfail.d/samba3posixtimedlock
new file mode 100644 (file)
index 0000000..56d2d34
--- /dev/null
@@ -0,0 +1 @@
+^samba3.raw.samba3posixtimedlock.samba3posixtimedlock
index dc460b9cd8b97ce2425f6f928aa796133169ad20..2f484023bea813fa8a05af24103f7fc323ccbd5f 100644 (file)
@@ -775,8 +775,8 @@ static void receive_lock_result(struct smbcli_request *req)
 }
 
 /*
- * Check that Samba3 correctly deals with conflicting posix byte range locks
- * on an underlying file
+ * Check that Samba3 correctly deals with conflicting local posix byte range
+ * locks on an underlying file via "normal" SMB1 (without unix extentions).
  *
  * Note: This test depends on "posix locking = yes".
  * Note: To run this test, use "--option=torture:localdir=<LOCALDIR>"
@@ -873,7 +873,7 @@ bool torture_samba3_posixtimedlock(struct torture_context *tctx, struct smbcli_s
        status = smb_raw_lock(cli->tree, &io);
 
        ret = true;
-       CHECK_STATUS(tctx, status, NT_STATUS_FILE_LOCK_CONFLICT);
+       CHECK_STATUS(tctx, status, NT_STATUS_LOCK_NOT_GRANTED);
 
        if (!ret) {
                goto done;