From: Volker Lendecke <vl@samba.org>
Date: Tue, 3 Jun 2008 18:51:42 +0000 (+0200)
Subject: Always set "registry shares = yes" for "include = registry"
X-Git-Tag: samba-4.0.0alpha6~801^2~1176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cfacbaacbef88ca8901f1c667336688bb45e4b1;p=thirdparty%2Fsamba.git

Always set "registry shares = yes" for "include = registry"

This fixes the case where "include = registry" is set in the smb.conf text file
and *only* shares (no [global] settings) are present in the registry.

Michael, please check!

Thanks,

Volker
(This used to be commit 6c80362e291d8c5e748b987a583e8e32acc36354)
---

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index ef6648aec17..1ce88df400c 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6558,6 +6558,11 @@ static bool process_registry_globals(void)
 		goto done;
 	}
 
+	ret = do_parameter("registry shares", "yes", NULL);
+	if (!ret) {
+		goto done;
+	}
+
 	if (!smbconf_share_exists(conf_ctx, GLOBAL_NAME)) {
 		/* nothing to read from the registry yet but make sure lp_load
 		 * doesn't return false */
@@ -6575,7 +6580,6 @@ static bool process_registry_globals(void)
 		goto done;
 	}
 
-	ret = do_parameter("registry shares", "yes", NULL);
 	/* store the csn */
 	smbconf_changed(conf_ctx, &conf_last_csn, NULL, NULL);