From ef915eff1690bfded651bf6fcef02a977d3d676b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 2 Nov 2008 16:46:32 +0100 Subject: Move check of SMB_CONF_PATH to loadparm code. --- source4/param/loadparm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source4/param') diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 6b8db0e7f5..201013609e 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2431,7 +2431,10 @@ const char *lp_configfile(struct loadparm_context *lp_ctx) bool lp_load_default(struct loadparm_context *lp_ctx) { - return lp_load(lp_ctx, dyn_CONFIGFILE); + if (getenv("SMB_CONF_PATH")) + return lp_load(lp_ctx, getenv("SMB_CONF_PATH")); + else + return lp_load(lp_ctx, dyn_CONFIGFILE); } /** -- cgit