2 files changed, 7 insertions, 7 deletions

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 432cd09094..a1b1f6e825 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -350,7 +350,7 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c,
 		return ncacn_push_auth(blob, mem_ctx, pkt, c->security_state.auth_info);
 	}
 
-	ndr = ndr_push_init_ctx(mem_ctx);
+	ndr = ndr_push_init_ctx(mem_ctx, lp_iconv_convenience(global_loadparm));
 	if (!ndr) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -1194,7 +1194,7 @@ static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_connection *c,
 		return ndr_map_error2ntstatus(ndr_err);
 	}
 
-	push = ndr_push_init_ctx(mem_ctx);
+	push = ndr_push_init_ctx(mem_ctx, lp_iconv_convenience(global_loadparm));
 	if (!push) {
 		return NT_STATUS_NO_MEMORY;
 	}	
@@ -1252,7 +1252,7 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
 	}
 	memcpy(st, struct_ptr, struct_size);
 
-	push = ndr_push_init_ctx(mem_ctx);
+	push = ndr_push_init_ctx(mem_ctx, lp_iconv_convenience(global_loadparm));
 	if (!push) {
 		return NT_STATUS_NO_MEMORY;
 	}	
@@ -1283,7 +1283,7 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_connection *c,
 		return ndr_map_error2ntstatus(ndr_err);
 	}
 
-	push = ndr_push_init_ctx(mem_ctx);
+	push = ndr_push_init_ctx(mem_ctx, lp_iconv_convenience(global_loadparm));
 	if (!push) {
 		return NT_STATUS_NO_MEMORY;
 	}	
@@ -1354,7 +1354,7 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
 	call = &table->calls[opnum];
 
 	/* setup for a ndr_push_* call */
-	push = ndr_push_init_ctx(mem_ctx);
+	push = ndr_push_init_ctx(mem_ctx, lp_iconv_convenience(global_loadparm));
 	if (!push) {
 		return NULL;
 	}
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 2fa34140f6..c53bdca9d1 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -56,7 +56,7 @@ NTSTATUS ncacn_push_auth(DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
 	struct ndr_push *ndr;
 	enum ndr_err_code ndr_err;
 
-	ndr = ndr_push_init_ctx(mem_ctx);
+	ndr = ndr_push_init_ctx(mem_ctx, lp_iconv_convenience(global_loadparm));
 	if (!ndr) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -466,7 +466,7 @@ NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *epm_floor, struct ndr_synta
 
 static DATA_BLOB dcerpc_floor_pack_lhs_data(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *syntax)
 {
-	struct ndr_push *ndr = ndr_push_init_ctx(mem_ctx);
+	struct ndr_push *ndr = ndr_push_init_ctx(mem_ctx, lp_iconv_convenience(global_loadparm));
 
 	ndr->flags |= LIBNDR_FLAG_NOALIGN;