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
(cherry picked from commit 6c80362e291d8c5e748b987a583e8e32acc36354)

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index f832f067d5303d2c0349671fe870f887a42de2d5..668a501e0543894a5bb02565a7556d75c8b9fd42 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/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);