sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

docs-xml: Fix script location in syncmachinepasswordscript.xml

Browse Source 
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 <anoopcs@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>

Autobuild-User(master): Anoop C S <anoopcs@samba.org>
Autobuild-Date(master): Fri Aug 16 09:49:30 UTC 2024 on atb-devel-224

(cherry picked from commit 31c9352099f5efeb88d27c603ec2dbfaf98b300d)
This commit is contained in:
Anoop C S 2024-08-14 19:49:04 +05:30 committed by Jule Anger
parent c7e6ec6bae
commit fcca982002
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs-xml/generate-pathconf-entities.sh
View File

@ -17,5 +17,6 @@ echo "
<!ENTITY pathconfig.NTP_SIGND_SOCKET_DIR '\${prefix}/var/lib/ntp_signd'> <!ENTITY pathconfig.NTP_SIGND_SOCKET_DIR '\${prefix}/var/lib/ntp_signd'>
<!ENTITY pathconfig.MITKDCPATH '\${prefix}/sbin/krb5kdc'> <!ENTITY pathconfig.MITKDCPATH '\${prefix}/sbin/krb5kdc'>
<!ENTITY pathconfig.SAMBA_DATADIR '\${prefix}/var/samba'> <!ENTITY pathconfig.SAMBA_DATADIR '\${prefix}/var/samba'>
<!ENTITY pathconfig.CTDB_DATADIR '\${prefix}/share/ctdb'>
<!ENTITY pathconfig.CONFIGFILE '\${prefix}/etc/smb.conf'> <!ENTITY pathconfig.CONFIGFILE '\${prefix}/etc/smb.conf'>
" "

4
docs-xml/smbdotconf/security/syncmachinepasswordscript.xml
View File

@ -11,7 +11,7 @@
<para> <para>
If keytabs should be generated in clustered environments it is recommended to update them on all nodes. 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 is also needed to activate the <constant>46.update-keytabs.script</constant> in ctdb,
it re-creates the keytab during the ctdb recovered event: it re-creates the keytab during the ctdb recovered event:
<programlisting> <programlisting>
@ -22,5 +22,5 @@
</description> </description>
<value type="default"/> <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> </samba:parameter>

5
dynconfig/wscript
View File

@ -105,6 +105,11 @@ dynconfig = {
'FHS-PATH': '${DATADIR}', 'FHS-PATH': '${DATADIR}',
'OVERWRITE': True, 'OVERWRITE': True,
}, },
'CTDB_DATADIR' : {
'STD-PATH': '${DATADIR}/ctdb',
'FHS-PATH': '${DATADIR}/ctdb',
'OVERWRITE': True,
},
'SAMBA_DATADIR' : { 'SAMBA_DATADIR' : {
'STD-PATH': '${DATADIR}/samba', 'STD-PATH': '${DATADIR}/samba',
'FHS-PATH': '${DATADIR}/samba', 'FHS-PATH': '${DATADIR}/samba',