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/libcli | |
| 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/libcli')
| -rw-r--r-- | source4/libcli/finddcs_nbt.c | 6 | ||||
| -rw-r--r-- | source4/libcli/wbclient/wbclient.c | 2 | ||||
| -rw-r--r-- | source4/libcli/wbclient/wbclient.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/libcli/finddcs_nbt.c b/source4/libcli/finddcs_nbt.c index 12b94f7bab..9579a9e449 100644 --- a/source4/libcli/finddcs_nbt.c +++ b/source4/libcli/finddcs_nbt.c @@ -33,7 +33,7 @@ struct finddcs_nbt_state { struct tevent_context *ev; struct tevent_req *req; - struct messaging_context *msg_ctx; + struct imessaging_context *msg_ctx; const char *my_netbios_name; const char *domain_name; @@ -70,7 +70,7 @@ struct tevent_req *finddcs_nbt_send(TALLOC_CTX *mem_ctx, struct dom_sid *domain_sid, struct resolve_context *resolve_ctx, struct tevent_context *event_ctx, - struct messaging_context *msg_ctx) + struct imessaging_context *msg_ctx) { struct finddcs_nbt_state *state; struct nbt_name name; @@ -295,7 +295,7 @@ NTSTATUS finddcs_nbt(TALLOC_CTX *mem_ctx, struct dom_sid *domain_sid, struct resolve_context *resolve_ctx, struct tevent_context *event_ctx, - struct messaging_context *msg_ctx, + struct imessaging_context *msg_ctx, int *num_dcs, struct nbt_dc_name **dcs) { struct tevent_req *req = finddcs_nbt_send(mem_ctx, diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c index 5c4312cc66..4f50c10694 100644 --- a/source4/libcli/wbclient/wbclient.c +++ b/source4/libcli/wbclient/wbclient.c @@ -31,7 +31,7 @@ * \param */ struct wbc_context *wbc_init(TALLOC_CTX *mem_ctx, - struct messaging_context *msg_ctx, + struct imessaging_context *msg_ctx, struct tevent_context *event_ctx) { struct wbc_context *ctx; diff --git a/source4/libcli/wbclient/wbclient.h b/source4/libcli/wbclient/wbclient.h index e7473e3e7b..1fa2f59c57 100644 --- a/source4/libcli/wbclient/wbclient.h +++ b/source4/libcli/wbclient/wbclient.h @@ -28,7 +28,7 @@ struct wbc_context { }; struct wbc_context *wbc_init(TALLOC_CTX *mem_ctx, - struct messaging_context *msg_ctx, + struct imessaging_context *msg_ctx, struct tevent_context *event_ctx); struct composite_context *wbc_sids_to_xids_send(struct wbc_context *wbc_ctx, |