91 lines
3.7 KiB
Diff
91 lines
3.7 KiB
Diff
From 7fedd0925965705e435a4bd411fdbd0e73d8b6a6 Mon Sep 17 00:00:00 2001
|
|
From: Anoop C S <anoopcs@samba.org>
|
|
Date: Wed, 14 Aug 2024 19:47:35 +0530
|
|
Subject: [PATCH 1/2] source3/script: Fix installation of
|
|
winbind_ctdb_updatekeytab.sh
|
|
|
|
winbind_ctdb_updatekeytab.sh assumes the presence `onnode` utility to
|
|
execute `net ads` command on all nodes in the cluster. But `onnode`
|
|
is only built when configured with clustering support. Therefore perform
|
|
the script installation only with ctdb configuration. Also fix the
|
|
installation path to /usr/share/ctdb/scripts.
|
|
|
|
Signed-off-by: Anoop C S <anoopcs@samba.org>
|
|
Reviewed-by: Guenther Deschner <gd@samba.org>
|
|
---
|
|
source3/script/wscript_build | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/source3/script/wscript_build b/source3/script/wscript_build
|
|
index 2b0643b0876..a634ece7ec1 100644
|
|
--- a/source3/script/wscript_build
|
|
+++ b/source3/script/wscript_build
|
|
@@ -6,7 +6,8 @@ bld.INSTALL_FILES('${BINDIR}',
|
|
'smbtar',
|
|
chmod=MODE_755, flat=True)
|
|
bld.INSTALL_FILES('${BINDIR}', 'samba-log-parser', chmod=MODE_755, flat=True)
|
|
-bld.INSTALL_FILES('${DATADIR}', 'winbind_ctdb_updatekeytab.sh', chmod=MODE_755, flat=True)
|
|
+if conf.env.with_ctdb:
|
|
+ bld.INSTALL_FILES(bld.env.CTDB_DATADIR+"/scripts", 'winbind_ctdb_updatekeytab.sh', chmod=MODE_755, flat=True)
|
|
|
|
# Callout scripts for use in selftest environment
|
|
bld.SAMBA_SCRIPT('smbaddshare', pattern='smbaddshare', installdir='.')
|
|
--
|
|
2.46.0
|
|
|
|
|
|
From 24d5b7d711566297ce5db92ebc2f56ec100b1dca Mon Sep 17 00:00:00 2001
|
|
From: Anoop C S <anoopcs@samba.org>
|
|
Date: Wed, 14 Aug 2024 19:49:04 +0530
|
|
Subject: [PATCH 2/2] docs-xml: Fix script location in
|
|
syncmachinepasswordscript.xml
|
|
|
|
Update the change in installation path for winbind_ctdb_updatekeytab.sh
|
|
from SAMBA_DATADIR to newly defined CTDB_DATADIR.
|
|
|
|
Signed-off-by: Anoop C S <anoopcs@samba.org>
|
|
Reviewed-by: Guenther Deschner <gd@samba.org>
|
|
---
|
|
docs-xml/smbdotconf/security/syncmachinepasswordscript.xml | 4 ++--
|
|
dynconfig/wscript | 5 +++++
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/docs-xml/smbdotconf/security/syncmachinepasswordscript.xml b/docs-xml/smbdotconf/security/syncmachinepasswordscript.xml
|
|
index 9a7731930d5..df98610cf36 100644
|
|
--- a/docs-xml/smbdotconf/security/syncmachinepasswordscript.xml
|
|
+++ b/docs-xml/smbdotconf/security/syncmachinepasswordscript.xml
|
|
@@ -11,7 +11,7 @@
|
|
|
|
<para>
|
|
If keytabs should be generated in clustered environments it is recommended to update them on all nodes.
|
|
- You can set the config option to &pathconfig.SAMBA_DATADIR;/scripts/winbind_ctdb_updatekeytab.sh in clustering case.
|
|
+ You can set the config option to &pathconfig.CTDB_DATADIR;/scripts/winbind_ctdb_updatekeytab.sh in clustering case.
|
|
It is also needed to activate the <constant>46.update-keytabs.script</constant> in ctdb,
|
|
it re-creates the keytab during the ctdb recovered event:
|
|
<programlisting>
|
|
@@ -22,5 +22,5 @@
|
|
</description>
|
|
|
|
<value type="default"/>
|
|
-<value type="example">&pathconfig.SAMBA_DATADIR;/scripts/winbind_ctdb_updatekeytab.sh</value>
|
|
+<value type="example">&pathconfig.CTDB_DATADIR;/scripts/winbind_ctdb_updatekeytab.sh</value>
|
|
</samba:parameter>
|
|
diff --git a/dynconfig/wscript b/dynconfig/wscript
|
|
index 2041d881546..a784dac4e6c 100644
|
|
--- a/dynconfig/wscript
|
|
+++ b/dynconfig/wscript
|
|
@@ -105,6 +105,11 @@ dynconfig = {
|
|
'FHS-PATH': '${DATADIR}',
|
|
'OVERWRITE': True,
|
|
},
|
|
+ 'CTDB_DATADIR' : {
|
|
+ 'STD-PATH': '${DATADIR}/ctdb',
|
|
+ 'FHS-PATH': '${DATADIR}/ctdb',
|
|
+ 'OVERWRITE': True,
|
|
+ },
|
|
'SAMBA_DATADIR' : {
|
|
'STD-PATH': '${DATADIR}/samba',
|
|
'FHS-PATH': '${DATADIR}/samba',
|
|
--
|
|
2.46.0
|
|
|