diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 16:18:23 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 16:18:23 +0100 |
| commit | 5f9abf527a2f7d58d0b5546cb237f82928b53e49 (patch) | |
| tree | 105bf2071792c8a9dc752198e19e6595e1566d69 /source4/libcli | |
| parent | 0ab3df9c58c6c3abaab3d4fae170cf7a979236d4 (diff) | |
| download | samba-5f9abf527a2f7d58d0b5546cb237f82928b53e49.tar.gz samba-5f9abf527a2f7d58d0b5546cb237f82928b53e49.tar.bz2 samba-5f9abf527a2f7d58d0b5546cb237f82928b53e49.zip | |
Remove more global_loadparm uses.
(This used to be commit 4d6fd9381f7fe4c823b47ebc43d7b272a92edffd)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/dgram/dgramsocket.c | 5 | ||||
| -rw-r--r-- | source4/libcli/dgram/libdgram.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c index 7d6f5627c5..130d8ae870 100644 --- a/source4/libcli/dgram/dgramsocket.c +++ b/source4/libcli/dgram/dgramsocket.c @@ -158,7 +158,8 @@ static void dgm_socket_handler(struct event_context *ev, struct fd_event *fde, then operations will use that event context */ struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, - struct event_context *event_ctx) + struct event_context *event_ctx, + struct smb_iconv_convenience *iconv_convenience) { struct nbt_dgram_socket *dgmsock; NTSTATUS status; @@ -187,7 +188,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); + dgmsock->iconv_convenience = iconv_convenience; return dgmsock; diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h index 4645840971..707cca8cc5 100644 --- a/source4/libcli/dgram/libdgram.h +++ b/source4/libcli/dgram/libdgram.h @@ -93,7 +93,8 @@ NTSTATUS dgram_set_incoming_handler(struct nbt_dgram_socket *dgmsock, struct socket_address *), void *private); struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, - struct event_context *event_ctx); + struct event_context *event_ctx, + struct smb_iconv_convenience *); const char *dgram_mailslot_name(struct nbt_dgram_packet *packet); struct dgram_mailslot_handler *dgram_mailslot_find(struct nbt_dgram_socket *dgmsock, |