From 74b359c61686c1a940ec76ad4459fabc403a8715 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 21 Jan 2014 14:34:48 +0100 Subject: s3:build: remove global CLUSTER_SUPPORT define All ctdb specific code is isolated in samba-cluster-support.so now. Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam Autobuild-User(master): Michael Adam Autobuild-Date(master): Mon Mar 24 19:08:44 CET 2014 on sn-devel-104 --- source3/lib/messages.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'source3/lib/messages.c') diff --git a/source3/lib/messages.c b/source3/lib/messages.c index 58f45d3b1cf..96b6b88a808 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -206,7 +206,6 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, return NULL; } -#ifdef CLUSTER_SUPPORT if (lp_clustering()) { status = messaging_ctdbd_init(ctx, ctx, &ctx->remote); @@ -218,7 +217,6 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, } } ctx->id.vnn = get_my_vnn(); -#endif messaging_register(ctx, NULL, MSG_PING, ping_message); @@ -254,7 +252,6 @@ NTSTATUS messaging_reinit(struct messaging_context *msg_ctx) return status; } -#ifdef CLUSTER_SUPPORT TALLOC_FREE(msg_ctx->remote); if (lp_clustering()) { @@ -268,8 +265,6 @@ NTSTATUS messaging_reinit(struct messaging_context *msg_ctx) } } -#endif - return NT_STATUS_OK; } @@ -365,13 +360,11 @@ NTSTATUS messaging_send(struct messaging_context *msg_ctx, return NT_STATUS_INVALID_PARAMETER_MIX; } -#ifdef CLUSTER_SUPPORT if (!procid_is_local(&server)) { return msg_ctx->remote->send_fn(msg_ctx, server, msg_type, data, msg_ctx->remote); } -#endif if (server_id_equal(&msg_ctx->id, &server)) { struct messaging_selfsend_state *state; -- cgit