[SCM] Samba Shared Repository - branch master updated

[Anoop C S]

The branch, master has been updated
       via  4d45e61a158 dbwrap: Suppress mutex error noise when built without robust mutexes
       via  3a79fa00ffd tdb_wrap: Suppress mutex error noise when built without robust mutexes
      from  fb5a5c024b9 pidl: fix CID(s) CID 1700846 -> CID 1700854 (and pre-existing)

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4d45e61a158143194efb91974ab667ba341b0536
Author: Björn Ketelaars <bjorn.ketelaars at hydroxide.nl>
Date:   Thu Sep 10 16:57:22 2026 +0200

    dbwrap: Suppress mutex error noise when built without robust mutexes
    
    On platforms lacking POSIX robust mutex support (e.g., OpenBSD), running
    smbstatus and other CLI tools outputs multiple "mutexes requested but
    not available" messages to stderr at DBG_ERR (level 0) during normal
    operation.
    
    Because `try_mutex` defaults to true in db_open_ex() and
    tdb_wrap_open(), falling back to POSIX fcntl file locking when
    HAVE_ROBUST_MUTEXES is not defined is expected behavior rather than an
    operational failure.
    
    Wrap the DBG_ERR log calls in `#ifdef HAVE_ROBUST_MUTEXES` in
    `dbwrap_open.c` so build environments without robust mutex support
    fall back silently without polluting level 0 logs.
    
    RN: Suppress spurious "mutexes requested but not available" DBG_ERR
    messages on stderr when running CLI utilities (such as smbstatus) on
    platforms built without robust mutex support (e.g., OpenBSD).
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=16236
    
    Signed-off-by: Björn Ketelaars <bjorn.ketelaars at hydroxide.nl>
    Reviewed-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Noel Power <noel.power at suse.com>
    
    Autobuild-User(master): Anoop C S <anoopcs at samba.org>
    Autobuild-Date(master): Fri Sep 11 07:28:18 UTC 2026 on atb-devel-224

commit 3a79fa00ffd9c7f3b0ef10ba458cf16f2c4ab8ec
Author: Björn Ketelaars <bjorn.ketelaars at hydroxide.nl>
Date:   Thu Sep 10 16:55:02 2026 +0200

    tdb_wrap: Suppress mutex error noise when built without robust mutexes
    
    On platforms lacking POSIX robust mutex support (e.g., OpenBSD), running
    smbstatus and other CLI tools outputs multiple "mutexes requested but
    not available" messages to stderr at DBG_ERR (level 0) during normal
    operation.
    
    Because `try_mutex` defaults to true in db_open_ex() and
    tdb_wrap_open(), falling back to POSIX fcntl file locking when
    HAVE_ROBUST_MUTEXES is not defined is expected behavior rather than an
    operational failure.
    
    Wrap the DBG_ERR log calls in `#ifdef HAVE_ROBUST_MUTEXES` in
    `tdb_wrap.c` so build environments without robust mutex support
    fall back silently without polluting level 0 logs.
    
    RN: Suppress spurious "mutexes requested but not available" DBG_ERR
    messages on stderr when running CLI utilities (such as smbstatus) on
    platforms built without robust mutex support (e.g., OpenBSD).
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=16236
    
    Signed-off-by: Björn Ketelaars <bjorn.ketelaars at hydroxide.nl>
    Reviewed-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Noel Power <noel.power at suse.com>

-----------------------------------------------------------------------

Summary of changes:
 lib/tdb_wrap/tdb_wrap.c          | 2 ++
 source3/lib/dbwrap/dbwrap_open.c | 2 ++
 2 files changed, 4 insertions(+)


Changeset truncated at 500 lines:

diff --git a/lib/tdb_wrap/tdb_wrap.c b/lib/tdb_wrap/tdb_wrap.c
index 6e47760a772..de8cc46d558 100644
--- a/lib/tdb_wrap/tdb_wrap.c
+++ b/lib/tdb_wrap/tdb_wrap.c
@@ -151,8 +151,10 @@ struct tdb_wrap *tdb_wrap_open(TALLOC_CTX *mem_ctx,
 
 		if (tdb_flags & TDB_MUTEX_LOCKING) {
 			if (!tdb_runtime_check_for_robust_mutexes()) {
+#ifdef HAVE_ROBUST_MUTEXES
 				DBG_ERR("mutexes requested but not "
 					"available\n");
+#endif
 				tdb_flags &= ~TDB_MUTEX_LOCKING;
 			}
 		}
diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index eaf909281f1..743a1201d44 100644
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -127,9 +127,11 @@ struct db_context *db_open_ex(TALLOC_CTX *mem_ctx,
 		if (try_mutex) {
 			if (tdb_runtime_check_for_robust_mutexes()) {
 				tdb_flags |= TDB_MUTEX_LOCKING;
+#ifdef HAVE_ROBUST_MUTEXES
 			} else {
 				DBG_ERR("mutexes requested but not "
 					"available\n");
+#endif
 			}
 		}
 


-- 
Samba Shared Repository