diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 17:54:24 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 17:54:24 +0100 |
| commit | 10169a203019445e6d325a5c1559de3c73782237 (patch) | |
| tree | 978dbf19cacaf3ae8b3daa9a781b42f8c17f08f6 /source4/libcli | |
| parent | c38c2765d1059b33f044a42c6555f3d10d339911 (diff) | |
| download | samba-10169a203019445e6d325a5c1559de3c73782237.tar.gz samba-10169a203019445e6d325a5c1559de3c73782237.tar.bz2 samba-10169a203019445e6d325a5c1559de3c73782237.zip | |
Remove more global_loadparm instance.s
(This used to be commit a1280252ce924df69d911e597b7f65d8038abef9)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/finddcs.c | 4 | ||||
| -rw-r--r-- | source4/libcli/resolve/nbtlist.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c index 606809751e..67ba47ddc6 100644 --- a/source4/libcli/finddcs.c +++ b/source4/libcli/finddcs.c @@ -28,6 +28,7 @@ #include "libcli/libcli.h" #include "libcli/resolve/resolve.h" #include "libcli/finddcs.h" +#include "param/param.h" struct finddcs_state { struct composite_context *ctx; @@ -195,7 +196,8 @@ static void fallback_node_status(struct finddcs_state *state) state->node_status.in.timeout = 1; state->node_status.in.retries = 2; - nbtsock = nbt_name_socket_init(state, state->ctx->event_ctx); + nbtsock = nbt_name_socket_init(state, state->ctx->event_ctx, + lp_iconv_convenience(global_loadparm)); if (composite_nomem(nbtsock, state->ctx)) return; name_req = nbt_name_status_send(nbtsock, &state->node_status); diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c index 34578e953a..887bdd7ecf 100644 --- a/source4/libcli/resolve/nbtlist.c +++ b/source4/libcli/resolve/nbtlist.c @@ -141,7 +141,8 @@ struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx, return c; } - state->nbtsock = nbt_name_socket_init(state, event_ctx); + state->nbtsock = nbt_name_socket_init(state, event_ctx, + lp_iconv_convenience(global_loadparm)); if (composite_nomem(state->nbtsock, c)) return c; /* count the address_list size */ |