summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-28 10:50:55 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-28 10:59:17 +0100
commitc2a2006f8a8fdb8941158fc121ce551604cd1bae (patch)
treebca913e2928b9a6657559245cd0d96a2f7025e96
parentac6cf387fff69581940988a65a660c744fa08e99 (diff)
downloadsamba-c2a2006f8a8fdb8941158fc121ce551604cd1bae.tar.gz
samba-c2a2006f8a8fdb8941158fc121ce551604cd1bae.tar.bz2
samba-c2a2006f8a8fdb8941158fc121ce551604cd1bae.zip
s3:torture: support SMB_CONF_PATH envvar in smbtorture
metze
-rw-r--r--source3/torture/torture.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 8a1a61e79a..85233bc0ae 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -5831,6 +5831,11 @@ static void usage(void)
load_case_tables();
+ if (is_default_dyn_CONFIGFILE()) {
+ if(getenv("SMB_CONF_PATH")) {
+ set_dyn_CONFIGFILE(getenv("SMB_CONF_PATH"));
+ }
+ }
lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
load_interfaces();