diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 22:46:27 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:02 +0100 |
| commit | d1e716cf4331bf09cfe15a6634bc5887aff81d20 (patch) | |
| tree | d484509808c2e776db310c24d5658ba7dbd40857 /source4/lib | |
| parent | 61873ce94c172c801a4831de5550a8e0fe54c5f5 (diff) | |
| download | samba-d1e716cf4331bf09cfe15a6634bc5887aff81d20.tar.gz samba-d1e716cf4331bf09cfe15a6634bc5887aff81d20.tar.bz2 samba-d1e716cf4331bf09cfe15a6634bc5887aff81d20.zip | |
r26432: Require ndr_pull users to specify iconv_convenience.
(This used to be commit 28b1d36551b75241c1cf9fca5d74f45a6dc884ab)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/messaging/messaging.c | 2 | ||||
| -rw-r--r-- | source4/lib/samba3/share_info.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 9497e5248c..af742f7374 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -798,7 +798,7 @@ static void irpc_handler(struct messaging_context *msg_ctx, void *private, m->from = src; - m->ndr = ndr_pull_init_blob(packet, m); + m->ndr = ndr_pull_init_blob(packet, m, lp_iconv_convenience(global_loadparm)); if (m->ndr == NULL) goto failed; m->ndr->flags |= LIBNDR_FLAG_REF_ALLOC; diff --git a/source4/lib/samba3/share_info.c b/source4/lib/samba3/share_info.c index e0778fafb5..4dd15aa918 100644 --- a/source4/lib/samba3/share_info.c +++ b/source4/lib/samba3/share_info.c @@ -76,7 +76,7 @@ NTSTATUS samba3_read_share_info(const char *fn, TALLOC_CTX *ctx, struct samba3 * blob.data = (uint8_t *)vbuf.dptr; blob.length = vbuf.dsize; - pull = ndr_pull_init_blob(&blob, ctx); + pull = ndr_pull_init_blob(&blob, ctx, lp_iconv_convenience(global_loadparm)); ndr_pull_security_descriptor(pull, NDR_SCALARS|NDR_BUFFERS, &share->secdesc); |