From ee9dff71e1a3e6749b946e19e15ef1c077a021cf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 6 Jan 2009 22:36:01 +0100 Subject: When loading the default configuration, allow the configuration file to be missing. --- source4/param/loadparm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index ab7d209d10..2d9af33325 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2429,10 +2429,19 @@ const char *lp_configfile(struct loadparm_context *lp_ctx) bool lp_load_default(struct loadparm_context *lp_ctx) { + const char *path; if (getenv("SMB_CONF_PATH")) - return lp_load(lp_ctx, getenv("SMB_CONF_PATH")); + path = getenv("SMB_CONF_PATH"); else - return lp_load(lp_ctx, dyn_CONFIGFILE); + path = dyn_CONFIGFILE; + + if (!file_exist(path)) { + /* We allow the default smb.conf file to not exist, + * basically the equivalent of an empty file. */ + return true; + } + + return lp_load(lp_ctx, path); } /** -- cgit