diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 12:19:33 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:53 +0100 |
| commit | a5b8999f23d56b4a19b87fc17b22c96f88e487e8 (patch) | |
| tree | 2cfc01d253b8d41ed95c7ac90dd6691e27d88681 /source4/librpc/ndr/ndr.c | |
| parent | aa32619c5c910b9f5989f44de21621db5ef7c357 (diff) | |
| download | samba-a5b8999f23d56b4a19b87fc17b22c96f88e487e8.tar.gz samba-a5b8999f23d56b4a19b87fc17b22c96f88e487e8.tar.bz2 samba-a5b8999f23d56b4a19b87fc17b22c96f88e487e8.zip | |
r26427: Avoid global_smb_iconv_convenience.
(This used to be commit bf072c6fb37b3e6a71c0c747b9fbeaa01480229e)
Diffstat (limited to 'source4/librpc/ndr/ndr.c')
| -rw-r--r-- | source4/librpc/ndr/ndr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 40afeacebf..a1535d3043 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -66,6 +66,7 @@ _PUBLIC_ struct ndr_pull *ndr_pull_init_blob(const DATA_BLOB *blob, TALLOC_CTX * ndr->data = blob->data; ndr->data_size = blob->length; + ndr->iconv_convenience = talloc_reference(ndr, global_smb_iconv_convenience); return ndr; } @@ -114,6 +115,7 @@ _PUBLIC_ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx) if (!ndr->data) { return NULL; } + ndr->iconv_convenience = talloc_reference(ndr, global_smb_iconv_convenience); return ndr; } @@ -438,6 +440,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_subcontext_start(struct ndr_pull *ndr, subndr->data = ndr->data + ndr->offset; subndr->offset = 0; subndr->data_size = r_content_size; + subndr->iconv_convenience = talloc_reference(subndr, ndr->iconv_convenience); *_subndr = subndr; return NDR_ERR_SUCCESS; |