From cdd802af8319e0b0744d8e727cef75526269ece2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 3 May 2011 10:40:33 +1000 Subject: s4-messaging Rename messaging -> imessaging This avoid symbol and structure conflicts between Samba3 and Samba4, and chooses a less generic name. Andrew Bartlett --- source4/cluster/cluster.c | 2 +- source4/cluster/cluster.h | 6 +++--- source4/cluster/cluster_private.h | 2 +- source4/cluster/local.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/cluster') diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c index 315145afac..441ea96562 100644 --- a/source4/cluster/cluster.c +++ b/source4/cluster/cluster.c @@ -80,7 +80,7 @@ struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_conte /* register a callback function for a messaging endpoint */ -NTSTATUS cluster_message_init(struct messaging_context *msg, struct server_id server, +NTSTATUS cluster_message_init(struct imessaging_context *msg, struct server_id server, cluster_message_fn_t handler) { cluster_init(); diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h index ad2f926596..5ed9055d7b 100644 --- a/source4/cluster/cluster.h +++ b/source4/cluster/cluster.h @@ -36,8 +36,8 @@ */ #define cluster_node_equal(id1, id2) ((id1)->vnn == (id2)->vnn) -struct messaging_context; -typedef void (*cluster_message_fn_t)(struct messaging_context *, DATA_BLOB); +struct imessaging_context; +typedef void (*cluster_message_fn_t)(struct imessaging_context *, DATA_BLOB); /* prototypes */ struct server_id cluster_id(uint64_t id, uint32_t id2); @@ -45,7 +45,7 @@ char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id); struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbname, int flags); void *cluster_backend_handle(void); -NTSTATUS cluster_message_init(struct messaging_context *msg, struct server_id server, +NTSTATUS cluster_message_init(struct imessaging_context *msg, struct server_id server, cluster_message_fn_t handler); NTSTATUS cluster_message_send(struct server_id server, DATA_BLOB *data); diff --git a/source4/cluster/cluster_private.h b/source4/cluster/cluster_private.h index 3207e6dafe..5f038dd92f 100644 --- a/source4/cluster/cluster_private.h +++ b/source4/cluster/cluster_private.h @@ -32,7 +32,7 @@ struct cluster_ops { const char *, int); void *(*backend_handle)(struct cluster_ops *); NTSTATUS (*message_init)(struct cluster_ops *ops, - struct messaging_context *msg, struct server_id server, + struct imessaging_context *msg, struct server_id server, cluster_message_fn_t handler); NTSTATUS (*message_send)(struct cluster_ops *ops, struct server_id server, DATA_BLOB *data); diff --git a/source4/cluster/local.c b/source4/cluster/local.c index dc9f4f79fb..b6ec7644d3 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -80,7 +80,7 @@ static void *local_backend_handle(struct cluster_ops *ops) dummy message init function - not needed as all messages are local */ static NTSTATUS local_message_init(struct cluster_ops *ops, - struct messaging_context *msg, + struct imessaging_context *msg, struct server_id server, cluster_message_fn_t handler) { -- cgit