The branch, master has been updated
via ee9dff71e1a3e6749b946e19e15ef1c077a021cf (commit)
from e95101da589fa33553a4a8ec7986ab1a64f32ebc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ee9dff71e1a3e6749b946e19e15ef1c077a021cf
Author: Jelmer Vernooij <jel...@samba.org>
Date: Tue Jan 6 22:36:01 2009 +0100
When loading the default configuration, allow the configuration file to be
missing.
-----------------------------------------------------------------------
Summary of changes:
source4/param/loadparm.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index ab7d209..2d9af33 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);
}
/**
--
Samba Shared Repository
