From 6c80362e291d8c5e748b987a583e8e32acc36354 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 3 Jun 2008 20:51:42 +0200 Subject: [PATCH] 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 --- source/param/loadparm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/param/loadparm.c b/source/param/loadparm.c index ef6648aec17..1ce88df400c 100644 --- 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); -- 2.34.1