From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 1 Nov 2008 23:35:04 +0000 (+0100)
Subject: Use global iconv convenience rather than global loadparm.
X-Git-Tag: samba-4.0.0alpha6~552
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=cb7d085ec34442db25e6c5a5d4b4547e0718fb92;ds=sidebyside

Use global iconv convenience rather than global loadparm.
---

diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index 531ce6098fb..ec4cfb81b41 100644
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -142,7 +142,7 @@ struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx,
 	}
 
 	state->nbtsock = nbt_name_socket_init(state, event_ctx, 
-					      lp_iconv_convenience(global_loadparm));
+					      global_iconv_convenience);
 	if (composite_nomem(state->nbtsock, c)) return c;
 
 	/* count the address_list size */