diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 16:07:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 16:07:28 +0100 |
| commit | ff36c52d8c7f146eca9c6c678456708a8e2efbab (patch) | |
| tree | 8ae184942009eaef07148baf6ef7f33064555b40 /librpc | |
| parent | 7a0e5de08d487108c604b4bab8a2c8e689808d9f (diff) | |
| download | samba-ff36c52d8c7f146eca9c6c678456708a8e2efbab.tar.gz samba-ff36c52d8c7f146eca9c6c678456708a8e2efbab.tar.bz2 samba-ff36c52d8c7f146eca9c6c678456708a8e2efbab.zip | |
Remove another use of global_loadparm.
Eventually, we should move some of these parameters into a separate
struct (perhaps into smb_transport_options?), to avoid the long lists of
parameters.
Diffstat (limited to 'librpc')
| -rw-r--r-- | librpc/ndr/ndr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c index 2f1daeaeb5..12f95a9ceb 100644 --- a/librpc/ndr/ndr.c +++ b/librpc/ndr/ndr.c @@ -933,7 +933,7 @@ _PUBLIC_ size_t ndr_size_struct(const void *p, int flags, ndr_push_flags_fn_t pu /* avoid recursion */ if (flags & LIBNDR_FLAG_NO_NDR_SIZE) return 0; - ndr = ndr_push_init_ctx(NULL, lp_iconv_convenience(global_loadparm)); + ndr = ndr_push_init_ctx(NULL, global_iconv_convenience); if (!ndr) return 0; ndr->flags |= flags | LIBNDR_FLAG_NO_NDR_SIZE; status = push(ndr, NDR_SCALARS|NDR_BUFFERS, discard_const(p)); @@ -958,7 +958,7 @@ _PUBLIC_ size_t ndr_size_union(const void *p, int flags, uint32_t level, ndr_pus /* avoid recursion */ if (flags & LIBNDR_FLAG_NO_NDR_SIZE) return 0; - ndr = ndr_push_init_ctx(NULL, lp_iconv_convenience(global_loadparm)); + ndr = ndr_push_init_ctx(NULL, global_iconv_convenience); if (!ndr) return 0; ndr->flags |= flags | LIBNDR_FLAG_NO_NDR_SIZE; |