samba.git/source3/locking, branch master

s3/brlock: map nt-error from correct errno-value

2026-04-21T02:05:57+00:00

The functions 'brl_lock_windows_default' and 'brl_lock_posix' uses
explicit 'errno_ret' value to avoid possible errno overwrite. Use in
failure case.

Signed-off-by: Shachar Sharon 
Reviewed-by: Anoop C S 
Reviewed-by: Shwetha Acharya 
Reviewed-by: Martin Schwenke 

Autobuild-User(master): Martin Schwenke 
Autobuild-Date(master): Tue Apr 21 02:05:57 UTC 2026 on atb-devel-224

s3:locking: make leases.tdb none readable for others

2026-04-07T15:09:38+00:00

Signed-off-by: Ralph Wuerthner 
Reviewed-by: Xavi Hernandez 
Reviewed-by: Martin Schwenke 
Reviewed-by: Anoop C S

s3:locking: make locking.tdb none readable for others

2026-04-07T15:09:38+00:00

Signed-off-by: Ralph Wuerthner 
Reviewed-by: Xavi Hernandez 
Reviewed-by: Martin Schwenke 
Reviewed-by: Anoop C S

s3/locking: simplify reset_share_mode_entry()

2025-12-08T10:20:36+00:00

Since 3df388b8f148c00a3ef331d393cea976fb9340b3 we're using the open global_id as
share_file_id in the share_mode_entry and we're also not changing it in
mark_share_mode_disconnected().

Iow, old_share_file_id is equal to new_share_file_id which and both are equal to
open_global_id.

Hence replace the two old_share_file_id and new_share_file_id arguments with the
single open_global_id argument.

Signed-off-by: Ralph Boehme 
Reviewed-by: Volker Lendecke

s3: talloc_destroy() -> TALLOC_FREE()

2025-11-10T13:29:30+00:00

Sweeping change, I know. Should not change compiled code in most
cases, the compiler should be smart enough to elide the assignment
right before a return. In the cases where this is not right before the
return, TALLOC_FREE() is safer as it makes use-after-free crash.

Signed-off-by: Volker Lendecke 
Reviewed-by: Anoop C S

smbd: move lp_locking() check inside file_has_brlocks()

2025-10-10T15:59:35+00:00

Avoids doing the check at every caller.

Signed-off-by: Ralph Boehme 
Reviewed-by: Volker Lendecke

smbd: use op->global->open_global_id for the share_mode_entry.share_file_id

2025-10-10T11:43:16+00:00

open_global_id is an uint32_t, share_file_id is an uint64_t.

For internal opens that don't have an smbXsrv_open_global.tdb entry, continue to
use a generation counter starting at UINT32_MAX + 1.

We don't expose internal opens via srvsrc, which imposes the requirement for
using an uint32_t, so we can use larger ids for the internal opens as srvsvc
never sees them (as they're not in smbXsrv_open_global.tdb and srvsvc as any
other component listing open files like smbstatus lists smbXsrv_open_global.tdb).

Signed-off-by: Ralph Boehme 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Fri Oct 10 11:43:16 UTC 2025 on atb-devel-224

s3/locking: fix checking for byterange locks when granting RH lease

2025-08-15T15:46:35+00:00

From MS-FSA 2.1.5.18 "Server Requests an Oplock":

...

* Else If Type is LEVEL_GRANULAR:
    * If RequestedOplockLevel is READ_CACHING or (READ_CACHING|HANDLE_CACHING):
        * The operation MUST be failed with STATUS_OPLOCK_NOT_GRANTED under either of the
          following conditions:
            * Open.Stream.ByteRangeLockList is not empty and Open.Stream.AllocationSize
              is greater than any ByteRangeLock.LockOffset in
              Open.Stream.ByteRangeLockList.

...

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

Signed-off-by: Ralph Boehme 
Reviewed-by: Volker Lendecke

s3/locking: modernize file_has_brlocks()

2025-08-15T15:46:35+00:00

No change in behaviour. Minimizes diff in the next commit that introduce a
behaviour change.

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

Signed-off-by: Ralph Boehme 
Reviewed-by: Volker Lendecke

smbd: make file_has_brlocks() public

2025-08-15T15:46:35+00:00

Prepares for a change to file_has_brlocks() in the next commit. No change in
behaviour.

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

Signed-off-by: Ralph Boehme 
Reviewed-by: Volker Lendecke