From 3be6dde85dda49352642681813753454e5f41525 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 19 Apr 2021 11:15:43 +0200 Subject: [PATCH] rec: Replace deprecated edns-subnet-whitelist with edns-subnet-allow-list --- regression-tests.recursor-dnssec/test_ECS.py | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/regression-tests.recursor-dnssec/test_ECS.py b/regression-tests.recursor-dnssec/test_ECS.py index 6d1a98c738..010639a0d7 100644 --- a/regression-tests.recursor-dnssec/test_ECS.py +++ b/regression-tests.recursor-dnssec/test_ECS.py @@ -117,7 +117,7 @@ disable-syslog=yes class testNoECS(ECSTest): _confdir = 'NoECS' - _config_template = """edns-subnet-whitelist= + _config_template = """edns-subnet-allow-list= forward-zones=ecs-echo.example=%s.21 """ % (os.environ['PREFIX']) @@ -142,7 +142,7 @@ forward-zones=ecs-echo.example=%s.21 class testIncomingNoECS(ECSTest): _confdir = 'IncomingNoECS' - _config_template = """edns-subnet-whitelist= + _config_template = """edns-subnet-allow-list= use-incoming-edns-subnet=yes forward-zones=ecs-echo.example=%s.21 """ % (os.environ['PREFIX']) @@ -170,7 +170,7 @@ forward-zones=ecs-echo.example=%s.21 class testECSByName(ECSTest): _confdir = 'ECSByName' - _config_template = """edns-subnet-whitelist=ecs-echo.example. + _config_template = """edns-subnet-allow-list=ecs-echo.example. forward-zones=ecs-echo.example=%s.21 """ % (os.environ['PREFIX']) @@ -201,7 +201,7 @@ forward-zones=ecs-echo.example=%s.21 class testECSByNameLarger(ECSTest): _confdir = 'ECSByNameLarger' - _config_template = """edns-subnet-whitelist=ecs-echo.example. + _config_template = """edns-subnet-allow-list=ecs-echo.example. ecs-ipv4-bits=32 forward-zones=ecs-echo.example=%s.21 ecs-ipv4-cache-bits=32 @@ -235,7 +235,7 @@ ecs-ipv6-cache-bits=128 class testECSByNameSmaller(ECSTest): _confdir = 'ECSByNameLarger' - _config_template = """edns-subnet-whitelist=ecs-echo.example. + _config_template = """edns-subnet-allow-list=ecs-echo.example. ecs-ipv4-bits=16 forward-zones=ecs-echo.example=%s.21 """ % (os.environ['PREFIX']) @@ -262,7 +262,7 @@ forward-zones=ecs-echo.example=%s.21 class testIncomingECSByName(ECSTest): _confdir = 'ECSIncomingByName' - _config_template = """edns-subnet-whitelist=ecs-echo.example. + _config_template = """edns-subnet-allow-list=ecs-echo.example. use-incoming-edns-subnet=yes forward-zones=ecs-echo.example=%s.21 ecs-scope-zero-address=2001:db8::42 @@ -302,7 +302,7 @@ ecs-ipv6-cache-bits=128 class testIncomingECSByNameLarger(ECSTest): _confdir = 'ECSIncomingByNameLarger' - _config_template = """edns-subnet-whitelist=ecs-echo.example. + _config_template = """edns-subnet-allow-list=ecs-echo.example. use-incoming-edns-subnet=yes ecs-ipv4-bits=32 forward-zones=ecs-echo.example=%s.21 @@ -334,7 +334,7 @@ ecs-ipv6-cache-bits=128 class testIncomingECSByNameSmaller(ECSTest): _confdir = 'ECSIncomingByNameSmaller' - _config_template = """edns-subnet-whitelist=ecs-echo.example. + _config_template = """edns-subnet-allow-list=ecs-echo.example. use-incoming-edns-subnet=yes ecs-ipv4-bits=16 forward-zones=ecs-echo.example=%s.21 @@ -365,7 +365,7 @@ ecs-ipv6-cache-bits=128 class testIncomingECSByNameV6(ECSTest): _confdir = 'ECSIncomingByNameV6' - _config_template = """edns-subnet-whitelist=ecs-echo.example. + _config_template = """edns-subnet-allow-list=ecs-echo.example. use-incoming-edns-subnet=yes ecs-ipv6-bits=128 ecs-ipv4-cache-bits=32 @@ -398,7 +398,7 @@ forward-zones=ecs-echo.example=[::1]:53000 class testECSNameMismatch(ECSTest): _confdir = 'ECSNameMismatch' - _config_template = """edns-subnet-whitelist=not-the-right-name.example. + _config_template = """edns-subnet-allow-list=not-the-right-name.example. forward-zones=ecs-echo.example=%s.21 """ % (os.environ['PREFIX']) @@ -423,7 +423,7 @@ forward-zones=ecs-echo.example=%s.21 class testECSByIP(ECSTest): _confdir = 'ECSByIP' - _config_template = """edns-subnet-whitelist=%s.21 + _config_template = """edns-subnet-allow-list=%s.21 forward-zones=ecs-echo.example=%s.21 """ % (os.environ['PREFIX'], os.environ['PREFIX']) @@ -449,7 +449,7 @@ forward-zones=ecs-echo.example=%s.21 class testIncomingECSByIP(ECSTest): _confdir = 'ECSIncomingByIP' - _config_template = """edns-subnet-whitelist=%s.21 + _config_template = """edns-subnet-allow-list=%s.21 use-incoming-edns-subnet=yes forward-zones=ecs-echo.example=%s.21 ecs-scope-zero-address=::1 @@ -489,7 +489,7 @@ ecs-ipv6-cache-bits=128 class testECSIPMismatch(ECSTest): _confdir = 'ECSIPMismatch' - _config_template = """edns-subnet-whitelist=192.0.2.1 + _config_template = """edns-subnet-allow-list=192.0.2.1 forward-zones=ecs-echo.example=%s.21 """ % (os.environ['PREFIX']) -- 2.47.2