diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-03 20:51:42 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-06-03 21:36:56 +0200 |
| commit | 2cfacbaacbef88ca8901f1c667336688bb45e4b1 (patch) | |
| tree | 6e0cf89d500f9689ddf9e8198300f4e3bc416f19 /source3/param | |
| parent | dcdeab4d4e968ed3bdcea264f9c59ecfa3d64707 (diff) | |
| download | samba-2cfacbaacbef88ca8901f1c667336688bb45e4b1.tar.gz samba-2cfacbaacbef88ca8901f1c667336688bb45e4b1.tar.bz2 samba-2cfacbaacbef88ca8901f1c667336688bb45e4b1.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
(This used to be commit 6c80362e291d8c5e748b987a583e8e32acc36354)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index ef6648aec1..1ce88df400 100644 --- a/source3/param/loadparm.c +++ b/source3/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); |