summaryrefslogtreecommitdiff
path: root/source4/smbd/service_task.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-03 10:40:33 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-03 07:37:07 +0200
commitcdd802af8319e0b0744d8e727cef75526269ece2 (patch)
treedeb3c73bc35357a7fe272d40ce1568274316f8cf /source4/smbd/service_task.c
parent7261a9b9f76d19e6a2179a48e903e2fee4ee64a1 (diff)
downloadsamba-cdd802af8319e0b0744d8e727cef75526269ece2.tar.gz
samba-cdd802af8319e0b0744d8e727cef75526269ece2.tar.bz2
samba-cdd802af8319e0b0744d8e727cef75526269ece2.zip
s4-messaging Rename messaging -> imessaging
This avoid symbol and structure conflicts between Samba3 and Samba4, and chooses a less generic name. Andrew Bartlett
Diffstat (limited to 'source4/smbd/service_task.c')
-rw-r--r--source4/smbd/service_task.c6
1 files changed, 3 insertions, 3 deletions
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;
}