summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-08-11 16:30:36 +0200
committerMichael Adam <obnox@samba.org>2008-08-13 11:54:13 +0200
commitf284cde4b94062edf01608c7f937fa548575fedf (patch)
treeaa5e1562d9876470719c320d179ccda1904faffe /source3/smbd
parent904e4f79010e494434e670d995960b53bbcdcdd2 (diff)
downloadsamba-f284cde4b94062edf01608c7f937fa548575fedf.tar.gz
samba-f284cde4b94062edf01608c7f937fa548575fedf.tar.bz2
samba-f284cde4b94062edf01608c7f937fa548575fedf.zip
smbd: prevent smbd from panicing with "clustering = no" but --with-cluster-support
Michael (This used to be commit a687949d19ba9690f96e7869aa22e4d87840640e)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/server.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 3e816ee62d..0d855f876f 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -575,7 +575,9 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
brl_register_msgs(smbd_messaging_context());
#ifdef CLUSTER_SUPPORT
- ctdbd_register_reconfigure(messaging_ctdbd_connection());
+ if (lp_clustering()) {
+ ctdbd_register_reconfigure(messaging_ctdbd_connection());
+ }
#endif
#ifdef DEVELOPER