summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-06-17 09:23:00 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-06-18 10:03:07 +0200
commit917f6015a6292a5b9b88607060dc5f87dc78fb9b (patch)
tree929f937ce8cd26f472eeba3437aff1e8360f88da /source4
parentbe31b2ba62c49eaee6fb090a92b13ac8cf33bd1f (diff)
downloadsamba-917f6015a6292a5b9b88607060dc5f87dc78fb9b.tar.gz
samba-917f6015a6292a5b9b88607060dc5f87dc78fb9b.tar.bz2
samba-917f6015a6292a5b9b88607060dc5f87dc78fb9b.zip
s4:torture/rpc/netlogon.c - activate "AddressToSitenames" tests which do run against s4
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/rpc/netlogon.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 787914e46d..dddad61d25 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -2476,12 +2476,14 @@ static bool test_netr_DsRAddressToSitenamesW(struct torture_context *tctx,
"didn't return default site");
}
for (i = 3; i < 6; i++) {
-/* Windows returns "NULL" for the sitename if it isn't IPv6 configured
- torture_assert_casestr_equal(tctx,
- ctr->sitename[i].string,
- samdb_server_site_name(sam_ctx, tctx),
- "didn't return default site");
-*/
+ /* Windows returns "NULL" for the sitename if it isn't
+ * IPv6 configured */
+ if (torture_setting_bool(tctx, "samba4", false)) {
+ torture_assert_casestr_equal(tctx,
+ ctr->sitename[i].string,
+ samdb_server_site_name(sam_ctx, tctx),
+ "didn't return default site");
+ }
}
}
@@ -2653,12 +2655,14 @@ static bool test_netr_DsRAddressToSitenamesExW(struct torture_context *tctx,
"subnet should be null");
}
for (i = 3; i < 6; i++) {
-/* Windows returns "NULL" for the sitename if it isn't IPv6 configured
- torture_assert_casestr_equal(tctx,
- ctr->sitename[i].string,
- samdb_server_site_name(sam_ctx, tctx),
- "didn't return default site");
-*/
+ /* Windows returns "NULL" for the sitename if it isn't
+ * IPv6 configured */
+ if (torture_setting_bool(tctx, "samba4", false)) {
+ torture_assert_casestr_equal(tctx,
+ ctr->sitename[i].string,
+ samdb_server_site_name(sam_ctx, tctx),
+ "didn't return default site");
+ }
torture_assert(tctx, ctr->subnetname[i].string == NULL,
"subnet should be null");
}