diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 22:46:23 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:00 +0100 |
| commit | 61873ce94c172c801a4831de5550a8e0fe54c5f5 (patch) | |
| tree | 1adef0ad4078d98bd8529be8219af84938886f65 /source4/lib/messaging/messaging.c | |
| parent | a2cea02584256e2cf59da5420e8e080e70c66939 (diff) | |
| download | samba-61873ce94c172c801a4831de5550a8e0fe54c5f5.tar.gz samba-61873ce94c172c801a4831de5550a8e0fe54c5f5.tar.bz2 samba-61873ce94c172c801a4831de5550a8e0fe54c5f5.zip | |
r26431: Require ndr_push creators to specify a iconv_convenience context.
(This used to be commit 7352206f4450fdf881b95bda064cedd9d2477e4c)
Diffstat (limited to 'source4/lib/messaging/messaging.c')
| -rw-r--r-- | source4/lib/messaging/messaging.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index df0bfa32a6..9497e5248c 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -698,7 +698,7 @@ NTSTATUS irpc_send_reply(struct irpc_message *m, NTSTATUS status) m->header.status = status; /* setup the reply */ - push = ndr_push_init_ctx(m->ndr); + push = ndr_push_init_ctx(m->ndr, lp_iconv_convenience(global_loadparm)); if (push == NULL) { status = NT_STATUS_NO_MEMORY; goto failed; @@ -890,7 +890,7 @@ struct irpc_request *irpc_call_send(struct messaging_context *msg_ctx, header.status = NT_STATUS_OK; /* construct the irpc packet */ - ndr = ndr_push_init_ctx(irpc); + ndr = ndr_push_init_ctx(irpc, lp_iconv_convenience(global_loadparm)); if (ndr == NULL) goto failed; ndr_err = ndr_push_irpc_header(ndr, NDR_SCALARS|NDR_BUFFERS, &header); |