From: Evan Hunt Date: Sun, 25 Feb 2018 07:57:06 +0000 (-0800) Subject: remove v6synth X-Git-Tag: v9.9.13rc1~77^2~3 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=37d6f7b624be845c9ab969ba8813fcba077506eb;p=thirdparty%2Fbind9.git remove v6synth - this was a test for the allow-v6-synthesis option, which was deprecated and no longer works. the test was removed from conf.sh.in long ago. (cherry picked from commit 474b10a133faabaedeea201b96b42d87c4222f22) (cherry picked from commit 79718736399653aa1a8472a09dbe2dd6d4fbed91) (cherry picked from commit 626566c72dc622d24a434442a35979906a4a4b88) (cherry picked from commit 62f239f5cfe17087b619551a056068f87d7ca126) --- diff --git a/bin/tests/system/v6synth/clean.sh b/bin/tests/system/v6synth/clean.sh deleted file mode 100644 index 206b94bc146..00000000000 --- a/bin/tests/system/v6synth/clean.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") -# Copyright (C) 2001 Internet Software Consortium. -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -# $Id: clean.sh,v 1.5 2007/09/26 03:22:44 marka Exp $ - -rm -f *.out -rm -f */named.memstats diff --git a/bin/tests/system/v6synth/ns1/named.conf b/bin/tests/system/v6synth/ns1/named.conf deleted file mode 100644 index fdf7e566ac1..00000000000 --- a/bin/tests/system/v6synth/ns1/named.conf +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2001 Internet Software Consortium. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* $Id: named.conf,v 1.5 2007/06/19 23:47:06 tbox Exp $ */ - -controls { /* empty */ }; - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -zone "." { - type master; - file "root.db"; -}; diff --git a/bin/tests/system/v6synth/ns1/root.db b/bin/tests/system/v6synth/ns1/root.db deleted file mode 100644 index 02080385f02..00000000000 --- a/bin/tests/system/v6synth/ns1/root.db +++ /dev/null @@ -1,33 +0,0 @@ -; Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") -; Copyright (C) 2001 Internet Software Consortium. -; -; Permission to use, copy, modify, and/or distribute this software for any -; purpose with or without fee is hereby granted, provided that the above -; copyright notice and this permission notice appear in all copies. -; -; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -; PERFORMANCE OF THIS SOFTWARE. - -; $Id: root.db,v 1.4 2007/06/19 23:47:06 tbox Exp $ - -$TTL 300 -. IN SOA gson.nominum.com. a.root.servers.nil. ( - 2000042100 ; serial - 600 ; refresh - 600 ; retry - 1200 ; expire - 600 ; minimum - ) -. NS a.root-servers.nil. -a.root-servers.nil. A 10.53.0.1 - -example. NS ns2.example. -ns2.example. A 10.53.0.2 - -ip6.int. NS ns2.example. -ip6.arpa. NS ns2.example. diff --git a/bin/tests/system/v6synth/ns2/example.db b/bin/tests/system/v6synth/ns2/example.db deleted file mode 100644 index 120b87d85db..00000000000 --- a/bin/tests/system/v6synth/ns2/example.db +++ /dev/null @@ -1,38 +0,0 @@ -; Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") -; Copyright (C) 2001 Internet Software Consortium. -; -; Permission to use, copy, modify, and/or distribute this software for any -; purpose with or without fee is hereby granted, provided that the above -; copyright notice and this permission notice appear in all copies. -; -; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -; PERFORMANCE OF THIS SOFTWARE. - -; $Id: example.db,v 1.4 2007/06/19 23:47:06 tbox Exp $ - -$TTL 86400 -@ IN SOA ns2 hostmaster ( - 2001010604 3600 1800 1814400 3600 ) - NS ns2.example. -ns2.example. A 10.53.0.2 - -a A 10.0.0.1 -aaaa AAAA 12:34:56::ff -a6 A6 0 12:34:56::ff -chain A6 64 0::ff:ff prefix -prefix A6 0 12:34:56::0 -alias CNAME chain -alias2 CNAME alias -dname DNAME foo - -loop CNAME loop - -loop2 CNAME loop3 -loop3 CNAME loop2 - -aaaa.foo AAAA 12:34:56::ff diff --git a/bin/tests/system/v6synth/ns2/ip6.arpa.db b/bin/tests/system/v6synth/ns2/ip6.arpa.db deleted file mode 100644 index c99c8d9981b..00000000000 --- a/bin/tests/system/v6synth/ns2/ip6.arpa.db +++ /dev/null @@ -1,24 +0,0 @@ -; Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") -; Copyright (C) 2001, 2002 Internet Software Consortium. -; -; Permission to use, copy, modify, and/or distribute this software for any -; purpose with or without fee is hereby granted, provided that the above -; copyright notice and this permission notice appear in all copies. -; -; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -; PERFORMANCE OF THIS SOFTWARE. - -; $Id: ip6.arpa.db,v 1.5 2007/06/19 23:47:06 tbox Exp $ - -$TTL 86400 -@ IN SOA ns2 hostmaster ( - 2001010604 3600 1800 1814400 3600 ) - NS ns2.example. -ns2.example. A 10.53.0.2 - -f.f.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.5.4.3.2.1 PTR foo. diff --git a/bin/tests/system/v6synth/ns2/ip6.int.db b/bin/tests/system/v6synth/ns2/ip6.int.db deleted file mode 100644 index 374e02af88a..00000000000 --- a/bin/tests/system/v6synth/ns2/ip6.int.db +++ /dev/null @@ -1,24 +0,0 @@ -; Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") -; Copyright (C) 2001 Internet Software Consortium. -; -; Permission to use, copy, modify, and/or distribute this software for any -; purpose with or without fee is hereby granted, provided that the above -; copyright notice and this permission notice appear in all copies. -; -; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -; PERFORMANCE OF THIS SOFTWARE. - -; $Id: ip6.int.db,v 1.4 2007/06/19 23:47:06 tbox Exp $ - -$TTL 86400 -@ IN SOA ns2 hostmaster ( - 2001010604 3600 1800 1814400 3600 ) - NS ns2.example. -ns2.example. A 10.53.0.2 - -f.f.2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.5.4.3.2.1 PTR bar. diff --git a/bin/tests/system/v6synth/ns2/named.conf b/bin/tests/system/v6synth/ns2/named.conf deleted file mode 100644 index 1eb6d337f0d..00000000000 --- a/bin/tests/system/v6synth/ns2/named.conf +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2001 Internet Software Consortium. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* $Id: named.conf,v 1.6 2007/06/18 23:47:31 tbox Exp $ */ - -controls { /* empty */ }; - -options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; - recursion yes; - acache-enable yes; - notify yes; -}; - -zone "example" { - type master; - file "example.db"; -}; - -zone "ip6.int" { - type master; - file "ip6.int.db"; -}; - -zone "ip6.arpa" { - type master; - file "ip6.arpa.db"; -}; - diff --git a/bin/tests/system/v6synth/ns3/named.conf b/bin/tests/system/v6synth/ns3/named.conf deleted file mode 100644 index bacaab78927..00000000000 --- a/bin/tests/system/v6synth/ns3/named.conf +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2001 Internet Software Consortium. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* $Id: named.conf,v 1.6 2007/06/18 23:47:31 tbox Exp $ */ - -controls { /* empty */ }; - -options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; - recursion yes; - acache-enable yes; - notify yes; - allow-v6-synthesis { any; }; -}; - -zone "." { - type hint; - file "../../common/root.hint"; -}; diff --git a/bin/tests/system/v6synth/tests.sh b/bin/tests/system/v6synth/tests.sh deleted file mode 100644 index cc1673c0e42..00000000000 --- a/bin/tests/system/v6synth/tests.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2004, 2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") -# Copyright (C) 2001 Internet Software Consortium. -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -# $Id: tests.sh,v 1.4 2007/06/19 23:47:06 tbox Exp $ - -SYSTEMTESTTOP=.. -. $SYSTEMTESTTOP/conf.sh - -# ns1 = root server -# ns2 = authoritative server -# ns3 = recursive server doing v6 synthesis - -status=0 - -DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd" - -for name in aaaa a6 chain alias2 aaaa.dname loop loop2 -do - $DIG $DIGOPTS $name.example. aaaa @10.53.0.3 -p 5300 - echo -done >dig.out - -for i in 1 2 -do - $DIG $DIGOPTS f.f.$i.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.5.4.3.2.1.ip6.int. PTR @10.53.0.3 -p 5300 - echo -done >>dig.out - -cat <good.out -aaaa.example. 0 IN AAAA 12:34:56::ff - -a6.example. 0 IN AAAA 12:34:56::ff - -chain.example. 0 IN AAAA 12:34:56::ff:ff - -alias2.example. 0 IN CNAME alias.example. -alias.example. 0 IN CNAME chain.example. -chain.example. 0 IN AAAA 12:34:56::ff:ff - -aaaa.dname.example. 0 IN CNAME aaaa.foo.example. -aaaa.foo.example. 0 IN AAAA 12:34:56::ff - -loop.example. 0 IN CNAME loop.example. - -loop2.example. 0 IN CNAME loop3.example. -loop3.example. 0 IN CNAME loop2.example. - -f.f.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.5.4.3.2.1.ip6.int. 0 IN PTR foo. - -f.f.2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.5.4.3.2.1.ip6.int. 0 IN PTR bar. - -EOF - -diff good.out dig.out || status=1 - -echo "I:exit status: $status" -[ $status -eq 0 ] || exit 1