diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-01 22:05:05 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-01 16:12:11 -0600 |
| commit | 86dc05e99f124db47f2743d1fc23117a7f5145ab (patch) | |
| tree | de35ed7a8a34c9efb04cfe7f94d72551ae78e176 /source4/librpc/ndr | |
| parent | cf80a01591d57d346e42a0a0f9d662cc24ddff51 (diff) | |
| download | samba-86dc05e99f124db47f2743d1fc23117a7f5145ab.tar.gz samba-86dc05e99f124db47f2743d1fc23117a7f5145ab.tar.bz2 samba-86dc05e99f124db47f2743d1fc23117a7f5145ab.zip | |
r26638: libndr: Require explicitly specifying iconv_convenience for ndr_struct_push_blob().
(This used to be commit 61ad78ac98937ef7a9aa32075a91a1c95b7606b3)
Diffstat (limited to 'source4/librpc/ndr')
| -rw-r--r-- | source4/librpc/ndr/ndr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 0dafda7086..fc1a5750dd 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -755,11 +755,10 @@ _PUBLIC_ enum ndr_err_code ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC /* push a struct to a blob using NDR */ -_PUBLIC_ enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, const void *p, - ndr_push_flags_fn_t fn) +_PUBLIC_ enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, const void *p, ndr_push_flags_fn_t fn) { struct ndr_push *ndr; - ndr = ndr_push_init_ctx(mem_ctx, lp_iconv_convenience(global_loadparm)); + ndr = ndr_push_init_ctx(mem_ctx, iconv_convenience); NDR_ERR_HAVE_NO_MEMORY(ndr); NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p)); |