diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-03 20:51:42 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-07-16 09:05:57 +0200 |
| commit | 98c41f184358bcb47a2a6989c4e9f7d709708aa5 (patch) | |
| tree | 4ba3971f8a44c7cdc263420240a0659450b5fe3a | |
| parent | 4ebbcd685bd6228a35f60d00aeff98dd61d42385 (diff) | |
| download | samba-98c41f184358bcb47a2a6989c4e9f7d709708aa5.tar.gz samba-98c41f184358bcb47a2a6989c4e9f7d709708aa5.tar.xz samba-98c41f184358bcb47a2a6989c4e9f7d709708aa5.zip | |
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)
(cherry picked from commit dacd0f90f3706db6ffab0cd7662d22eb40811e05)
| -rw-r--r-- | source/param/loadparm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c index f832f067d53..668a501e054 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); |