s4-messaging Rename messaging -> imessaging

This avoid symbol and structure conflicts between Samba3 and Samba4,
and chooses a less generic name.

Andrew Bartlett

5 files changed, 12 insertions, 12 deletions

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 0f2f1bb1bb..81dd78701e 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -221,11 +221,11 @@ static NTSTATUS samba_terminate(struct irpc_message *msg,
 static NTSTATUS setup_parent_messaging(struct tevent_context *event_ctx, 
 				       struct loadparm_context *lp_ctx)
 {
-	struct messaging_context *msg;
+	struct imessaging_context *msg;
 	NTSTATUS status;
 
-	msg = messaging_init(talloc_autofree_context(), 
-			     lpcfg_messaging_path(event_ctx, lp_ctx),
+	msg = imessaging_init(talloc_autofree_context(),
+			     lpcfg_imessaging_path(event_ctx, lp_ctx),
 			     cluster_id(0, SAMBA_PARENT_TASKID), event_ctx);
 	NT_STATUS_HAVE_NO_MEMORY(msg);
 
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 916393253b..a0e440f63c 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -122,7 +122,7 @@ NTSTATUS stream_new_connection_merge(struct tevent_context *ev,
 				     struct loadparm_context *lp_ctx,
 				     const struct model_ops *model_ops,
 				     const struct stream_server_ops *stream_ops,
-				     struct messaging_context *msg_ctx,
+				     struct imessaging_context *msg_ctx,
 				     void *private_data,
 				     struct stream_connection **_srv_conn)
 {
@@ -186,11 +186,11 @@ static void stream_new_connection(struct tevent_context *ev,
 	}
 
 	/* setup to receive internal messages on this connection */
-	srv_conn->msg_ctx = messaging_init(srv_conn, 
-					   lpcfg_messaging_path(srv_conn, lp_ctx),
+	srv_conn->msg_ctx = imessaging_init(srv_conn,
+					   lpcfg_imessaging_path(srv_conn, lp_ctx),
 					   srv_conn->server_id, ev);
 	if (!srv_conn->msg_ctx) {
-		stream_terminate_connection(srv_conn, "messaging_init() failed");
+		stream_terminate_connection(srv_conn, "imessaging_init() failed");
 		return;
 	}
 
diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h
index 02ade716d2..6590bc0ea0 100644
--- a/source4/smbd/service_stream.h
+++ b/source4/smbd/service_stream.h
@@ -47,7 +47,7 @@ struct stream_connection {
 	} event;
 
 	struct socket_context *socket;
-	struct messaging_context *msg_ctx;
+	struct imessaging_context *msg_ctx;
 	struct loadparm_context *lp_ctx;
 
 	struct tstream_context *tstream;
diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c
index 1eb8403e3b..32c44cf660 100644
--- a/source4/smbd/service_task.c
+++ b/source4/smbd/service_task.c
@@ -78,12 +78,12 @@ static void task_server_callback(struct tevent_context *event_ctx,
 	task->server_id = server_id;
 	task->lp_ctx = lp_ctx;
 
-	task->msg_ctx = messaging_init(task, 
-				       lpcfg_messaging_path(task, task->lp_ctx),
+	task->msg_ctx = imessaging_init(task,
+				       lpcfg_imessaging_path(task, task->lp_ctx),
 				       task->server_id, 
 				       task->event_ctx);
 	if (!task->msg_ctx) {
-		task_server_terminate(task, "messaging_init() failed", true);
+		task_server_terminate(task, "imessaging_init() failed", true);
 		return;
 	}
 
diff --git a/source4/smbd/service_task.h b/source4/smbd/service_task.h
index b8954073e5..34b41d9f04 100644
--- a/source4/smbd/service_task.h
+++ b/source4/smbd/service_task.h
@@ -27,7 +27,7 @@
 struct task_server {
 	struct tevent_context *event_ctx;
 	const struct model_ops *model_ops;
-	struct messaging_context *msg_ctx;
+	struct imessaging_context *msg_ctx;
 	struct loadparm_context *lp_ctx;
 	struct server_id server_id;
 	void *private_data;