From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 6 Jan 2009 21:36:01 +0000 (+0100)
Subject: When loading the default configuration, allow the configuration file to be
X-Git-Tag: samba-4.0.0alpha6~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee9dff71e1a3e6749b946e19e15ef1c077a021cf;p=thirdparty%2Fsamba.git

When loading the default configuration, allow the configuration file to be
missing.
---

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index ab7d209d102..2d9af333259 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);
 }
 
 /**