From 1c96c068ad3869ca8411efbc07f82ae987ed2219 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 8 Oct 2013 15:31:17 +0200 Subject: [PATCH] s3:serverid: use ctdb_serverids_exist_supported() runtime check This is better than a compile time check for HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL. Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source3/lib/serverid.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c index 42598879479..b69671e4221 100644 --- a/source3/lib/serverid.c +++ b/source3/lib/serverid.c @@ -126,11 +126,13 @@ bool serverid_register(const struct server_id id, uint32_t msg_flags) nt_errstr(status))); goto done; } -#ifdef HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL - if (lp_clustering()) { + + if (lp_clustering() && + ctdb_serverids_exist_supported(messaging_ctdbd_connection())) + { register_with_ctdbd(messaging_ctdbd_connection(), id.unique_id); } -#endif + ret = true; done: TALLOC_FREE(rec); @@ -341,8 +343,10 @@ bool serverids_exist(const struct server_id *ids, int num_ids, bool *results) remote_num += 1; } -#ifdef HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL - if (remote_num != 0) { +#ifdef CLUSTER_SUPPORT + if (remote_num != 0 && + ctdb_serverids_exist_supported(messaging_ctdbd_connection())) + { int old_remote_num = remote_num; remote_num = 0; -- 2.11.4.GIT