diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-23 22:44:53 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-24 00:19:15 +0100 |
| commit | 93d311c07e0b38193f823515b068e87dec144312 (patch) | |
| tree | c6fa5b78769e6f6df4ca515e115d54455ced8f7c /source4/param | |
| parent | 5d014cad087baf4d40af58cec2b6b875356e8548 (diff) | |
| download | samba-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/param')
| -rw-r--r-- | source4/param/loadparm.c | 6 |
1 files changed, 3 insertions, 3 deletions
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++) { |