From 19e8656626d0235396994800e757ea5cd00ddb63 Mon Sep 17 00:00:00 2001
From: Tahlia Richardson <3069029+tahliar@users.noreply.github.com>
Date: Fri, 25 Oct 2024 13:25:28 +1000
Subject: [PATCH] Fix Samba typo (#422)

bsc#1232243
jsc#DOCTEAM-1620
---
 xml/ha_samba.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/xml/ha_samba.xml b/xml/ha_samba.xml
index 06dbf5f3..854edf7e 100644
--- a/xml/ha_samba.xml
+++ b/xml/ha_samba.xml
@@ -6,27 +6,27 @@
 ]>
 <!-- Converted by suse-upgrade version 1.1 -->
 <!--see:  http://www.linux-ha.org/wiki/CTDB_%28resource_agent%29
- 
+
  toms 2013-03-22:
  * https://www.suse.com/support/kb/doc.php?id=7006496
    (FATE#312706)
- 
+
  http://wiki.samba.org/index.php/CTDB_Setup
  http://ctdb.samba.org/
  http://samba.org/~tridge/sambaxp-07/ctdb.pdf
  http://wiki.samba.org/index.php/CTDB_Setup
  http://wiki.samba.org/index.php/Samba_%26_Clustering
  + innerweb link by tserong
- 
+
  CTDB = Cluster Trivial Database
 -->
 <!--taroth 2010-07-26: FIXME - today's mail by tserong on devel-ha:
  I've just checked in a change to the CTDB RA:
   https://bugzilla.novell.com/show_bug.cgi?id=623788
   This makes the smb_private_dir parameter optional.  [...]
- 
+
  For reference, the wording I've used in the RA metadata is as follows:
- 
+
  smb_private_dir (string): Samba private dir (deprecated)
  The directory for smbd to use for storing such files as
  smbpasswd and secrets.tdb.  Old versions of CTBD (prior to 1.0.50)
@@ -144,8 +144,8 @@
  <sect1 xml:id="sec-ha-samba-basicconf">
   <title>Basic configuration</title>
 
-  <remark>toms 2014-02-28: From "Tim": "I want to see if we can change this 
-    to match what's described in fate#316336 (i.e. separate samba and winbind resources).  
+  <remark>toms 2014-02-28: From "Tim": "I want to see if we can change this
+    to match what's described in fate#316336 (i.e. separate samba and winbind resources).
     This is largely a testing/validation effort."</remark>
 
   <note>
@@ -206,7 +206,7 @@
         <para>
          For an existing OCFS2 file system use:
         </para>
-<screen>&prompt.root;<command>tunefs.ocfs2</command> --fs-feature=xattr<!-- 
+<screen>&prompt.root;<command>tunefs.ocfs2</command> --fs-feature=xattr<!--
       -->&nbsp;<replaceable>DEVICE</replaceable></screen>
         <para>
          Make sure the <option>acl</option> option is specified in the file
@@ -265,7 +265,7 @@
     clustering = yes
     idmap config * : backend = tdb2
     passdb backend = tdbsam
-    ctdbd socket = /var/lib/ctdb/ctdb.socket
+    ctdbd socket = /var/lib/ctdb/ctdbd.socket
     # settings necessary for CTDB on OCFS2
     fileid:algorithm = fsid
     vfs objects = fileid
@@ -289,10 +289,10 @@
 <!--taroth 2012-02-07: fixed bnc#745334, default timeout for start/stop-->
 <screen>&prompt.root;<command>crm</command> configure
 &prompt.crm.conf;<command>primitive</command> ctdb CTDB params \
-    ctdb_manages_winbind="false" \ 
+    ctdb_manages_winbind="false" \
     ctdb_manages_samba="false" \
     ctdb_recovery_lock="/srv/clusterfs/samba/ctdb.lock" \
-    ctdb_socket="/var/lib/ctdb/ctdb.socket" \ 
+    ctdb_socket="/var/lib/ctdb/ctdbd.socket" \
       op monitor interval="10" timeout="20" \
       op start interval="0" timeout="90" \
       op stop interval="0" timeout="100"
@@ -314,7 +314,7 @@
     <para>
      Add a clustered IP address:
     </para>
-<screen>&prompt.crm.conf;<command>primitive</command> ip IPaddr2<!-- 
+<screen>&prompt.crm.conf;<command>primitive</command> ip IPaddr2<!--
     --> params ip=&subnetII;.222 \
     unique_clone_address="true" \
     op monitor interval="60" \
@@ -363,11 +363,11 @@ Clone Set: cl-clusterfs [clusterfs]
     </para>
 <screen>&prompt.root;<command>smbclient</command> <option>//&subnetII;.222/myshare</option></screen>
    </step>
-<!-- 
+<!--
     From Tim:
     Add the IP address to the DNS at your site, so that you can access
     the share via \\hostname\sharename on Windows clients.
-    => 
+    =>
    -->
   </procedure>
  </sect1>