Attachment 18813 Details for Bug 15977 – Patch for v4-24-test, v4-23-test, v4-22-test

[patch] Patch for v4-24-test, v4-23-test, v4-22-test

0001-docs-xml-smb.conf-Fix-ctdbd-socket-documentation.patch (text/plain), 1.93 KB, created by Douglas Bagnall on 2026-01-30 03:02:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Bagnall

Created: 2026-01-30 03:02:02 UTC

Size: 1.93 KB

patch

obsolete

>From 87559d76e51bf4c14670cb46bd5b7f70c8c98eed Mon Sep 17 00:00:00 2001
>From: Martin Schwenke <mschwenke@ddn.com>
>Date: Thu, 22 Jan 2026 10:41:54 +1100
>Subject: [PATCH] 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 <mschwenke@ddn.com>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>
>Autobuild-User(master): Martin Schwenke <martins@samba.org>
>Autobuild-Date(master): Thu Jan 22 23:06:20 UTC 2026 on atb-devel-224
>
>(cherry picked from commit 8c458675c10bfda66fb86c5ed67d1d6d0cbbaedf)
>---
> docs-xml/smbdotconf/misc/ctdbdsocket.xml | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
>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>
>-- 
>2.43.0
>

Flags:

martins: review+

Actions: View

Attachments on bug 15977: 18811 | 18813