s3:loadparm: fix the reload of the configuration: also reload activated registry...
authorMichael Adam <obnox@samba.org>
Fri, 22 Jul 2011 08:11:52 +0000 (10:11 +0200)
committerMichael Adam <obnox@samba.org>
Fri, 22 Jul 2011 14:53:49 +0000 (16:53 +0200)
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Jul 22 16:53:49 CEST 2011 on sn-devel-104

source3/param/loadparm.c

index b23c8ddb88170cddeb89b1b41d9fe91cd08dc95c..6cab934aecfe142a3c26e2b15c7e0e3198abeb51 100644 (file)
@@ -9042,8 +9042,12 @@ static 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());