diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-16 15:05:15 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-16 15:05:15 +0100 |
| commit | 673ca5145c9c120cdb522096fd625662407f6f3d (patch) | |
| tree | 969bc18a9f8ce5bddbd5d90ad0be6fcab0c2b9c7 /source4/param/loadparm.c | |
| parent | 0d7ca8e89e37d1aa07a4c8fad6a24ac41ceb4855 (diff) | |
| download | samba-673ca5145c9c120cdb522096fd625662407f6f3d.tar.gz samba-673ca5145c9c120cdb522096fd625662407f6f3d.tar.bz2 samba-673ca5145c9c120cdb522096fd625662407f6f3d.zip | |
Find default smb.conf path correctly, when it was not specified on the
command-line.
Diffstat (limited to 'source4/param/loadparm.c')
| -rw-r--r-- | source4/param/loadparm.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 2d9af33325..c1a012474b 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2427,13 +2427,19 @@ const char *lp_configfile(struct loadparm_context *lp_ctx) return lp_ctx->szConfigFile; } -bool lp_load_default(struct loadparm_context *lp_ctx) +const char *lp_default_path(void) { - const char *path; if (getenv("SMB_CONF_PATH")) - path = getenv("SMB_CONF_PATH"); + return getenv("SMB_CONF_PATH"); else - path = dyn_CONFIGFILE; + return dyn_CONFIGFILE; +} + +bool lp_load_default(struct loadparm_context *lp_ctx) +{ + const char *path; + + path = lp_default_path(); if (!file_exist(path)) { /* We allow the default smb.conf file to not exist, |