|
 |
c8bceb |
From ab11b1cd069d9266fa63fc609a2040d0366eb57a Mon Sep 17 00:00:00 2001
|
|
|
c8bceb |
From: Eric Garver <eric@garver.life>
|
|
|
c8bceb |
Date: Mon, 5 Aug 2019 16:06:07 -0400
|
|
|
c8bceb |
Subject: [PATCH 76/79] fix: test: regression/rhbz1734765: guard IPv6 usage
|
|
|
c8bceb |
|
|
|
c8bceb |
Fixes: 25032eb3a607 ("test: verify source-based zone dispatch ordered by zone name")
|
|
|
c8bceb |
(cherry picked from commit f4411b95e127fea7a7ed87cd2b01e59c2ce333c5)
|
|
|
c8bceb |
(cherry picked from commit 8e13e313bda5408165f70725ed648419d4a23839)
|
|
|
c8bceb |
---
|
|
|
c8bceb |
src/tests/regression/rhbz1734765.at | 28 ++++++++++++++++++++--------
|
|
|
c8bceb |
1 file changed, 20 insertions(+), 8 deletions(-)
|
|
|
c8bceb |
|
|
|
c8bceb |
diff --git a/src/tests/regression/rhbz1734765.at b/src/tests/regression/rhbz1734765.at
|
|
|
c8bceb |
index 070c43faf756..5145d716e576 100644
|
|
|
c8bceb |
--- a/src/tests/regression/rhbz1734765.at
|
|
|
c8bceb |
+++ b/src/tests/regression/rhbz1734765.at
|
|
|
c8bceb |
@@ -12,20 +12,32 @@ FWD_CHECK([-q --permanent --new-zone=foobar_01])
|
|
|
c8bceb |
FWD_CHECK([-q --permanent --new-zone=foobar_04])
|
|
|
c8bceb |
FWD_CHECK([-q --permanent --new-zone=foobar_010])
|
|
|
c8bceb |
|
|
|
c8bceb |
-FWD_CHECK([-q --permanent --zone=foobar_00 --add-source="10.1.1.1" --add-source="1234:5678::1:1:1"])
|
|
|
c8bceb |
-FWD_CHECK([-q --permanent --zone=foobar_01 --add-source="10.1.1.0/24" --add-source="1234:5678::1:1:0/112"])
|
|
|
c8bceb |
-FWD_CHECK([-q --permanent --zone=foobar_02 --add-source="10.1.0.0/16" --add-source="1234:5678::1:0:0/96"])
|
|
|
c8bceb |
-FWD_CHECK([-q --permanent --zone=foobar_03 --add-source="10.2.2.0/24" --add-source="1234:5678::2:2:0/112"])
|
|
|
c8bceb |
-FWD_CHECK([-q --permanent --zone=foobar_04 --add-source="10.2.0.0/16" --add-source="1234:5678::2:0:0/96"])
|
|
|
c8bceb |
-FWD_CHECK([-q --permanent --zone=foobar_05 --add-source="10.0.0.0/8" --add-source="1234:5678::0:0:0/80"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_00 --add-source="10.1.1.1"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_01 --add-source="10.1.1.0/24"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_02 --add-source="10.1.0.0/16"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_03 --add-source="10.2.2.0/24"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_04 --add-source="10.2.0.0/16"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_05 --add-source="10.0.0.0/8"])
|
|
|
c8bceb |
+IF_IPV6_SUPPORTED([
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_00 --add-source="1234:5678::1:1:1"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_01 --add-source="1234:5678::1:1:0/112"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_02 --add-source="1234:5678::1:0:0/96"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_03 --add-source="1234:5678::2:2:0/112"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_04 --add-source="1234:5678::2:0:0/96"])
|
|
|
c8bceb |
+FWD_CHECK([-q --permanent --zone=foobar_05 --add-source="1234:5678::0:0:0/80"])
|
|
|
c8bceb |
+])
|
|
|
c8bceb |
|
|
|
c8bceb |
FWD_CHECK([-q --permanent --zone=internal --add-interface=foobar0])
|
|
|
c8bceb |
FWD_CHECK([-q --permanent --zone=trusted --add-interface=foobar1])
|
|
|
c8bceb |
|
|
|
c8bceb |
FWD_RELOAD
|
|
|
c8bceb |
|
|
|
c8bceb |
-FWD_CHECK([-q --zone=foobar_010 --add-source="10.10.10.10" --add-source="1234:5678::10:10:10"])
|
|
|
c8bceb |
-FWD_CHECK([-q --zone=public --add-source="20.20.20.20" --add-source="1234:5678::20:20:20"])
|
|
|
c8bceb |
+FWD_CHECK([-q --zone=foobar_010 --add-source="10.10.10.10"])
|
|
|
c8bceb |
+FWD_CHECK([-q --zone=public --add-source="20.20.20.20"])
|
|
|
c8bceb |
+IF_IPV6_SUPPORTED([
|
|
|
c8bceb |
+FWD_CHECK([-q --zone=foobar_010 --add-source="1234:5678::10:10:10"])
|
|
|
c8bceb |
+FWD_CHECK([-q --zone=public --add-source="1234:5678::20:20:20"])
|
|
|
c8bceb |
+])
|
|
|
c8bceb |
FWD_CHECK([-q --zone=foobar_010 --add-interface=foobar2])
|
|
|
c8bceb |
|
|
|
c8bceb |
m4_if(nftables, FIREWALL_BACKEND, [dnl
|
|
|
c8bceb |
--
|
|
|
c8bceb |
2.20.1
|
|
|
c8bceb |
|