diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-29 08:48:57 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-29 08:48:57 +1100 |
| commit | 3eef0664c59c7afef117132c1d2ebccf22ad748e (patch) | |
| tree | 17f4ae2a47cc7d3bac266f5ca2033140e6a4e81e /source4/librpc/rpc/dcerpc_util.c | |
| parent | 3abf47fe87e72b18c94157c3f993b7f2fca8c248 (diff) | |
| parent | 2ba62662f8e2578153be3125eb557b9349ccfd3b (diff) | |
| download | samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.tar.gz samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.tar.bz2 samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 04db9b184491415b3479fd79e1c07ba738818eb9)
Diffstat (limited to 'source4/librpc/rpc/dcerpc_util.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 4e5d049d66..b8128baf43 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -50,13 +50,14 @@ const struct ndr_interface_call *dcerpc_iface_find_call(const struct ndr_interfa push a ncacn_packet into a blob, potentially with auth info */ NTSTATUS ncacn_push_auth(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, + struct smb_iconv_convenience *iconv_convenience, struct ncacn_packet *pkt, struct dcerpc_auth *auth_info) { struct ndr_push *ndr; enum ndr_err_code ndr_err; - ndr = ndr_push_init_ctx(mem_ctx, lp_iconv_convenience(global_loadparm)); + ndr = ndr_push_init_ctx(mem_ctx, iconv_convenience); if (!ndr) { return NT_STATUS_NO_MEMORY; } |