Attachment 6733 Details for Bug 8327 – Patchset for 3.5

[patch] Patchset for 3.5

fix-registry-share-reload.35.mbox (text/plain), 2.33 KB, created by Michael Adam on 2011-07-29 22:16:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2011-07-29 22:16:21 UTC

Size: 2.33 KB

patch

obsolete

>From be8b7918f69bc1eca53308d03e6e0605359aa954 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Fri, 22 Jul 2011 10:10:43 +0200
>Subject: [PATCH 1/2] s3:loadparm: add reload_registry_shares() - reload only those shares already loaded (cherry picked from commit ec113a58a4dc4e4f3ea03f7818eb312325f69482)
>
>---
> source3/param/loadparm.c |   29 +++++++++++++++++++++++++++++
> 1 files changed, 29 insertions(+), 0 deletions(-)
>
>diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
>index 1ad067b..7c85d33 100644
>--- a/source3/param/loadparm.c
>+++ b/source3/param/loadparm.c
>@@ -7047,6 +7047,35 @@ done:
> 	return ret;
> }
> 
>+/**
>+ * reload those shares from registry that are already
>+ * activated in the services array.
>+ */
>+static bool reload_registry_shares(void)
>+{
>+	int i;
>+	bool ret = true;
>+
>+	for (i = 0; i < iNumServices; i++) {
>+		if (!VALID(i)) {
>+			continue;
>+		}
>+
>+		if (ServicePtrs[i]->usershare == USERSHARE_VALID) {
>+			continue;
>+		}
>+
>+		ret = process_registry_service(ServicePtrs[i]->szService);
>+		if (!ret) {
>+			goto done;
>+		}
>+	}
>+
>+done:
>+	return ret;
>+}
>+
>+
> #define MAX_INCLUDE_DEPTH 100
> 
> static uint8_t include_depth;
>-- 
>1.7.1
>
>
>From 6751a6ecc6bd0440b1b0cfb9bb41df990d953bb5 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Fri, 22 Jul 2011 10:11:52 +0200
>Subject: [PATCH 2/2] 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).
>---
> source3/param/loadparm.c |    8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
>index 7c85d33..9b6d22c 100644
>--- a/source3/param/loadparm.c
>+++ b/source3/param/loadparm.c
>@@ -9264,8 +9264,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());
>-- 
>1.7.1
>

Flags:

vl: review+

Actions: View

Attachments on bug 8327: 6718 | 6719 | 6722 | 6733