summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* VERSION: Bump version up to 4.11.0...samba-4.11.0Karolin Seeger2019-09-171-2/+2
| | | | | | and disable GIT_SNAPSHOT for the 4.11.0 release. Signed-off-by: Karolin Seeger <kseeger@samba.org>
* WHATSNEW: Add release notes for Samba 4.11.0.Karolin Seeger2019-09-171-7/+10
| | | | Signed-off-by: Karolin Seeger <kseeger@samba.org>
* VERSION: Bump version up to 4.11.0rc5...Karolin Seeger2019-09-111-2/+2
| | | | | | and re-enable GIT_SNAPSHOT. Signed-off-by: Karolin Seeger <kseeger@samba.org>
* VERSION: Disable GIT_SNAPSHOT for the 4.11.0rc4 release.samba-4.11.0rc4Karolin Seeger2019-09-111-1/+1
| | | | Signed-off-by: Karolin Seeger <kseeger@samba.org>
* WHATSNEW: Add release notes for Samba 4.11.0rc4.Karolin Seeger2019-09-111-1/+40
| | | | Signed-off-by: Karolin Seeger <kseeger@samba.org>
* WHATSNEW: Remove paragraph about rejoining DCs.Karolin Seeger2019-09-111-5/+0
| | | | Signed-off-by: Karolin Seeger <kseeger@samba.org>
* vfs: restore stat fields in vfs_stat_fsp()Ralph Boehme2019-09-103-1/+4
| | | | | | | | | | | | | | | | | | | | | | | This ensures we preserve btime, itime and File-ID. As the Durable Handles code calls vfs_stat_fsp() in the DH disconnect function, previously the btime was lost and NOT stored in the cookie. With this change the cookie will store the correct btime (and iflags), which requires us to call dos_mode() in the reconnect function to ensure we pass vfs_default_durable_reconnect_check_stat(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=14121 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Ralph Böhme <slow@samba.org> Autobuild-Date(master): Tue Sep 10 20:22:21 UTC 2019 on sn-devel-184 (cherry picked from commit 95655fe683d499d93f3844ed72ad332ef64adb96) Autobuild-User(v4-11-test): Stefan Metzmacher <metze@samba.org> Autobuild-Date(v4-11-test): Tue Sep 10 22:29:08 UTC 2019 on sn-devel-184
* s3:vfs: streamline vfs_stat_fsp()Ralph Boehme2019-09-101-6/+4
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=14121 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit e00e78cfeda99bd5374eff8fb4ba84873e4e46b7)
* s3: replace fsp_stat() with vfs_stat_fsp()Ralph Boehme2019-09-104-31/+23
| | | | | | | | | | Both functions do the same, they differ just in the type of the returned result. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14121 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit ab03394969f8a4c748aea7d0d8ed37f9ced6cc30)
* s3:lib: add update_stat_ex_from_saved_stat()Ralph Boehme2019-09-102-0/+22
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=14121 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit ac18730f10ce96a607a3a07e1360b522ebf72f38)
* vfs_catia: stat info may have been updated, make sure to return changesRalph Boehme2019-09-101-0/+4
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=14121 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 4e49999c97f53acc7006f1dc6b6812bb0e156db5)
* s3:smbd: ensure to update the File-ID in struct smb_filenameRalph Boehme2019-09-101-0/+17
| | | | | | | | | | | | | | | Initialize the File-ID in fsp->fsp_name->st, any subsequent metadata fetch on this file-handle needs this, eg QFID SMB2 Create-Context or GETINFO SMB requests. It would be nice if SMB_VFS_SET_DOS_ATTRIBUTE() would do this, unfortunately it gets a const struct smb_filename. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14121 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 3483b75fed8985bd2968bbf8c85985107115fba8)
* s3:lib: round itime to NTTIME resolution in make_file_id_from_itime()Ralph Boehme2019-09-101-0/+2
| | | | | | | | | | | | | | | | | | | The rounding is needed because when a file is created via eg an SMB2 CREATE request, we need to calculate the correct File-ID for the QFID Create-Context or for a subsequent GETINFO SMB request on the same file-handle. Any later metadata request that received the File-ID will do so by going through dos_mode() -> ... -> parse_dos_attribute_blob(), where the File-ID will be calculated from the on-disk itime which has NTTIME resolution. As long as that is the only available itime backend, I'm rounding itime inside make_file_id_from_itime(), not in the callers. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14121 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 84abeaa60ffced276da2b28b8add6efaa6da5ca6)
* lib: add round_timespec_to_nttime()Ralph Boehme2019-09-102-0/+10
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=14121 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 5403bb22e6cb39baf6dc1b91558744d41e9f6f64)
* s4:torture: add a file-id related testRalph Boehme2019-09-105-0/+217
| | | | | | | | | | | Note I'm using the share vfs_fruit_xattr because I need a share with both a streams and a acl_* VFS object. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14121 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 2ecab3c60abf9baa16a6a5e3eba0fc4720def840)
* s3:ldap: Fix join with don't exists machine accountEvgeny Sinelnikov2019-09-101-2/+3
| | | | | | | | | | | | | | | | | | | | Add check for requested replies of existing machine object during join machine to domain. This solves regression fail during join with error: "None of the information to be translated has been translated." https://bugzilla.samba.org/show_bug.cgi?id=14007 Reviewed-by: Guenther Deschner <gd@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Günther Deschner <gd@samba.org> Autobuild-Date(master): Wed Sep 4 17:02:37 UTC 2019 on sn-devel-184 (cherry picked from commit ad4ef1657e9b2a088a3bfadcce196cfcceead1dc) Autobuild-User(v4-11-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-11-test): Tue Sep 10 09:13:15 UTC 2019 on sn-devel-184
* s3:selftest: add delay_inject:brl_lock_windows testingStefan Metzmacher2019-09-092-0/+16
| | | | | | | | | | | | | | | 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> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Mon Sep 9 15:42:45 UTC 2019 on sn-devel-184 (cherry picked from commit 2b43ce6704ecf035e6734337a2dea3458153a4b2) Autobuild-User(v4-11-test): Stefan Metzmacher <metze@samba.org> Autobuild-Date(v4-11-test): Mon Sep 9 17:19:11 UTC 2019 on sn-devel-184
* vfs_delay_inject: add support for brl_[un]lock_windows()Stefan Metzmacher2019-09-091-0/+117
| | | | | | | | | | | | This demonstrates the two ways to handle the retry: - smb layer retry => plock->context.smblctx = UINT64_MAX - vfs backend retry => plock->context.smblctx = 0 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> (cherry picked from commit c2503a5c68e967054ab84ca0d8ce693200c2e002)
* s3:locking: add brl_req_guid() and brl_req_mem_ctx() helper functionsStefan Metzmacher2019-09-0911-5/+106
| | | | | | | | | | | This allows the vfs backend to detect a retry and keep state between the retries. 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> (cherry picked from commit 66d92f37c3a643d97489a59bb6d1e75e91528c20)
* s3:smb2_lock: handle NT_STATUS_RETRY from the VFS backendStefan Metzmacher2019-09-091-0/+80
| | | | | | | | | | | This allows the VFS backends to implement async byte range locking. 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> (cherry picked from commit 7471b0f63276e707784c98b832992ff08b1898ef)
* s3:blocking: handle NT_STATUS_RETRY from the VFS backendStefan Metzmacher2019-09-091-0/+84
| | | | | | | | | | | This allows the VFS backends to implement async byte range locking. 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> (cherry picked from commit 7d1cd6f22e7e3d95aba04c45776057945c2a5e30)
* s3:blocking: make use of smbd_smb1_do_locks_try() in smbd_smb1_do_locks_send()Stefan Metzmacher2019-09-091-86/+4
| | | | | | | | | | | We only need the logic to call smbd_smb1_do_locks_check() and a possible retry once in smbd_smb1_do_locks_try(). 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> (cherry picked from commit 8975673e3c3f9f7dbdb7ba7562bb81a62cd24e2e)
* s3:blocking: call smbd_smb1_do_locks_setup_timeout() also in ↵Stefan Metzmacher2019-09-091-0/+5
| | | | | | | | | | | | | | | smbd_smb1_do_locks_try() This is a noop if smbd_smb1_do_locks_setup_timeout() was called before. But it allows us to use smbd_smb1_do_locks_try() in smbd_smb1_do_locks_send() in a following commit. 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> (cherry picked from commit 6e30a89b3f00ad55391454fbaa1272074e1962f0)
* s3:blocking: fix the fsp->blocked_smb1_lock_reqs handlingStefan Metzmacher2019-09-092-13/+125
| | | | | | | | | | | | | | | A new request is first checks against all pending requests before checking the already granted locks. Before we retried the lock array of another request (the first in the list), but then finished current request, which is wrong. 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> (cherry picked from commit 312327106271abafeb53e62dfb71a38bf93e2d41)
* s3:blocking: do the timeout calculation before calling ↵Stefan Metzmacher2019-09-091-16/+16
| | | | | | | | | | | | dbwrap_watched_watch_send() This makes the next commits easier to understand. 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> (cherry picked from commit 997548a5f1a14d82f1e80cce6d9ee55e85b5107c)
* s3:blocking: split out smbd_smb1_do_locks_setup_timeout()Stefan Metzmacher2019-09-091-35/+63
| | | | | | | | | | | | | This function can be called multiple times, but only the first time will setup the endtime. And the endtime is relative to the request time and not the current time. 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> (cherry picked from commit 8da7c10a58292022ee57406db9a365de9ffaf5cf)
* s3:blocking: use timeval_expired(&state->endtime) to stop processingStefan Metzmacher2019-09-091-8/+17
| | | | | | | | | | | | This is less racy than timeval_elapsed() > 0 as the current time is already expired and timeout = 0 will always work correct. 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> (cherry picked from commit 5a841a43f9c4f862e2d7235429363b3066cf5850)
* s4:torture/raw: add multilock6 testStefan Metzmacher2019-09-093-0/+265
| | | | | | | | | | | | This is similar to multilock3, but uses a read-only (LOCKING_ANDX_SHARED_LOCK) locks for the 2nd lock request. 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> (cherry picked from commit d3bc0199697fd7d6e04479321ca644a227bc4ede)
* s4:torture/raw: add multilock5 testStefan Metzmacher2019-09-092-0/+270
| | | | | | | | | | | | This is similar to multilock3, but uses a read-only (LOCKING_ANDX_SHARED_LOCK) locks for the first lock request. 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> (cherry picked from commit 6d4296aca0c9a9287c0c78c8f8847a560bd2ea24)
* s4:torture/raw: add multilock4 testStefan Metzmacher2019-09-092-0/+267
| | | | | | | | | | | | This is similar to multilock3, but uses read-only (LOCKING_ANDX_SHARED_LOCK) locks for the blocked requests. 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> (cherry picked from commit d3e65ceb1ec25c7b62a7e908506126269011f30d)
* s4:torture/raw: add multilock3 testStefan Metzmacher2019-09-092-0/+267
| | | | | | | | | | | | This demonstrates that unrelated lock ranges are not blocked by other blocked requests on the same fsp. 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> (cherry picked from commit 297763c6b618c07148d788b46218a0798225bf79)
* s4:torture/raw: improvements for multilock2Stefan Metzmacher2019-09-091-1/+4
| | | | | | | | 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> (cherry picked from commit 8a7039be530adcdda9e7e7621bdcf902f5ca1721)
* s3:smb2_lock: add retry for POSIX locksStefan Metzmacher2019-09-092-1/+55
| | | | | | | | 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> (cherry picked from commit 8decf41bbb8be2b4ac463eb6ace16a8628276ab5)
* s4:torture/smb2: add smb2.samba3misc.localposixlock1Stefan Metzmacher2019-09-096-1/+193
| | | | | | | | | | | This demonstrates that the SMB2 code path doesn't do any retry for local posix locks. 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> (cherry picked from commit 7155d3a2c5d7237f00cccb1802c1341cf295864e)
* s3:smb2_lock: make use of smbd_smb2_lock_try() in smbd_smb2_lock_send()Stefan Metzmacher2019-09-091-62/+6
| | | | | | | | | | We only need the logic to call smbd_do_locks_try() and a possible retry once in smbd_smb2_lock_try(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=14113 Signed-off-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 359e9992be713bbecfdb19998d69e1d3f020c5e9)
* s3:smb2_lock: let smbd_smb2_lock_try() explicitly check for the retry conditionStefan Metzmacher2019-09-091-0/+26
| | | | | | | | | | | | | This makes it possible to reuse _try() in the _send() function in the next commit. We should not retry forever on a hard error. 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> (cherry picked from commit 7f77e0b4e9878f1f3515206d052adc012e26aafb)
* s3:smb2_lock: error out early in smbd_smb2_lock_send()Stefan Metzmacher2019-09-091-3/+19
| | | | | | | | | | | | | We no longer expect NT_STATUS_FILE_LOCK_CONFLICT from the VFS layer and assert that in a future version. This makes it easier to port the same logic to smbd_smb2_lock_try(). 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> (cherry picked from commit 39d514cdc358f175d0968f4a78f8f2f05a6c1707)
* s3:smb2_lock: split smbd_smb2_lock_retry() into _try() and _retry()Stefan Metzmacher2019-09-091-19/+30
| | | | | | | | | | | This makes it possible to reuse _try() in the _send() function in the next commits. 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> (cherry picked from commit d096742da1a045357f52ccd5b28d499c30e96152)
* s3:smb2_lock: move from 'blocking' to 'state->blocking'Stefan Metzmacher2019-09-091-3/+3
| | | | | | | | | | This will simplify the next commits. 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> (cherry picked from commit f13d13ae9da3072862a781bc926e7a06e8384337)
* s3:brlock: always return LOCK_NOT_GRANTED instead of FILE_LOCK_CONFLICTStefan Metzmacher2019-09-091-4/+4
| | | | | | | | | | | | | | Returning NT_STATUS_FILE_LOCK_CONFLICT is a SMB1 only detail for delayed brlock requests, which is handled in smbd_smb1_do_locks*(). The brlock layer should be consistent even for posix locks. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14113 Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Volker Lendecke <vl@samba.org> (cherry picked from commit ad98eec6090430ba5296a5111dde2e53b9cd217a)
* s3:blocking: maintain state->deny_statusStefan Metzmacher2019-09-092-6/+28
| | | | | | | | | | | For Windows locks we start with LOCK_NOT_GRANTED and use FILE_LOCK_CONFLICT if we retried after a timeout. 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> (cherry picked from commit aba0ee46258f3dd910421facb742fce3318a6946)
* s4:torture/raw: assert to get LOCK_NOT_GRANTED in ↵Stefan Metzmacher2019-09-092-3/+4
| | | | | | | | | | | | | torture_samba3_posixtimedlock() 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> (cherry picked from commit 2a77025a1e16d897281e5840192c93fa03328681)
* s3:blocking: use dynamic posix lock wait intervalsStefan Metzmacher2019-09-091-4/+37
| | | | | | | | | | | | We want to start with a short timeout (200ms) and slow down to larger timeouts up to 2s for the default value of "lock spin time". 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> (cherry picked from commit 15765644d2590d6549f8fcc01c39c56387eed654)
* s3:blocking: Remove bug reproducer from a few commits agoStefan Metzmacher2019-09-091-2/+2
| | | | | | | | | | | The problem is fixed, now we can revert the change that made it easier to trigger. 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> (cherry picked from commit 62ec58b06c38ee82bb3147c4d325413fd3a76499)
* s3:blocking: fix posix lock retryStefan Metzmacher2019-09-092-12/+25
| | | | | | | | | | | | | | | We should evaluate the timeout condition after the very last retry and not before. Otherwise we'd fail to retry when waiting for posix locks. The problem happens if the client provided timeout is smaller than the 1 sec (for testing temporary 15 secs) retry. 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> (cherry picked from commit e8d719d31f885d7b6d5b317165f90ec40df169c9)
* s3:blocking: move from 'timeout' to 'smbd_smb1_do_locks_state->timeout'Stefan Metzmacher2019-09-092-10/+12
| | | | | | | | | | | This will make it possible to just use smbd_smb1_do_locks_try() in a later commit. 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> (cherry picked from commit 8fe708acb43ea36d0cbf398713b125daba180a2d)
* s3:blocking: split smbd_smb1_do_locks_retry() into _try() and _retry()Stefan Metzmacher2019-09-091-30/+42
| | | | | | | | | | | | This will make it possible to have just one caller to smbd_do_locks_try() later and use smbd_smb1_do_locks_try() from within smbd_smb1_do_locks_send(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=14113 Reviewed-by: Volker Lendecke <vl@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit e79fcfaaf2ecfca6c3747f6fe4be51f332ebf10d)
* s3:blocking: demonstrate the posix lock retry failsStefan Metzmacher2019-09-092-2/+3
| | | | | | | | | | | | | | This is just a temporary commit that shows the bug and its fix. It will be reverted once the problem is fixed. The posix lock retry fails if the client specified timeout is smaller than the hardcoded 1 second retry. 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> (cherry picked from commit 2ec9e93a7aac2706b4a5931495d56a7b64f8d894)
* s3:torture: convert LOCK9 into LOCK9A and LOCK9BStefan Metzmacher2019-09-093-14/+29
| | | | | | | | | | | | | | LOCK9A is the original test (with a timeout of -1) and LOCK9B is the same but with timeout of 10 seconds. LOCK9B is needed to demonstrate a server bug in the next commits. 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> (cherry picked from commit ac28eec3e4af710feab3be3d4b25bfbe38294431)
* s3:torture: fix the timeout alarm handling on LOCK9Stefan Metzmacher2019-09-091-1/+1
| | | | | | | | | | | | | | | smbXcli_conn_disconnect(alarm_cli->conn, NT_STATUS_OK) means existing requests are not finished with an error, but instead just keep dangling arround. Pass NT_STATUS_LOCAL_DISCONNECT in order to fail the cli_lock32() call after getting SIGALARM. 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> (cherry picked from commit e18c8ced8e7a872deb118191595425ef6b826bfa)
View Lorry Controller Status