diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 14:50:57 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 14:50:57 +0100 |
| commit | 921b17648456027b6b46a582aa1d13024a5e9a90 (patch) | |
| tree | 637fe02b288cf87c33fabd6e6875f5e6d011eae5 /source4/libcli/dgram/dgramsocket.c | |
| parent | 37deca2d41d74faa7abe060a21340263bd6d66f7 (diff) | |
| download | samba-921b17648456027b6b46a582aa1d13024a5e9a90.tar.gz samba-921b17648456027b6b46a582aa1d13024a5e9a90.tar.bz2 samba-921b17648456027b6b46a582aa1d13024a5e9a90.zip | |
Remove more uses of global_loadparm.
(This used to be commit 47d05ecf6fef66c90994f666b8c63e2e7b5a6cd8)
Diffstat (limited to 'source4/libcli/dgram/dgramsocket.c')
| -rw-r--r-- | source4/libcli/dgram/dgramsocket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c index 032d9de67b..7d6f5627c5 100644 --- a/source4/libcli/dgram/dgramsocket.c +++ b/source4/libcli/dgram/dgramsocket.c @@ -72,7 +72,7 @@ static void dgm_socket_recv(struct nbt_dgram_socket *dgmsock) } /* parse the request */ - ndr_err = ndr_pull_struct_blob(&blob, packet, lp_iconv_convenience(global_loadparm), packet, + ndr_err = ndr_pull_struct_blob(&blob, packet, dgmsock->iconv_convenience, packet, (ndr_pull_flags_fn_t)ndr_pull_nbt_dgram_packet); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { status = ndr_map_error2ntstatus(ndr_err); @@ -187,6 +187,7 @@ struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, dgmsock->send_queue = NULL; dgmsock->incoming.handler = NULL; dgmsock->mailslot_handlers = NULL; + dgmsock->iconv_convenience = lp_iconv_convenience(global_loadparm); return dgmsock; @@ -229,7 +230,7 @@ NTSTATUS nbt_dgram_send(struct nbt_dgram_socket *dgmsock, req->dest = dest; if (talloc_reference(req, dest) == NULL) goto failed; - ndr_err = ndr_push_struct_blob(&req->encoded, req, lp_iconv_convenience(global_loadparm), packet, + ndr_err = ndr_push_struct_blob(&req->encoded, req, dgmsock->iconv_convenience, packet, (ndr_push_flags_fn_t)ndr_push_nbt_dgram_packet); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { status = ndr_map_error2ntstatus(ndr_err); |