The branch, master has been updated
via 8c458675c10 docs-xml:smb.conf: Fix "ctdbd socket" documentation
from 7483903575e s3:libads: Separate use of ads->config.flags for NBT_*
and DS_* values
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8c458675c10bfda66fb86c5ed67d1d6d0cbbaedf
Author: Martin Schwenke <[email protected]>
Date: Thu Jan 22 10:41:54 2026 +1100
docs-xml:smb.conf: Fix "ctdbd socket" documentation
This has been wrong for a very long time. I only noticed it just
now... :-(
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15977
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Thu Jan 22 23:06:20 UTC 2026 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/misc/ctdbdsocket.xml | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/misc/ctdbdsocket.xml
b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
index 2bc118bd7a7..40cd3fb4634 100644
--- a/docs-xml/smbdotconf/misc/ctdbdsocket.xml
+++ b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
@@ -4,12 +4,16 @@
function="_ctdbd_socket"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
<description>
- <para>If you set <value type="example">clustering=yes</value>,
- you need to tell Samba where ctdbd listens on its unix domain
- socket. The default path as of ctdb 1.0 is /tmp/ctdb.socket which
- you have to explicitly set for Samba in smb.conf.
- </para>
+ <para>
+ In a test environment, this parameter can be used when
+ <value type="example">clustering=yes</value> to specify an alternate
+ location for the CTDB Unix domain socket.
+ </para>
+ <para>
+ This parameter should not be set in production environments. If it
+ is not set then the (correct) build-time default is used.
+ </para>
</description>
<value type="default"></value>
-<value type="example">/tmp/ctdb.socket</value>
+<value type="example">/var/run/altctdb/ctdbd.socket</value>
</samba:parameter>
--
Samba Shared Repository
