summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-07-22 10:11:52 +0200
committerMichael Adam <obnox@samba.org>2011-07-22 16:53:49 +0200
commitefbe1602bd014eada4811f336bdccbf4692d3807 (patch)
tree39d718dc34930f937f1a616421f2598d6cd92f4d
parentec113a58a4dc4e4f3ea03f7818eb312325f69482 (diff)
downloadsamba-efbe1602bd014eada4811f336bdccbf4692d3807.tar.gz
samba-efbe1602bd014eada4811f336bdccbf4692d3807.tar.bz2
samba-efbe1602bd014eada4811f336bdccbf4692d3807.zip
s3:loadparm: fix the reload of the configuration: also reload activated registry shares
Autobuild-User: Michael Adam <obnox@samba.org> Autobuild-Date: Fri Jul 22 16:53:49 CEST 2011 on sn-devel-104
-rw-r--r--source3/param/loadparm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index b23c8ddb88..6cab934aec 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -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());