sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

dynconfig: Introduce and expose SAMBA_LIBEXECDIR

Browse Source 
Right now the smbspool_krb5_wrapper lives there, but we'll have more
in the future.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2021-02-02 16:50:48 +01:00 committed by Jeremy Allison
parent 206c99f6e5
commit 4e174b5a0f
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dynconfig/dynconfig.c
View File

@ -87,6 +87,7 @@ DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR) DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR)
DEFINE_DYN_CONFIG_PARAM(LIBDIR) DEFINE_DYN_CONFIG_PARAM(LIBDIR)
DEFINE_DYN_CONFIG_PARAM(MODULESDIR) DEFINE_DYN_CONFIG_PARAM(MODULESDIR)
DEFINE_DYN_CONFIG_PARAM(SAMBA_LIBEXECDIR)
DEFINE_DYN_CONFIG_PARAM(SHLIBEXT) DEFINE_DYN_CONFIG_PARAM(SHLIBEXT)
DEFINE_DYN_CONFIG_PARAM(LOCKDIR) DEFINE_DYN_CONFIG_PARAM(LOCKDIR)
DEFINE_DYN_CONFIG_PARAM(STATEDIR) /** Persistent state files. Default LOCKDIR */ DEFINE_DYN_CONFIG_PARAM(STATEDIR) /** Persistent state files. Default LOCKDIR */

1
dynconfig/dynconfig.h
View File

@ -38,6 +38,7 @@ DEFINE_DYN_CONFIG_PROTO(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
DEFINE_DYN_CONFIG_PROTO(CODEPAGEDIR) DEFINE_DYN_CONFIG_PROTO(CODEPAGEDIR)
DEFINE_DYN_CONFIG_PROTO(LIBDIR) DEFINE_DYN_CONFIG_PROTO(LIBDIR)
DEFINE_DYN_CONFIG_PROTO(MODULESDIR) DEFINE_DYN_CONFIG_PROTO(MODULESDIR)
DEFINE_DYN_CONFIG_PROTO(SAMBA_LIBEXECDIR)
DEFINE_DYN_CONFIG_PROTO(SHLIBEXT) DEFINE_DYN_CONFIG_PROTO(SHLIBEXT)
DEFINE_DYN_CONFIG_PROTO(LOCKDIR) DEFINE_DYN_CONFIG_PROTO(LOCKDIR)
DEFINE_DYN_CONFIG_PROTO(STATEDIR) /** Persistent state files. Default LOCKDIR */ DEFINE_DYN_CONFIG_PROTO(STATEDIR) /** Persistent state files. Default LOCKDIR */

7
dynconfig/wscript
View File

@ -95,6 +95,11 @@ dynconfig = {
'FHS-PATH': '${LIBEXECDIR}', 'FHS-PATH': '${LIBEXECDIR}',
'OVERWRITE': True, 'OVERWRITE': True,
}, },
'SAMBA_LIBEXECDIR' : {
'STD-PATH': '${LIBEXECDIR}/samba',
'FHS-PATH': '${LIBEXECDIR}/samba',
'OVERWRITE': True,
},
'DATADIR' : { 'DATADIR' : {
'STD-PATH': '${DATADIR}', 'STD-PATH': '${DATADIR}',
'FHS-PATH': '${DATADIR}', 'FHS-PATH': '${DATADIR}',
@ -373,6 +378,8 @@ def get_override(bld):
'PYTHONARCHDIR' : 'bin/python', 'PYTHONARCHDIR' : 'bin/python',
'BINDIR' : 'bin', 'BINDIR' : 'bin',
'SBINDIR' : 'bin', 'SBINDIR' : 'bin',
'LIBEXECDIR' : 'bin',
'SAMBA_LIBEXECDIR' : 'bin',
'CODEPAGEDIR' : 'codepages', 'CODEPAGEDIR' : 'codepages',
'SCRIPTSBINDIR' : 'source4/scripting/bin', 'SCRIPTSBINDIR' : 'source4/scripting/bin',
'SETUPDIR' : 'source4/setup' 'SETUPDIR' : 'source4/setup'