s4:torture/rpc/netlogon.c - activate "AddressToSitenames" tests which do run against s4

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 787914e46d78e56e61d274a1d38c605817f5c94d..dddad61d254c3bd90fdad39b8aa50d916d59a968 100644 (file)
--- 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");
                }