summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-04-21 19:13:11 +0200
committerAndrew Tridgell <tridge@samba.org>2010-04-27 15:24:42 +1000
commita66bdbec86f2da8b53518b05018f2c17261b9003 (patch)
treea140392ba2262ab6af63d3dd4f95e5b37f99112b
parent3b4137c7be94678e3bd3553fa05feea1efe0f5fd (diff)
downloadsamba-a66bdbec86f2da8b53518b05018f2c17261b9003.tar.gz
samba-a66bdbec86f2da8b53518b05018f2c17261b9003.tar.bz2
samba-a66bdbec86f2da8b53518b05018f2c17261b9003.zip
s4:torture - DsRGetSiteName - move "skip" statement before the "computer_name" check
We don't support the check for the computer name on the RPC server side. Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rw-r--r--source4/torture/rpc/netlogon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 4b05c8ca79..567dec6b39 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -2172,9 +2172,6 @@ static bool test_netr_DsRGetSiteName(struct dcerpc_pipe *p, struct torture_conte
const char *site = NULL;
struct dcerpc_binding_handle *b = p->binding_handle;
- if (torture_setting_bool(tctx, "samba4", false))
- torture_skip(tctx, "skipping DsRGetSiteName test against Samba4");
-
r.in.computer_name = computer_name;
r.out.site = &site;
torture_comment(tctx, "Testing netr_DsRGetSiteName\n");
@@ -2184,6 +2181,9 @@ static bool test_netr_DsRGetSiteName(struct dcerpc_pipe *p, struct torture_conte
torture_assert_werr_ok(tctx, r.out.result, "DsRGetSiteName");
torture_assert_str_equal(tctx, expected_site, site, "netr_DsRGetSiteName");
+ if (torture_setting_bool(tctx, "samba4", false))
+ torture_skip(tctx, "skipping computer name check against Samba4");
+
r.in.computer_name = talloc_asprintf(tctx, "\\\\%s", computer_name);
torture_comment(tctx,
"Testing netr_DsRGetSiteName with broken computer name: %s\n", r.in.computer_name);