diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/libcli/wbclient/wbclient.c | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/libcli/wbclient/wbclient.c')
| -rw-r--r-- | source4/libcli/wbclient/wbclient.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c index b881e32f7b..da7d678da9 100644 --- a/source4/libcli/wbclient/wbclient.c +++ b/source4/libcli/wbclient/wbclient.c @@ -117,7 +117,7 @@ struct composite_context *wbc_sids_to_xids_send(struct wbc_context *wbc_ctx, static void sids_to_xids_recv_ids(struct irpc_request *req) { struct wbc_idmap_state *state = talloc_get_type_abort( - req->async.private, + req->async.private_data, struct wbc_idmap_state); state->ctx->status = irpc_call_recv(state->irpc_req); @@ -183,7 +183,7 @@ struct composite_context *wbc_xids_to_sids_send(struct wbc_context *wbc_ctx, static void xids_to_sids_recv_ids(struct irpc_request *req) { struct wbc_idmap_state *state = talloc_get_type_abort( - req->async.private, + req->async.private_data, struct wbc_idmap_state); state->ctx->status = irpc_call_recv(state->irpc_req); |