lib/util/charset: remove charset module loading

Now that the 'table' modules are gone, there is no reason for there to
be charset modules at all.  This builds the macosxfs and weird modules
into the binary at the appropriate times, and changes the tests to
test instead the difference between the remaining internal handlers
and iconv().

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Sep 20 06:27:06 CEST 2011 on sn-devel-104

4 files changed, 12 insertions, 10 deletions

diff --git a/source4/param/util.c b/source4/param/util.c
index 92672ecba2..d5b9583795 100644
--- a/source4/param/util.c
+++ b/source4/param/util.c
@@ -351,9 +351,9 @@ struct smb_iconv_handle *smb_iconv_handle_reinit_lp(TALLOC_CTX *mem_ctx,
 							      struct smb_iconv_handle *old_ic)
 {
 	return smb_iconv_handle_reinit(mem_ctx, lpcfg_dos_charset(lp_ctx),
-					    lpcfg_unix_charset(lp_ctx),
-					    lpcfg_parm_bool(lp_ctx, NULL, "iconv", "native", true),
-					    old_ic);
+				       lpcfg_unix_charset(lp_ctx),
+				       true,
+				       old_ic);
 }
 
 
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index 0152676b77..ab1f8170c7 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -5,9 +5,11 @@
 # a successful run for any of these tests an error.
 ^samba4.local.resolve.*.async
 ^samba4.local.iconv.*.next_codepoint()
-^samba4.local.iconv.5M random UTF-16LE sequences # Fails because our CP850 module returns the wrong error codes
-^samba4.local.convert_string_handle.iconv.modules.plato_cp850_utf8
-^samba4.local.convert_string.iconv.modules.plato
+# these show that we still have some differences between our system
+# with our internal iconv because it passes except when we bypass our
+# internal iconv modules
+^samba4.local.convert_string_handle.system.iconv.gd_ascii
+^samba4.local.convert_string_handle.system.iconv.gd_iso8859_cp850
 ^samba4..*base.delete.*.deltest17
 ^samba4..*base.delete.*.deltest20a
 ^samba4..*base.delete.*.deltest20b
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 60e16a5d16..5b008a0e9d 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -273,9 +273,9 @@ for t in smb4torture_testsuites("local."):
 
 # Confirm these tests with the system iconv too
 for t in ["local.convert_string_handle", "local.convert_string", "local.ndr"]:
-    modname = "samba4.%s.iconv.modules" % t
-    cmdline = "%s %s %s" % (valgrindify(smb4torture), "ncalrpc: --option='iconv:native=false'", t)
-    plantestsuite_loadlist(modname, env, cmdline)
+    modname = "samba4.%s.system.iconv" % t
+    cmdline = "%s %s %s" % (valgrindify(smb4torture), "ncalrpc: --option='iconv:use_builtin_handlers=false'", t)
+    plantestsuite_loadlist(modname, "none", cmdline)
 
 tdbtorture4 = binpath("tdbtorture")
 if os.path.exists(tdbtorture4):
diff --git a/source4/torture/smbiconv.c b/source4/torture/smbiconv.c
index f1a7d899a5..45166083b7 100644
--- a/source4/torture/smbiconv.c
+++ b/source4/torture/smbiconv.c
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	cd = smb_iconv_open_ex(tctx, to, from, lpcfg_parm_bool(tctx->lp_ctx, NULL, "iconv", "native", true));
+	cd = smb_iconv_open_ex(tctx, to, from, lpcfg_parm_bool(tctx->lp_ctx, NULL, "iconv", "use_builtin_handlers", true));
 	if((int)cd == -1) {
 		DEBUG(0,("unable to find from or to encoding, exiting...\n"));
 		if (out != stdout) fclose(out);