From a66bdbec86f2da8b53518b05018f2c17261b9003 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Wed, 21 Apr 2010 19:13:11 +0200 Subject: 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 --- source4/torture/rpc/netlogon.c | 6 +++--- 1 file 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); -- cgit