diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 10:40:33 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 07:37:07 +0200 |
commit | cdd802af8319e0b0744d8e727cef75526269ece2 (patch) | |
tree | deb3c73bc35357a7fe272d40ce1568274316f8cf /source4/smbd/server.c | |
parent | 7261a9b9f76d19e6a2179a48e903e2fee4ee64a1 (diff) | |
download | samba-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/server.c')
-rw-r--r-- | source4/smbd/server.c | 6 |
1 files changed, 3 insertions, 3 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); |