From b8268cf7b0264ea28f684cbdfbf462e68a018d83 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 10 May 2010 00:42:06 +0200 Subject: s3: Remove use of iconv_convenience. --- source3/winbindd/wb_group_members.c | 2 +- source3/winbindd/winbindd_dual_ndr.c | 4 ++-- source3/winbindd/winbindd_pam.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/winbindd') diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c index 3ab3cb230e..0a42e79659 100644 --- a/source3/winbindd/wb_group_members.c +++ b/source3/winbindd/wb_group_members.c @@ -413,7 +413,7 @@ static void wb_group_members_done(struct tevent_req *subreq) sid = &members[i].sid; key = data_blob_const( - sid, ndr_size_dom_sid(sid, NULL, 0)); + sid, ndr_size_dom_sid(sid, 0)); if (!talloc_dict_set(state->users, key, &m)) { tevent_req_nterror(req, NT_STATUS_NO_MEMORY); diff --git a/source3/winbindd/winbindd_dual_ndr.c b/source3/winbindd/winbindd_dual_ndr.c index 8a23ce48e0..bc85d53a15 100644 --- a/source3/winbindd/winbindd_dual_ndr.c +++ b/source3/winbindd/winbindd_dual_ndr.c @@ -73,7 +73,7 @@ static struct tevent_req *wb_ndr_dispatch_send(TALLOC_CTX *mem_ctx, state->transport = transport; state->opnum = opnum; - push = ndr_push_init_ctx(state, NULL); + push = ndr_push_init_ctx(state); if (tevent_req_nomem(push, req)) { return tevent_req_post(req, ev); } @@ -148,7 +148,7 @@ static NTSTATUS wb_ndr_dispatch_recv(struct tevent_req *req, return status; } - pull = ndr_pull_init_blob(&state->resp_blob, mem_ctx, NULL); + pull = ndr_pull_init_blob(&state->resp_blob, mem_ctx); if (pull == NULL) { return NT_STATUS_NO_MEMORY; } diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index de08a66bc7..e212d7b94a 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -123,7 +123,7 @@ static NTSTATUS append_info3_as_ndr(TALLOC_CTX *mem_ctx, DATA_BLOB blob; enum ndr_err_code ndr_err; - ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, info3, + ndr_err = ndr_push_struct_blob(&blob, mem_ctx, info3, (ndr_push_flags_fn_t)ndr_push_netr_SamInfo3); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { DEBUG(0,("append_info3_as_ndr: failed to append\n")); -- cgit