diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 16:46:32 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 16:46:32 +0100 |
| commit | ef915eff1690bfded651bf6fcef02a977d3d676b (patch) | |
| tree | 1a7d23c3d388e811262800fba0d223effd81dba3 /source4/param/loadparm.c | |
| parent | 8f763308bc191855356cfec758e939270843468d (diff) | |
| download | samba-ef915eff1690bfded651bf6fcef02a977d3d676b.tar.gz samba-ef915eff1690bfded651bf6fcef02a977d3d676b.tar.bz2 samba-ef915eff1690bfded651bf6fcef02a977d3d676b.zip | |
Move check of SMB_CONF_PATH to loadparm code.
Diffstat (limited to 'source4/param/loadparm.c')
| -rw-r--r-- | source4/param/loadparm.c | 5 |
1 files changed, 4 insertions, 1 deletions
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); } /** |