The branch, master has been updated
via 31c9352099f docs-xml: Fix script location in
syncmachinepasswordscript.xml
via 3929fdae1a1 source3/script: Fix installation of
winbind_ctdb_updatekeytab.sh
from 4df1bfd0701 s3:smb2_server: return
NT_STATUS_NETWORK_SESSION_EXPIRED for compound requests
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 31c9352099f5efeb88d27c603ec2dbfaf98b300d
Author: Anoop C S <anoo...@samba.org>
Date: Wed Aug 14 19:49:04 2024 +0530
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.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15689
Signed-off-by: Anoop C S <anoo...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
Autobuild-User(master): Anoop C S <anoo...@samba.org>
Autobuild-Date(master): Fri Aug 16 09:49:30 UTC 2024 on atb-devel-224
commit 3929fdae1a13ab029e173ce53598d3fa6cf40e9c
Author: Anoop C S <anoo...@samba.org>
Date: Wed Aug 14 19:47:35 2024 +0530
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.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15689
Signed-off-by: Anoop C S <anoo...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/generate-pathconf-entities.sh | 1 +
docs-xml/smbdotconf/security/syncmachinepasswordscript.xml | 4 ++--
dynconfig/wscript | 5 +++++
source3/script/wscript_build | 4 +++-
4 files changed, 11 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/generate-pathconf-entities.sh
b/docs-xml/generate-pathconf-entities.sh
index 6c0c31a3522..1b689a8a23f 100755
--- a/docs-xml/generate-pathconf-entities.sh
+++ b/docs-xml/generate-pathconf-entities.sh
@@ -17,5 +17,6 @@ echo "
<!ENTITY pathconfig.NTP_SIGND_SOCKET_DIR '\${prefix}/var/lib/ntp_signd'>
<!ENTITY pathconfig.MITKDCPATH '\${prefix}/sbin/krb5kdc'>
<!ENTITY pathconfig.SAMBA_DATADIR '\${prefix}/var/samba'>
+<!ENTITY pathconfig.CTDB_DATADIR '\${prefix}/share/ctdb'>
<!ENTITY pathconfig.CONFIGFILE '\${prefix}/etc/smb.conf'>
"
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',
diff --git a/source3/script/wscript_build b/source3/script/wscript_build
index 2b0643b0876..bc451497298 100644
--- a/source3/script/wscript_build
+++ b/source3/script/wscript_build
@@ -6,7 +6,9 @@ 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='.')
--
Samba Shared Repository
