Finish removal of iconv_convenience in public API's.

[rusty/samba.git] / source4 / ntvfs / ipc / ipc_rap.c

diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c
index a40fb54e9a32ac94fe44e8645713655c23a4d708..259dcccb7132d00cc00ce6bb734720f84012354d 100644 (file)
--- a/source4/ntvfs/ipc/ipc_rap.c
+++ b/source4/ntvfs/ipc/ipc_rap.c
@@ -124,10 +124,10 @@ static struct rap_call *new_rap_srv_call(TALLOC_CTX *mem_ctx,
 
        call->mem_ctx = mem_ctx;
 
-       call->ndr_pull_param = ndr_pull_init_blob(&trans->in.params, mem_ctx, lp_iconv_convenience(lp_ctx));
+       call->ndr_pull_param = ndr_pull_init_blob(&trans->in.params, mem_ctx);
        call->ndr_pull_param->flags = RAPNDR_FLAGS;
 
-       call->ndr_pull_data = ndr_pull_init_blob(&trans->in.data, mem_ctx, lp_iconv_convenience(lp_ctx));
+       call->ndr_pull_data = ndr_pull_init_blob(&trans->in.data, mem_ctx);
        call->ndr_pull_data->flags = RAPNDR_FLAGS;
 
        call->heap = talloc(mem_ctx, struct rap_string_heap);
@@ -454,8 +454,8 @@ NTSTATUS ipc_rap_call(TALLOC_CTX *mem_ctx, struct tevent_context *event_ctx, str
        NDR_RETURN(ndr_pull_string(call->ndr_pull_param, NDR_SCALARS,
                                  &call->datadesc));
 
-       call->ndr_push_param = ndr_push_init_ctx(call, lp_iconv_convenience(lp_ctx));
-       call->ndr_push_data = ndr_push_init_ctx(call, lp_iconv_convenience(lp_ctx));
+       call->ndr_push_param = ndr_push_init_ctx(call);
+       call->ndr_push_data = ndr_push_init_ctx(call);
 
        if ((call->ndr_push_param == NULL) || (call->ndr_push_data == NULL))
                return NT_STATUS_NO_MEMORY;
@@ -480,8 +480,8 @@ NTSTATUS ipc_rap_call(TALLOC_CTX *mem_ctx, struct tevent_context *event_ctx, str
        result_param = ndr_push_blob(call->ndr_push_param);
        result_data = ndr_push_blob(call->ndr_push_data);
 
-       final_param = ndr_push_init_ctx(call, lp_iconv_convenience(lp_ctx));
-       final_data = ndr_push_init_ctx(call, lp_iconv_convenience(lp_ctx));
+       final_param = ndr_push_init_ctx(call);
+       final_data = ndr_push_init_ctx(call);
 
        if ((final_param == NULL) || (final_data == NULL))
                return NT_STATUS_NO_MEMORY;