The branch, master has been updated
via 29393812dc2 smbd: update declaration in smb2_sesssetup, smb2_tcon
via 89b16e8a0f8 s3: Warn if no mutexes available at runtime
via eac839d03cc smbd: Log client ip when rejecting nonencrypted tcons
via 2760c04e468 smbd: Log client ip when rejecting nonencrypted
sesssetups
via f12adf6b29a rpcclient: Print current_users for share info level 2
from e73513a588c smbd: Fix getting fs capabilities
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 29393812dc264c85c5cfe39688bfb4b2ff636025
Author: Shwetha Acharya <[email protected]>
Date: Thu Mar 5 12:36:09 2026 +0530
smbd: update declaration in smb2_sesssetup, smb2_tcon
Signed-off-by: Shwetha K Acharya <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Reviewed-by: Shweta Sodani <[email protected]>
Reviewed-by: Xavi Hernandez <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Tue Mar 10 13:01:10 UTC 2026 on atb-devel-224
commit 89b16e8a0f89af2336bdaa18d39eb3eb25d5ae77
Author: Volker Lendecke <[email protected]>
Date: Wed Jan 9 15:10:54 2019 +0100
s3: Warn if no mutexes available at runtime
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Reviewed-by: Shweta Sodani <[email protected]>
Reviewed-by: Xavi Hernandez <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit eac839d03ccac27c6dc82c14d5d047cc5af7b658
Author: Volker Lendecke <[email protected]>
Date: Mon Aug 10 16:55:22 2015 +0200
smbd: Log client ip when rejecting nonencrypted tcons
Used for better diagnosis
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Reviewed-by: Shweta Sodani <[email protected]>
Reviewed-by: Xavi Hernandez <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 2760c04e4686a1d12582e02c5f20af80c92fc865
Author: Volker Lendecke <[email protected]>
Date: Mon Aug 10 16:55:22 2015 +0200
smbd: Log client ip when rejecting nonencrypted sesssetups
Used for better diagnosis
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Reviewed-by: Shweta Sodani <[email protected]>
Reviewed-by: Xavi Hernandez <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit f12adf6b29a5230cf99aa8bb3b1f96a035218244
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 28 16:03:06 2013 +0000
rpcclient: Print current_users for share info level 2
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Reviewed-by: Shweta Sodani <[email protected]>
Reviewed-by: Xavi Hernandez <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/tdb_wrap/tdb_wrap.c | 2 ++
source3/lib/dbwrap/dbwrap_open.c | 9 +++++++--
source3/rpcclient/cmd_srvsvc.c | 1 +
source3/smbd/smb2_sesssetup.c | 13 ++++++++++---
source3/smbd/smb2_tcon.c | 14 +++++++++++---
5 files changed, 31 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb_wrap/tdb_wrap.c b/lib/tdb_wrap/tdb_wrap.c
index 49585aa0b9f..6e47760a772 100644
--- a/lib/tdb_wrap/tdb_wrap.c
+++ b/lib/tdb_wrap/tdb_wrap.c
@@ -151,6 +151,8 @@ struct tdb_wrap *tdb_wrap_open(TALLOC_CTX *mem_ctx,
if (tdb_flags & TDB_MUTEX_LOCKING) {
if (!tdb_runtime_check_for_robust_mutexes()) {
+ DBG_ERR("mutexes requested but not "
+ "available\n");
tdb_flags &= ~TDB_MUTEX_LOCKING;
}
}
diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index 91556f22819..d91055d2e8e 100644
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -118,8 +118,13 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
try_mutex = false;
}
- if (try_mutex && tdb_runtime_check_for_robust_mutexes()) {
- tdb_flags |= TDB_MUTEX_LOCKING;
+ if (try_mutex) {
+ if (tdb_runtime_check_for_robust_mutexes()) {
+ tdb_flags |= TDB_MUTEX_LOCKING;
+ } else {
+ DBG_ERR("mutexes requested but not "
+ "available\n");
+ }
}
require_mutex = lp_parm_bool(-1, "dbwrap_tdb_require_mutexes",
diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index 073e51da439..33d21891671 100644
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -235,6 +235,7 @@ static void display_share_info_2(struct
srvsvc_NetShareInfo2 *r)
printf("\tremark:\t%s\n", r->comment);
printf("\tpath:\t%s\n", r->path);
printf("\tpassword:\t%s\n", r->password);
+ printf("\tcurrent_users:\t%" PRIu32 "\n", r->current_users);
}
static void display_share_info_502(struct srvsvc_NetShareInfo502 *r)
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index b4b351a14ea..a3dd5bac02b 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -289,9 +289,16 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct
smbXsrv_session *session,
if (xconn->smb2.server.cipher == 0) {
if (x->global->encryption_flags & SMBXSRV_ENCRYPTION_REQUIRED) {
- DEBUG(1,("reject session with dialect[0x%04X] "
- "as encryption is required\n",
- xconn->smb2.server.dialect));
+ char *addr =
tsocket_address_string(xconn->remote_address,
+ talloc_tos());
+
+ DBG_WARNING("reject session from %s with
dialect[0x%04X] "
+ "as encryption is required\n",
+ addr ? addr : "[UNKNOWN]",
+ xconn->smb2.server.dialect);
+
+ TALLOC_FREE(addr);
+
return NT_STATUS_ACCESS_DENIED;
}
}
diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index 1739f51de3f..df3c2259571 100644
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -27,6 +27,7 @@
#include "lib/param/loadparm.h"
#include "../lib/util/tevent_ntstatus.h"
#include "smbd/smbXsrv_session.h"
+#include "lib/tsocket/tsocket.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_SMB2
@@ -325,9 +326,16 @@ static NTSTATUS smbd_smb2_tree_connect(struct
smbd_smb2_request *req,
if (conn->smb2.server.cipher == 0) {
if (encryption_required) {
- DEBUG(1,("reject tcon with dialect[0x%04X] "
- "as encryption is required for service %s\n",
- conn->smb2.server.dialect, service));
+ char *addr =
tsocket_address_string(conn->remote_address,
+ talloc_tos());
+
+ DBG_WARNING("reject tcon from %s with dialect[0x%04X] "
+ "as encryption is required for service
%s\n",
+ addr ? addr : "[UNKNOWN]",
+ conn->smb2.server.dialect, service);
+
+ TALLOC_FREE(addr);
+
return NT_STATUS_ACCESS_DENIED;
}
}
--
Samba Shared Repository
