Finish removal of iconv_convenience in public API's.

[amitay/samba.git] / source4 / torture / rap / rpc.c

diff --git a/source4/torture/rap/rpc.c b/source4/torture/rap/rpc.c
index f245a919efacc72be7bf361fba16cd44931616cc..6335a54b353d6b019bed8b69e64d55108a515fa1 100644 (file)
--- a/source4/torture/rap/rpc.c
+++ b/source4/torture/rap/rpc.c
@@ -58,28 +58,24 @@ static bool test_rpc_netservergetinfo(struct torture_context *tctx,
        r.in.level = 0;
 
        torture_assert_ntstatus_ok(tctx,
-               smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
+               smbcli_rap_netservergetinfo(cli->tree, tctx, &r),
                "rap_netservergetinfo level 0 failed");
        torture_assert_int_equal(tctx, r.out.status, 0,
                "rap_netservergetinfo level 0 failed");
 
        server_name = talloc_strndup(tctx, info.info101->server_name, 16);
 
-       torture_assert_str_equal(tctx, r.out.info.info0.name, server_name, "server name");
-
-       if (torture_setting_bool(tctx, "samba3", false)) {
-               torture_skip(tctx, "skipping netservergetinfo level 1 against samba3");
-       }
+       torture_assert_str_equal(tctx, (const char *)r.out.info.info0.name, server_name, "server name");
 
        r.in.level = 1;
 
        torture_assert_ntstatus_ok(tctx,
-               smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
+               smbcli_rap_netservergetinfo(cli->tree, tctx, &r),
                "rap_netservergetinfo level 1 failed");
        torture_assert_int_equal(tctx, r.out.status, 0,
                "rap_netservergetinfo level 1 failed");
 
-       torture_assert_str_equal(tctx, r.out.info.info1.name, server_name, "server name");
+       torture_assert_str_equal(tctx, (const char *)r.out.info.info1.name, server_name, "server name");
        torture_assert_int_equal(tctx, r.out.info.info1.version_major, info.info101->version_major, "version major");
        torture_assert_int_equal(tctx, r.out.info.info1.version_minor, info.info101->version_minor, "version minor");
        torture_assert_int_equal(tctx, r.out.info.info1.servertype, info.info101->server_type, "server_type");