s4-smbtorture: test netservergetinfo level 1 also against s3.

Guenther

diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 4e490bcaae571e00710a8aaa688848e9dffc4a7d..74f7188cd5350d23b9c7c515edcb8003eee7b776 100644 (file)
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -1720,15 +1720,15 @@ static bool test_netservergetinfo(struct torture_context *tctx,
        torture_assert_ntstatus_ok(tctx,
                smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
                "rap_netservergetinfo level 0 failed");
-
-       if (torture_setting_bool(tctx, "samba3", false)) {
-               torture_skip(tctx, "skipping netservergetinfo level 1 against samba3");
-       }
+       torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+               "rap_netservergetinfo level 0 failed");
 
        r.in.level = 1;
        torture_assert_ntstatus_ok(tctx,
                smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
                "rap_netservergetinfo level 1 failed");
+       torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+               "rap_netservergetinfo level 1 failed");
 
        return res;
 }

diff --git a/source4/torture/rap/rpc.c b/source4/torture/rap/rpc.c
index 7696ed8e41ed5ddf4e681d8e6e972be1dd744684..4528240310c63efa28509a6e5f2bd847825a7d01 100644 (file)
--- a/source4/torture/rap/rpc.c
+++ b/source4/torture/rap/rpc.c
@@ -67,10 +67,6 @@ static bool test_rpc_netservergetinfo(struct torture_context *tctx,
 
        torture_assert_str_equal(tctx, (const char *)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");
-       }
-
        r.in.level = 1;
 
        torture_assert_ntstatus_ok(tctx,