[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-7-g0fba371

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  0fba3713e1c3379edcd99fb28ddac21616f34777 (commit)
       via  11b151f3552cbcddcfe671dcda4fe0110c4f2b48 (commit)
      from  370d030b227486ba87a98f4f6e8920f52f743a94 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit 0fba3713e1c3379edcd99fb28ddac21616f34777
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 6 00:45:20 2008 +0100

    In libnetapi, point out that lp_load has failed.
    
    Guenther
    (cherry picked from commit be673bfc61559f661040c6fb1ba7d2e4552967f2)

commit 11b151f3552cbcddcfe671dcda4fe0110c4f2b48
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 6 00:51:20 2008 +0100

    Fix lp_load with an empty registry and "config backend = registry". Michael, please check.
    
    Guenther
    (cherry picked from commit d9f4060c660da0ad671e061b123df71d109d51b9)

-----------------------------------------------------------------------

Summary of changes:
 source/lib/netapi/netapi.c |    1 +
 source/param/loadparm.c    |    7 +++++++
 2 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/netapi.c b/source/lib/netapi/netapi.c
index fb091f6..82a8a8d 100644
--- a/source/lib/netapi/netapi.c
+++ b/source/lib/netapi/netapi.c
@@ -63,6 +63,7 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 
 	if (!lp_load(get_dyn_CONFIGFILE(), true, false, false, false)) {
 		TALLOC_FREE(frame);
+		fprintf(stderr, "lp_load failed\n");
 		return W_ERROR_V(WERR_GENERAL_FAILURE);
 	}
 
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 5651a43..25aa48b 100644
--- a/source/param/loadparm.c
+++ b/source/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)) {


-- 
Samba Shared Repository