summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-23 22:44:53 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-24 00:19:15 +0100
commit93d311c07e0b38193f823515b068e87dec144312 (patch)
treec6fa5b78769e6f6df4ca515e115d54455ced8f7c /source4
parent5d014cad087baf4d40af58cec2b6b875356e8548 (diff)
downloadsamba-93d311c07e0b38193f823515b068e87dec144312.tar.gz
samba-93d311c07e0b38193f823515b068e87dec144312.tar.bz2
samba-93d311c07e0b38193f823515b068e87dec144312.zip
s4-dynconfig: override more paths when running from the build directory
this ensures consistency between binaries and scripts when testing as a developer
Diffstat (limited to 'source4')
-rw-r--r--source4/dynconfig/dynconfig.c1
-rw-r--r--source4/dynconfig/dynconfig.h1
-rw-r--r--source4/dynconfig/wscript17
-rw-r--r--source4/param/loadparm.c6
4 files changed, 16 insertions, 9 deletions
diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c
index 358874ea38..ac791411bf 100644
--- a/source4/dynconfig/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
@@ -66,6 +66,7 @@ const char *dyn_##name = name; \
/* these are in common with s3 */
DEFINE_DYN_CONFIG_PARAM(SBINDIR)
+DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR)
DEFINE_DYN_CONFIG_PARAM(BINDIR)
DEFINE_DYN_CONFIG_PARAM(SWATDIR)
DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/
diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h
index 48f8ab628f..48b4f54b21 100644
--- a/source4/dynconfig/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
@@ -26,6 +26,7 @@
extern const char *dyn_BINDIR;
extern const char *dyn_SBINDIR;
+extern const char *dyn_SCRIPTSBINDIR;
extern const char *dyn_CONFIGFILE;
extern const char *dyn_NCALRPCDIR;
extern const char *dyn_LOGFILEBASE;
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index d975698ddf..375d4a14ea 100644
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -17,6 +17,7 @@ dir_options = {
dyn_cflags = {
'BINDIR' : '${BINDIR}',
'SBINDIR' : '${SBINDIR}',
+ 'SCRIPTSBINDIR' : '${SBINDIR}',
'CONFIGDIR' : '${SYSCONFDIR}',
'CONFIGFILE' : '${SYSCONFDIR}/smb.conf',
'LMHOSTSFILE' : '${SYSCONFDIR}/lmhosts',
@@ -47,6 +48,7 @@ dyn_cflags = {
dyn_cflags_fhs = {
'BINDIR' : '${BINDIR}',
'SBINDIR' : '${SBINDIR}',
+ 'SCRIPTSBINDIR' : '${SBINDIR}',
'CONFIGDIR' : '${SYSCONFDIR}/samba',
'CONFIGFILE' : '${SYSCONFDIR}/samba/smb.conf',
'LMHOSTSFILE' : '${SYSCONFDIR}/samba/lmhosts',
@@ -119,15 +121,18 @@ def configure(conf):
def dynconfig_cflags(bld, list=None):
'''work out the extra CFLAGS for dynconfig.c'''
cflags = []
+ # override some paths when running from the build directory
+ override = { 'MODULESDIR' : 'bin/modules',
+ 'SCRIPTSBINDIR' : 'scripting/bin',
+ 'SETUPDIR' : 'setup' }
for f in dyn_cflags.keys():
if list and not f in list:
continue
- if not Options.is_install and f == 'MODULESDIR':
- # we want binaries run from the source dir to use the current
- # modules, not the installed ones
- cflags.append('-DMODULESDIR="%s"' % os.path.join(os.getcwd(), 'bin/modules'))
- else:
- cflags.append('-D%s="%s"' % (f, bld.env[f]))
+ value = bld.env[f]
+ if not Options.is_install:
+ if f in override:
+ value = os.path.join(os.getcwd(), override[f])
+ cflags.append('-D%s="%s"' % (f, value))
return cflags
Build.BuildContext.dynconfig_cflags = dynconfig_cflags
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index f60e4ebd1a..f6f894d5bc 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2456,14 +2456,14 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "tls certfile", "tls/cert.pem");
lpcfg_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem");
lpcfg_do_global_parameter_var(lp_ctx, "setup directory", "%s",
- dyn_SETUPDIR);
+ dyn_SETUPDIR);
lpcfg_do_global_parameter(lp_ctx, "prefork children:smb", "4");
lpcfg_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);
lpcfg_do_global_parameter(lp_ctx, "rndc command", "/usr/sbin/rndc");
- lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SBINDIR);
- lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SBINDIR);
+ lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SCRIPTSBINDIR);
+ lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SCRIPTSBINDIR);
lpcfg_do_global_parameter(lp_ctx, "nsupdate command", "/usr/bin/nsupdate -g");
for (i = 0; parm_table[i].label; i++) {