Changeset 733 for branches/samba-3.5.x/source3/param

Timestamp:

Nov 12, 2012, 5:09:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.13

File:

• branches/samba-3.5.x/source3/param/loadparm.c (modified) (2 diffs)

branches/samba-3.5.x/source3/param/loadparm.c

@@ -7104 +7104 @@
 }
 
+/**
+ * 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
 
@@ -9292 +9321 @@
         }
 
-        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();
+                }
         }