summaryrefslogtreecommitdiff
path: root/source3/param/loadparm.c
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-03-06 00:51:20 +0100
committerMichael Adam <obnox@samba.org>2008-03-06 09:52:06 +0100
commitddd8bdedcb96a3d9d580337e65491b1e957dbb46 (patch)
treeba185db6f51302c30b8f71428466a39289f8cf9a /source3/param/loadparm.c
parentfee1ab104947ced6929d75c907a111790903fb17 (diff)
downloadsamba-ddd8bdedcb96a3d9d580337e65491b1e957dbb46.tar.gz
samba-ddd8bdedcb96a3d9d580337e65491b1e957dbb46.tar.bz2
samba-ddd8bdedcb96a3d9d580337e65491b1e957dbb46.zip
Fix lp_load with an empty registry and "config backend = registry". Michael, please check.
Guenther (This used to be commit d9f4060c660da0ad671e061b123df71d109d51b9)
Diffstat (limited to 'source3/param/loadparm.c')
-rw-r--r--source3/param/loadparm.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5651a435de..25aa48b61b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3404,6 +3404,13 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *))
}
}
+ if (!libnet_conf_share_exists(conf_ctx, GLOBAL_NAME)) {
+ /* nothing to read from the registry yet but make sure lp_load
+ * doesn't return false */
+ ret = true;
+ goto done;
+ }
+
werr = libnet_conf_get_share(mem_ctx, conf_ctx, GLOBAL_NAME,
&num_params, &param_names, &param_values);
if (!W_ERROR_IS_OK(werr)) {