git.samba.org
/
obnox
/
samba-ctdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d78bb0c
)
s3:loadparm: fix the reload of the configuration: also reload activated registry...
author
Michael Adam
<obnox@samba.org>
Fri, 22 Jul 2011 08:11:52 +0000
(10:11 +0200)
committer
Karolin Seeger
<kseeger@samba.org>
Sun, 7 Aug 2011 19:02:30 +0000
(21:02 +0200)
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Jul 22 16:53:49 CEST 2011 on sn-devel-104
(cherry picked from commit
efbe1602bd014eada4811f336bdccbf4692d3807
)
The last 2 patches address bug 8327 (config reload fails to reload shares from
registry).
(cherry picked from commit
254cc7ae23f2b0108bada37b6b59dd90ac198469
)
source3/param/loadparm.c
patch
|
blob
|
history
diff --git
a/source3/param/loadparm.c
b/source3/param/loadparm.c
index ed01c9b29f36a1d78edaf27dcc36c6165257a558..bec525e59a80fffae253a9e054711d34090b3ce3 100644
(file)
--- a/
source3/param/loadparm.c
+++ b/
source3/param/loadparm.c
@@
-9628,8
+9628,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());