diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-01-21 14:34:48 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-03-24 19:08:44 +0100 |
| commit | 74b359c61686c1a940ec76ad4459fabc403a8715 (patch) | |
| tree | f5db71b9c25ef2e8e75c569b72441a57cd396df0 /source3/lib/messages.c | |
| parent | e93b85dbd871d5d56a7bc13235820c488a41266f (diff) | |
| download | samba-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/messages.c')
| -rw-r--r-- | source3/lib/messages.c | 7 |
1 files changed, 0 insertions, 7 deletions
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; |