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/service_stream.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/service_stream.c')
| -rw-r--r-- | source4/smbd/service_stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; } |