summaryrefslogtreecommitdiff
path: root/source4/scripting/ejs
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-05-01 03:25:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:54 -0500
commitf7e093572797e09d7bd78db2d452914092b68c5a (patch)
tree887beb734b1dd12df43c63111d002fecfc905bf8 /source4/scripting/ejs
parenta5df01c992372ff286ab0b50c5ad8926add13a06 (diff)
downloadsamba-f7e093572797e09d7bd78db2d452914092b68c5a.tar.gz
samba-f7e093572797e09d7bd78db2d452914092b68c5a.tar.bz2
samba-f7e093572797e09d7bd78db2d452914092b68c5a.zip
r22622: make it possible to pass the config file via 'SMB_CONF_PATH' envvar
very usefull for make testenv! this makes it also possible to pass a config file to smbscript metze (This used to be commit f65fcd764b656ba9953d88dc7b002e4977af5011)
Diffstat (limited to 'source4/scripting/ejs')
-rw-r--r--source4/scripting/ejs/smbscript.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 23e2fe2d52..26f4c0f070 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -52,6 +52,10 @@ int main(int argc, const char **argv)
fault_setup(argv[0]);
+ if (getenv("SMB_CONF_PATH")) {
+ lp_set_cmdline("config file", getenv("SMB_CONF_PATH"));
+ }
+
ldb_global_init();
gensec_init();