summaryrefslogtreecommitdiffstats
path: root/source3/lib/serverid.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-01-21 14:34:48 +0100
committerMichael Adam <obnox@samba.org>2014-03-24 19:08:44 +0100
commit74b359c61686c1a940ec76ad4459fabc403a8715 (patch)
treef5db71b9c25ef2e8e75c569b72441a57cd396df0 /source3/lib/serverid.c
parente93b85dbd871d5d56a7bc13235820c488a41266f (diff)
downloadsamba-74b359c61686c1a940ec76ad4459fabc403a8715.tar.gz
samba-74b359c61686c1a940ec76ad4459fabc403a8715.tar.xz
samba-74b359c61686c1a940ec76ad4459fabc403a8715.zip
s3:build: remove global CLUSTER_SUPPORT define
All ctdb specific code is isolated in samba-cluster-support.so now. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Mon Mar 24 19:08:44 CET 2014 on sn-devel-104
Diffstat (limited to 'source3/lib/serverid.c')
-rw-r--r--source3/lib/serverid.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index b69671e422..5d5981825d 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -343,7 +343,6 @@ bool serverids_exist(const struct server_id *ids, int num_ids, bool *results)
remote_num += 1;
}
-#ifdef CLUSTER_SUPPORT
if (remote_num != 0 &&
ctdb_serverids_exist_supported(messaging_ctdbd_connection()))
{
@@ -388,7 +387,6 @@ bool serverids_exist(const struct server_id *ids, int num_ids, bool *results)
results[idx] = todo_results[t];
}
}
-#endif
if (remote_num != 0) {
todo_num = 0;
@@ -401,13 +399,11 @@ bool serverids_exist(const struct server_id *ids, int num_ids, bool *results)
todo_num += 1;
}
-#ifdef CLUSTER_SUPPORT
if (!ctdb_processes_exist(messaging_ctdbd_connection(),
todo_ids, todo_num,
todo_results)) {
goto fail;
}
-#endif
for (t=0; t<todo_num; t++) {
idx = todo_idx[t];