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/smbd/service_task.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smbd/service_task.h') 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; -- cgit From d057116cc2e454ba097d0dcb22e16108a05a4a1b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 10:55:20 +1000 Subject: server_id.idl: Bring server_id.idl in common Andrew Bartlett Signed-off-by: Andrew Tridgell --- source4/smbd/service_task.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smbd/service_task.h') diff --git a/source4/smbd/service_task.h b/source4/smbd/service_task.h index 34b41d9f04..ded4590daf 100644 --- a/source4/smbd/service_task.h +++ b/source4/smbd/service_task.h @@ -22,7 +22,7 @@ #ifndef __SERVICE_TASK_H__ #define __SERVICE_TASK_H__ -#include "librpc/gen_ndr/server_id4.h" +#include "librpc/gen_ndr/server_id.h" struct task_server { struct tevent_context *event_ctx; -- cgit