From: Michael Adam <obnox@samba.org>
Date: Fri, 22 Jul 2011 08:11:52 +0000 (+0200)
Subject: s3:loadparm: fix the reload of the configuration: also reload activated registry... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12b60f9688cb64fbfce729b3555ab75a71fbb949;p=thirdparty%2Fsamba.git

s3:loadparm: fix the reload of the configuration: also reload activated registry shares

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Jul 22 16:53:49 CEST 2011 on sn-devel-104
(cherry picked from commit efbe1602bd014eada4811f336bdccbf4692d3807)

The last 2 patches address bug 8327 (config reload fails to reload shares from
registry).
---

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 32092ff7a3e..28ffc08d498 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -9275,8 +9275,12 @@ bool lp_load_ex(const char *pszFname,
 		bRetval = false;
 	}
 
-	if (bRetval && lp_registry_shares() && allow_registry_shares) {
-		bRetval = process_registry_shares();
+	if (bRetval && lp_registry_shares()) {
+		if (allow_registry_shares) {
+			bRetval = process_registry_shares();
+		} else {
+			bRetval = reload_registry_shares();
+		}
 	}
 
 	lp_add_auto_services(lp_auto_services());