X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=blobdiff_plain;f=source4%2Fparam%2Floadparm.c;h=2d9af333259d1b61218e232064e476af073d69ea;hp=ab7d209d102593b87ca07f384a2ee0aab960a67e;hb=ee9dff71e1a3e6749b946e19e15ef1c077a021cf;hpb=e95101da589fa33553a4a8ec7986ab1a64f32ebc

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);
 }
 
 /**