]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
4019. [func] If named is not configured to validate the answer
authorMark Andrews <marka@isc.org>
Fri, 5 Dec 2014 06:47:26 +0000 (17:47 +1100)
committerMark Andrews <marka@isc.org>
Fri, 5 Dec 2014 07:04:26 +0000 (18:04 +1100)
                        then allow fallback to plain DNS on timeout even
                        when we know the server supports EDNS. [RT #37978]

12 files changed:
CHANGES
bin/tests/system/legacy/clean.sh
bin/tests/system/legacy/ns1/named1.conf [new file with mode: 0644]
bin/tests/system/legacy/ns1/named2.conf [moved from bin/tests/system/legacy/ns1/named.conf with 97% similarity]
bin/tests/system/legacy/ns1/trusted.conf [new file with mode: 0644]
bin/tests/system/legacy/ns6/edns512.db.signed
bin/tests/system/legacy/ns7/edns512-notcp.db.signed
bin/tests/system/legacy/ns7/sign.sh
bin/tests/system/legacy/setup.sh [new file with mode: 0644]
bin/tests/system/legacy/tests.sh
doc/arm/notes.xml
lib/dns/resolver.c

diff --git a/CHANGES b/CHANGES
index 7c0aa6d6ec8c4babc8ee7971a877f597bb797e40..9dbcc4c316aed77f595b0f1bec9e040839c3de5a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4019.  [func]          If named is not configured to validate the answer
+                       then allow fallback to plain DNS on timeout even
+                       when we know the server supports EDNS. [RT #37978]
+
 4017.  [test]          Add system test to check lookups to legacy servers
                        with broken DNS behaviour. [RT #37965]
 
index 8768de1327f2843e1d02b545430a890c838ea73f..5e4632fa3288e3303986f9dd354bbc5fbd616e5d 100644 (file)
 # PERFORMANCE OF THIS SOFTWARE.
 
 rm -f dig.out.*
+rm -f ns1/named.conf
 rm -f ns?/named.memstats
 rm -f ns?/named.run
+
+# build.sh
 rm -f ns6/K*
 rm -f ns6/dsset-*
 rm -f ns6/edns512.db
@@ -23,3 +26,4 @@ rm -f ns7/K*
 rm -f ns7/dsset-*
 rm -f ns7/edns512-notcp.db
 rm -f ns7/signer.err
+rm -f ns7/trusted.conf
diff --git a/bin/tests/system/legacy/ns1/named1.conf b/bin/tests/system/legacy/ns1/named1.conf
new file mode 100644 (file)
index 0000000..7e92843
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * 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.
+ */
+
+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 yes;
+};
+
+zone "." {
+       type master;
+       file "root.db";
+};
similarity index 97%
rename from bin/tests/system/legacy/ns1/named.conf
rename to bin/tests/system/legacy/ns1/named2.conf
index 994ed99c54a92540a27ef4dba483ccee783564b3..03459c8bbd7c684a014c741a4fda8300ecfc30fb 100644 (file)
@@ -27,10 +27,9 @@ options {
        recursion yes;
 };
 
-server 10.53.0.7 { edns no; };
-
 zone "." {
        type master;
        file "root.db";
 };
 
+include "trusted.conf";
diff --git a/bin/tests/system/legacy/ns1/trusted.conf b/bin/tests/system/legacy/ns1/trusted.conf
new file mode 100644 (file)
index 0000000..0727543
--- /dev/null
@@ -0,0 +1,3 @@
+trusted-keys {
+    "edns512-notcp." 257 3 10 "AwEAAcEBkn/cuVhdRTWMHt19O7h9F4Hx2t68u1JUZg7swLLvwfljqnNYjsKYk9EzUhIaYOAHtVe7//cYwoVU4BFhY2DGbx1YE1LnKIGxfqpopFxDZC34TTl6jpoTP6kvj+XpeO0HfF2+DcyNgnQcMGgHXyLWeRUJFt1As6o9tmsBiInGIZMTE3/rANhtAGMLNzhRLN7CS/Tc5GhKaL66uebyEYenEOAyDVgsuhr8Q9D5ka6xZmxzXFVswy2KvsSxu9aoxVq4nACjIeTZ4GJy0v83zclV7hA+5jlPDXMFtIpvwux5XALrNkUUPq+Fb5sc5/u141LcvdASnlk58I77HbsnfausvDxdYYxEns7K9e9N85dwyreM/OGTmm8p4hNDngZESAea7MrSCsJpOGn9XLkVe6gZnBgB1cra+ezzTSWn+4QH17lIhFXYNjMV83df2h/gH3Gmthqnr9RgknZga8B/Czc7TeX6iy2gAOshKGyb6w12eJim1L8tS5T138V8d6SigzxZz1raiJNolVhXyA8SbbDpgBrcoEXN/WjwvWI+2ol5gzlqMeNw/F9SMoWdpGIWkkNCNWBbhLWhp6qfhpRLUFwVys54LGOIGSVRd9uJmc2hPdXoP8ephnCIeNJb8Zp6DnpssyN0JaF815dKkOHff9GEjaiRLj0xWvtZSqNFaGoB";
+};
index c3c9f1222c85a3ac56515219ed124e63850de687..1493dd804d23c76a0812b96e63650db26c2377d4 100644 (file)
@@ -1,5 +1,5 @@
-; File written on Fri Dec  5 07:24:00 2014
-; dnssec_signzone version 9.10.1
+; File written on Fri Dec  5 16:35:57 2014
+; dnssec_signzone version 9.11.0pre-alpha
 edns512.               60      IN SOA  ns.edns512. marka.isc.org. (
                                        1          ; serial
                                        0          ; refresh (0 seconds)
@@ -8,241 +8,241 @@ edns512.            60      IN SOA  ns.edns512. marka.isc.org. (
                                        0          ; minimum (0 seconds)
                                        )
                        60      RRSIG   SOA 10 1 60 (
-                                       20441126192400 20141204192400 22703 edns512.
-                                       cRZi1U4VuTUBE4rNGGoRbzMJ32duvpLcEe4Z
-                                       tkTPDfl+sUrjiChluwDpPg0Mox8LvN0K9Mng
-                                       zWUhe+9iNJrtWll1PeGDZTKmK/AIJCGDdrCr
-                                       lsiAXs5OEGHU+BWjgulO2YNufoIWgFsFLxU8
-                                       +/82/YqO0mFDMHgBgK/1uEkguMi8RDZ1fDHp
-                                       B//U7ceFBqTzAXTwStn0peYoerFpJ9d5TakD
-                                       CqDjwGRj82p9KGMnvVGm2ukpiPjea04uwqAt
-                                       WeWMlI8Va1zfJ9PJz6I3uxq/Nzo31SlaGqW/
-                                       oHLpZrQ5Jj/4GdRlgupMDlaWtFs2qSb1oKD/
-                                       mkQm56B4bhVGjhCpZt3IU/kOrYblFeNduw26
-                                       WK+C1IRld1DppZ5uBxGuNmUDJ1/ECVHehMxc
-                                       V3/87rbppZPRKWzI5jRfpt2EGpz89sL2yugy
-                                       4ddCQK4cJXQ2++d5ZrLg2nJVDXyAOLhkscOP
-                                       G8jS8JGrBAztAFaPUq2Uov9DnA6LFhRcgZ6J
-                                       7SlcQs+U5uCHqDN9TcH7rM/EzHUdLpG++Jro
-                                       nYLZtn83oFvw954XcB/nYa7b8WG6UyzFMycr
-                                       ctsRYAKil7Y20sEVpFltyNYB14coA+/gzQfH
-                                       9Ff7Elm6l2q6fwtkwo8uWmONM4INbcu0NwEo
-                                       x1zL4Jn+xo+yKrFE5JLBC409dlr+lMklhTw= )
+                                       20441127043557 20141205043557 59033 edns512.
+                                       Xqas69NmX1N9jXSQntGXjcDTmZpO542fJURc
+                                       peYqY2gD445jxcH6FwmdMbzyPX4Nel+ZKdqx
+                                       wzb6U4S2sc7V1Wt8sOuNWil3LOaF9Mr2ZhL9
+                                       /BgFaZixYdij0dFkUyuaSRfDx+3rvYtGZBRW
+                                       w55/U2bRvIgk0TjH+XHOUM+l5n755bsH1GFP
+                                       kRxhsYtsrUdWrB7Wn5lOdURsIf31xUfuMejR
+                                       QO5UIeqIgLhqE67GTy4SkfJW01G97Fkmt9Kx
+                                       6K1gIwOeJy2rHN9WIF9vLJ2nyxWiSkmUka7l
+                                       Zw3kuR9fjgrFE8FEy4e/J8VIoq0v9bnwLh8a
+                                       woBnoQoZcfngu56e5hyF+g4t91JDbViOMAcJ
+                                       /DWsaGa7IF0o61Z51XoOakpgV4TP3VU53jFr
+                                       gfc4HDKP3sQQH9ZqzOpkXtoWGpSQ+u+2jSYu
+                                       NKa05LW4q1SJf8DHTiMxAUkkbikGHemskgIm
+                                       0MESkBJI95/M3FbsRc9FswOeX0ZaRo3+6982
+                                       elE1T0ZVPOWjPq1L5upWvUZDP0/d+2ns7Yt/
+                                       MY5dKXjl74kQWTIDdeUC/8aaWFiJhsx7Haa1
+                                       LhHtttBHtQQKQBo8uWVoTHDs9XY7pDcpkF6Z
+                                       /NzaCOVHFKh4Ahpr9xwY1J9Cy56oRIq5AEP9
+                                       HmtN1vS04jbad220C+jfkDPJH9s64MKggQ4= )
                        60      NS      ns.edns512.
                        60      RRSIG   NS 10 1 60 (
-                                       20441126192400 20141204192400 22703 edns512.
-                                       H3w6vtAF5SrpOJiiFyCThCpxh/vPJh/Z2/oG
-                                       a6UrTACknDRq2PdX85gjell2wFcM/Nt3pO4V
-                                       RVeywuzC7MF9KIdCud73Pv+/eu9oD/RYOXTG
-                                       oSJxq/7mUtRYZ4wfw9ioJ6GDwlFhBN497m/D
-                                       FU5FdkXsBHQpXD8q0CZE23054eelMv/QoCpN
-                                       NH7uO7qAwNhjJ0DLCZl0K9BYisu/rUG8KgD+
-                                       kRWtJP1tkWaWe8L/uud+RsAo0hGHXuVVoeEA
-                                       KDwFl4ZBzNelGwdnaMI0gwcMgpj96s4yIBG+
-                                       m8dW6GXkONIHViaqaDexLm9FWFVldJkzfxZd
-                                       nbWKcDlIMkBZnu/vvJqDfTQKmfJN1PY6JQpr
-                                       v5LSCfO/gY3s/JYnL1QCDvsSpAU7ODL+AqdS
-                                       pwQ0AGcnHJZUnofFBDqykKN7AhuEjAzs9Ghx
-                                       x402WSrP7iA3FzGECfc2VEXJ962Roup/isjp
-                                       eVuFin80DruOsuK99DfsI+incycvawI73VqZ
-                                       Lu+8JUusutrWAX2GqYLSZcRQep6MTYTSkwMm
-                                       hK2oTf+fHEhaOyrTc2HFl4gFkgSB/hblIh+w
-                                       tfiDEY4Yo1g7FG/ppUXeQ/AFsnDhid04K+YE
-                                       vcIEAV7lH68Ep7dLz0Ge7BoFv6EXsO42GEpC
-                                       ixCL1I9x0aSzzvBbEDdviN/cHvtki5xvdhs= )
+                                       20441127043557 20141205043557 59033 edns512.
+                                       G9qrHjBQZ+jcueOhibtN18rXYEaLzWOZh1o2
+                                       ZRQ9jS59BJd0KJ4taQzpz4CxA/juqEjSCmuY
+                                       Vynfeg15u4wvUf1/anC38Rp/QG0MHPrFily0
+                                       DzeS/o2plYNCJ8r2wOmufG34rZakXZs2EdBf
+                                       9s3+f+vqx+WsIs1TfaayGi90qDxVjn/SKGqb
+                                       v/eXGmYxyRMTaQ2x0+8y018MT+7zLbb3/VvV
+                                       EuD8X+J8N8dZiw3Rc1X6zj3usSOEO6wa4GRk
+                                       Oss3CMkYJuMND/3RG6XGt6du4hl3lK3+UK/4
+                                       bb/D5FBlCJc76bkmo8ZmUjxKGXXGzh9w+bMT
+                                       rt0GfabUcbQyWyOifIsWOeIxYVpvUHusk7VT
+                                       gvvhfqXabGT7pPoCPz97IW820qTXKPPX/Rzb
+                                       DpRgWdVdQDWcmhb4RBDQrr1DDMmBJlz91S4Q
+                                       0lDAnSMfMO2JIpJKOFNHnsMgLayEvdKOKQOH
+                                       ESKzbylxL4qARAq4zYbwz3vY6VDCV5MGcnAT
+                                       3XMNM9RwRq0/qMuE8XfPmRaDimIOLaEojMpU
+                                       59sFvaKzvn7t1h1ZQVLuJqu3jkWwz4iUtwts
+                                       +av/IdbbKP6spPy4gimngRWbpiiQHESNx9kp
+                                       EHB85/UAR28RffvPadNoQq1eaAOQJCEJf7xv
+                                       BOGytbBxrLFsTWrmrB5uCb9hujWu04unJyc= )
                        0       NSEC    ns.edns512. NS SOA RRSIG NSEC DNSKEY
                        0       RRSIG   NSEC 10 1 0 (
-                                       20441126192400 20141204192400 22703 edns512.
-                                       NN5kn4MEc/xU8gHVC5okUDX4x4Ufl5i19y4E
-                                       Enu11WnXHZj259ZvmxScn1VHKIqosH0DAwsb
-                                       dI2PN/wmHI3BfhqGbunj94ndvBhSvGzhiUy7
-                                       q/N65GwLmpunlNvsv+zW7rdH0yitg7C7d2/l
-                                       WBnr9flYaYWsBcUVgZupyvnICTajH8RmVtUg
-                                       fZgFD+iMjajYLUEsXHFesFCfnsX6J553UgNl
-                                       0eAsKbtdMN0H32q9W87/lFsPdzH+6dgDEP3R
-                                       DelMuHGj7syLc2OOIq99cw0Q5CAM2j2ADysc
-                                       FMKA2470pex4OH7yLyAk/bvZFn5+8mJ4ZfMB
-                                       nL3x4SPRLARDkNOCXdjeKnddvohBOlKJTyjH
-                                       TVkBX36YQ0QoPxw1N/IpF4f3MZpbKdRccUiW
-                                       5iLYdUDDuYDZlPBwliGcrcL0RCgttZ2zzIYm
-                                       6bh35+Tfcm+ap1oJQ0IZrciUeBVj/ya+IAJj
-                                       L6RLZi805hux/vGpmxODVQ/eUkiZ5XO17azW
-                                       2u8x1aunymV773Z6V6lGGMRqV3ugY3gq44oM
-                                       lyBugVmNooDxpSPhuCVxNgl1mURAco1QblX7
-                                       IBQlkU/UDQ08qPMz6qO9ynfBvD6pL78U0zbC
-                                       Bn1BtYw4F3PW7sF9lfFWnYL4iNk4VJZRFBq6
-                                       XGs5zQUVwitN7d6mWKJHG42hPBc296ytiG0= )
+                                       20441127043557 20141205043557 59033 edns512.
+                                       BY9hQLrs9zkekTWeXmSqT+8dCZ+vaRBGSSUf
+                                       E8BUr4gYbuzo7xeOpHjMkpO7IpkT80TRcIQf
+                                       AkleOlf3+XcUIhK9/7C/xu0/jI3XbaBs5NNJ
+                                       0zhf0CmJBzeCSMtxXInDLGkhGMgoclB3j5+f
+                                       nme65PHYFVEVWS/64ZRd71XUUV2kTk4slfqx
+                                       YNGhT7IPcgUTNOrsBGi6SmH2iKMseg2BfFOt
+                                       +2RRY9HBlfKywozHz9jjWsEmRZke3fqfpuln
+                                       C6r3EQ873XBjrsOrDerNaSDf29Zl46SQs3UQ
+                                       kCJZ0gWEReRvvooLlh4+PsbIW1M0FMmsImfv
+                                       l1kPh8kQgJVxljba7kXX3k5bc/YwTQE3rI6e
+                                       ametdxSwbxcUZiUr8rM2ZF4IfqFGS05sD+Cz
+                                       68dDDyR/vu+6Rt/U+39bzg2tI4Ok6aQxOgXP
+                                       v+hhOC8Sancpmn+SHLQvYoMW/VxR633TeyW3
+                                       zn4Xhcp7aD4TdKHGK9PpVrtWcx50zZEXu17c
+                                       essPk0yDOarTmoqx0r3LSe5jjDLJJ5kZxWxM
+                                       nlfkw3aKQwQMuyaVWN+Ruz7KRgD9lkwoOic4
+                                       Qs/7PYpMrV58YVlEa7aESd3+qPHjv6dD99Zm
+                                       Fe6bc+SqUTKwjeYfIm/luc70FpykGhdxTK/E
+                                       dEjQJ8jMrAzCCr/or/JOHgV1yrTCfU3hAN8= )
                        60      DNSKEY  256 3 10 (
-                                       AwEAAdwTnHpGZWh3uhJz+u6h6uc8k7m7KUpH
-                                       d7PhipDP0GH9heS2xetSMKPwz7+dyY7um/9X
-                                       7U+24J2SmZDGclNZFCHJxg050VO3eHwwiGeH
-                                       hwQsAJdWUnpcjzByRet1yb9u4AVeFA5xPjAE
-                                       N3cd/xL4v/4WugefF1AqBvrEz/AAzuy9PBk9
-                                       oE6AYU3PlPtW6pxkEBfEjGJ0ZnpkuukSw75H
-                                       NfcYq1Nbhw3o/UXB1btqyhFMqXRxW+WaqY9O
-                                       OpKDdOBG8lUEwtlleR2y83MIO/SrRIIZXkeH
-                                       72pPhEYY/r3qtxQ28TjVhtGdp3LsXgBt1N2b
-                                       kQvkMvzoHYguJSpRxxmoZGTvHdk6s0SgOFJI
-                                       IemPX5rogeHDFNyc+e+6rFA/ltuMegJpX4N5
-                                       wFFe6sbZQXlS0qyvIDFoP1U5GYNvuTS8/Kz/
-                                       OKZj+HOXui5UqUo+SDXo6V5CHuSyM8mStwbr
-                                       Lu3UlWPQrpa8XrR+dGriRrcJXoxfGiVPF/TN
-                                       4Bcvkg6BIlO5JTox/gOy8fc3SIAVO1A3rRIi
-                                       qaPGQYZwIYQ925whn339aDeeIC+J3dcUMz4a
-                                       kDzoJoJxsQ5kfZjG1zMgFVR/OL0NpBjos1ZL
-                                       lJaxU/C8KnX2x/wj3m8S3EfZRc1gnEuiXOGV
-                                       BRLbo2Btwv9hMt59xs4CEkUyvK4RL/6Vq1A1
-                                       JfO3
-                                       ) ; ZSK; alg = RSASHA512; key id = 22703
+                                       AwEAAcEBkn/cuVhdRTWMHt19O7h9F4Hx2t68
+                                       u1JUZg7swLLvwfljqnNYjsKYk9EzUhIaYOAH
+                                       tVe7//cYwoVU4BFhY2DGbx1YE1LnKIGxfqpo
+                                       pFxDZC34TTl6jpoTP6kvj+XpeO0HfF2+DcyN
+                                       gnQcMGgHXyLWeRUJFt1As6o9tmsBiInGIZMT
+                                       E3/rANhtAGMLNzhRLN7CS/Tc5GhKaL66ueby
+                                       EYenEOAyDVgsuhr8Q9D5ka6xZmxzXFVswy2K
+                                       vsSxu9aoxVq4nACjIeTZ4GJy0v83zclV7hA+
+                                       5jlPDXMFtIpvwux5XALrNkUUPq+Fb5sc5/u1
+                                       41LcvdASnlk58I77HbsnfausvDxdYYxEns7K
+                                       9e9N85dwyreM/OGTmm8p4hNDngZESAea7MrS
+                                       CsJpOGn9XLkVe6gZnBgB1cra+ezzTSWn+4QH
+                                       17lIhFXYNjMV83df2h/gH3Gmthqnr9RgknZg
+                                       a8B/Czc7TeX6iy2gAOshKGyb6w12eJim1L8t
+                                       S5T138V8d6SigzxZz1raiJNolVhXyA8SbbDp
+                                       gBrcoEXN/WjwvWI+2ol5gzlqMeNw/F9SMoWd
+                                       pGIWkkNCNWBbhLWhp6qfhpRLUFwVys54LGOI
+                                       GSVRd9uJmc2hPdXoP8ephnCIeNJb8Zp6Dnps
+                                       syN0JaF815dKkOHff9GEjaiRLj0xWvtZSqNF
+                                       aGoB
+                                       ) ; ZSK; alg = RSASHA512; key id = 59033
                        60      DNSKEY  257 3 10 (
-                                       AwEAAdwTnHpGZWh3uhJz+u6h6uc8k7m7KUpH
-                                       d7PhipDP0GH9heS2xetSMKPwz7+dyY7um/9X
-                                       7U+24J2SmZDGclNZFCHJxg050VO3eHwwiGeH
-                                       hwQsAJdWUnpcjzByRet1yb9u4AVeFA5xPjAE
-                                       N3cd/xL4v/4WugefF1AqBvrEz/AAzuy9PBk9
-                                       oE6AYU3PlPtW6pxkEBfEjGJ0ZnpkuukSw75H
-                                       NfcYq1Nbhw3o/UXB1btqyhFMqXRxW+WaqY9O
-                                       OpKDdOBG8lUEwtlleR2y83MIO/SrRIIZXkeH
-                                       72pPhEYY/r3qtxQ28TjVhtGdp3LsXgBt1N2b
-                                       kQvkMvzoHYguJSpRxxmoZGTvHdk6s0SgOFJI
-                                       IemPX5rogeHDFNyc+e+6rFA/ltuMegJpX4N5
-                                       wFFe6sbZQXlS0qyvIDFoP1U5GYNvuTS8/Kz/
-                                       OKZj+HOXui5UqUo+SDXo6V5CHuSyM8mStwbr
-                                       Lu3UlWPQrpa8XrR+dGriRrcJXoxfGiVPF/TN
-                                       4Bcvkg6BIlO5JTox/gOy8fc3SIAVO1A3rRIi
-                                       qaPGQYZwIYQ925whn339aDeeIC+J3dcUMz4a
-                                       kDzoJoJxsQ5kfZjG1zMgFVR/OL0NpBjos1ZL
-                                       lJaxU/C8KnX2x/wj3m8S3EfZRc1gnEuiXOGV
-                                       BRLbo2Btwv9hMt59xs4CEkUyvK4RL/6Vq1A1
-                                       JfO3
-                                       ) ; KSK; alg = RSASHA512; key id = 22704
+                                       AwEAAcEBkn/cuVhdRTWMHt19O7h9F4Hx2t68
+                                       u1JUZg7swLLvwfljqnNYjsKYk9EzUhIaYOAH
+                                       tVe7//cYwoVU4BFhY2DGbx1YE1LnKIGxfqpo
+                                       pFxDZC34TTl6jpoTP6kvj+XpeO0HfF2+DcyN
+                                       gnQcMGgHXyLWeRUJFt1As6o9tmsBiInGIZMT
+                                       E3/rANhtAGMLNzhRLN7CS/Tc5GhKaL66ueby
+                                       EYenEOAyDVgsuhr8Q9D5ka6xZmxzXFVswy2K
+                                       vsSxu9aoxVq4nACjIeTZ4GJy0v83zclV7hA+
+                                       5jlPDXMFtIpvwux5XALrNkUUPq+Fb5sc5/u1
+                                       41LcvdASnlk58I77HbsnfausvDxdYYxEns7K
+                                       9e9N85dwyreM/OGTmm8p4hNDngZESAea7MrS
+                                       CsJpOGn9XLkVe6gZnBgB1cra+ezzTSWn+4QH
+                                       17lIhFXYNjMV83df2h/gH3Gmthqnr9RgknZg
+                                       a8B/Czc7TeX6iy2gAOshKGyb6w12eJim1L8t
+                                       S5T138V8d6SigzxZz1raiJNolVhXyA8SbbDp
+                                       gBrcoEXN/WjwvWI+2ol5gzlqMeNw/F9SMoWd
+                                       pGIWkkNCNWBbhLWhp6qfhpRLUFwVys54LGOI
+                                       GSVRd9uJmc2hPdXoP8ephnCIeNJb8Zp6Dnps
+                                       syN0JaF815dKkOHff9GEjaiRLj0xWvtZSqNF
+                                       aGoB
+                                       ) ; KSK; alg = RSASHA512; key id = 59034
                        60      RRSIG   DNSKEY 10 1 60 (
-                                       20441126192400 20141204192400 22703 edns512.
-                                       WElSumO15niBhMZ+5MFOu2JXUcKM7vu00B9+
-                                       YDDdqoOYRg3PTWP8tSIjcRbfdbJfR2uCzOXB
-                                       UURS0xt27WXFT8lpVom9k0WcdskmD5tViTTV
-                                       JsXQam6Moyc1s6DNRrZ40biygf2hdo/ZbcaO
-                                       2RAhT+pEL2tSO396Zkj/LVZ8PrfNEDAuY9Rl
-                                       mdaDtuaiD4d3c2bwMivipnKW8chVfO8FOmbD
-                                       5patsjgKhm8UUS+tzEnrwT72SoPal2kNyeVo
-                                       0wAA3NmVUkw+kGG5EwpHMXNHLqFm0tEUpXBR
-                                       Xwi0xUAvQX5N4vLhn4dpm0TGitKpNCWZ0V30
-                                       Jo4u+vyLgeEkHjrrWka/PV5rcYieBfUTzUbH
-                                       I7Dp3+kNTQK0/VVdAvdJUFup7bUK7w9uP7aL
-                                       aoQQoXyGN30BdgV2LOSuTtbsHwvOCZuW6/73
-                                       S9nj1dOe+kVT59uYyecECPMs70wsURtB5sST
-                                       KP+SvinfQDchCrWp8CZfLF4qz7r2WnADNI3k
-                                       AYXRLRCcWvZ3uuWTLoSXZ4yVXGOsK9qSCC3M
-                                       5Q8QWaOmZ03kYrvEuopkoRaSOjl6ufhsIKS1
-                                       HuRhtEs+mYcFJ4/dOnCHx4j5O7F/brHgdTKB
-                                       keZFbqfVYowZvea0nf1C+HHVWXLE1lSOZK3p
-                                       OhkQcpCUso95orW2Mkx4ntdSKJ8OZkjSp08= )
+                                       20441127043557 20141205043557 59033 edns512.
+                                       QYXBCtuqzY2R7s4sIDFmSkhLqXXYAAdm5T3x
+                                       MddwlppybV0tEnkRdgWD+3VL2PAdr+MMFigm
+                                       OCohMdYAXOhJwW9OHiSkeIpYamojB+eBPDBl
+                                       63guu73QADTUmffZirWvNb79reVHmKkTPdLm
+                                       nEfEs7VEtTm1Wj60jT1q1RIkJDvtIo7mJgRO
+                                       MYKyJBCocBUSGGXoHCA+djXCqKiuLavQ2rBu
+                                       IGxXtB2Pf2Wkw/9xxhBo5vTrT1u+V2hFGMPO
+                                       vnODw0lU4XiSjeBrmMXnadrsx8DrM4KInwAL
+                                       A9VolAXXWjqvD3il54ziqikkjTYnOeyik3QM
+                                       R7UtDrLTLnAeyeL9rhLuBk2dnsE+XaJ2PP3q
+                                       iD7LiEQLDGGKJRC3P6odVb17e7q0mDtH2HId
+                                       VdjGap+W6mxql8aVrRHs5P0t/5GJmW83JbJi
+                                       e7W3Y1ikoimB4S6FPBbjadaUEpzUs806SIdj
+                                       v/AZoydoa/qOdre9Pur51At2dQNgeFhIL9w+
+                                       2IcN3pRjojTPrMToqVRqOySzx6OzvSmnydDg
+                                       PMe4yoqpzumJLQXJ2IceEg5rlLaRjMOBYSW8
+                                       VuqLMfEup+KBEg+nZv6mAmx1KLuIgO5q5ae9
+                                       tq0I7eaV/EPvBYxO7j2RA0AbtmGSUyP4ZzTy
+                                       FjIYfOqzwwPjONzLQ2E/RsbS5MlIAk92aC0= )
                        60      RRSIG   DNSKEY 10 1 60 (
-                                       20441126192400 20141204192400 22704 edns512.
-                                       2ysM0ypFRz4Rz7avAvr52OsfvWMo7yTT21+j
-                                       QrRYNH+jipAKSg04cJ93wtskPUZhMkCzgYwq
-                                       2fSZUyuPZUD9bQYHfb5Ekvt9qsyn6HFFWbEp
-                                       G+06tscvrROBcMGzM66BlNnZJbj5dw4oJExi
-                                       KSoC1s1qvTgwWQ753smJo5QDsdJxxYDZ8R34
-                                       UVkdFrV4w4sHEsrtaiZnMyVR/sZ8faS41fHo
-                                       lEuXv27qTRclLkPVQypJTpIO8tWZny86XWlB
-                                       EdxgzIZmKMzRYqomfoOdW01/AkCRnltHNVSu
-                                       CRIaKoUTFuNYgfiVEuSQ/Yz8fc7rmCc1bm+h
-                                       jm98RrZS63KJvjLqWbTseZW5SMygOOlbWU+q
-                                       Oo4IA4CCM5XEV6kki9EZokkGOpyLyHnISb83
-                                       vLxJAqkdHHMxucX6+kqHX9qy06T7bnRqZ5rm
-                                       WP9E8/BefZhp+w7EV7NxM/J/Pf8HvGTqtO4I
-                                       IOxl5BUrLe4F6tBUNnYAYCGNeE1HSroXzdyl
-                                       yOJ3aZB2tCO/VGkMjClavh5d+usI8m1HHvez
-                                       IguPN2okHhxq7ajB3iheeD9Z5kl2AylOUETl
-                                       02JDsVQJ5/289BP0EtxfvQO3sPse/lrk+89f
-                                       Xq0ZUUgqq1DPTf0YGEN7pwymO1FecM+4n/Fz
-                                       uu0Np/qfMfVDLhpK5pn+mQRGCe9KwDpkaC8= )
+                                       20441127043557 20141205043557 59034 edns512.
+                                       V13nqWSVWVdkN/RZnJ+4ywjju3JoRbQrpnjL
+                                       RKPi4U8cOc1nnh64y4RvaIe+2TI1hiVKYHfE
+                                       9XGXZb2zhxrWMq8kLjpIRN+jpItoFXu7rSRA
+                                       GmiHz7v7PW7+UHz7fhGHKJuqQuodBokTlHhR
+                                       /0mNkaDQ96OOyG/aLOfj6Jj16KEBfyM8hALy
+                                       jwWE8EOKzV37CLBWawazXVY/EAP5jzQuAaot
+                                       SPh3wFuJ2L6rB4lkh5IwaeXU42ip7eirT2i5
+                                       V9W2v01UWbQ3Jab1DJlNwVgNGzXYvCvLU9zG
+                                       EHbqVcDuMErOqFzePLhK7Aqh8LIB9DnQlFqE
+                                       2tyATJb0hcMetMNRiInJFGPMekdNiTguhLMC
+                                       GyEjzEJdiKT0XA/lVF9MVyEqL2HeSj3NYRe6
+                                       ScfqAZArEPgu+UI0CaiC2eR8KdQCPcwUJuNE
+                                       mNdv3F9CnNvq3w72Q3TJpOaFzuToQh8JleTN
+                                       Ty3zRkVGKWSDNs+px9sedJkRpaRyVQVXJruT
+                                       /boYT8HgK8R6PXIp3Ujud0SSlVjPQrlbxF/P
+                                       5saDwruBkYPRKNGBC0OVcHhI+w1N3gkp59kY
+                                       CqBih/kazLfWjUXxc130OEkPhmS1zUEOjsl2
+                                       fmRhKrlRmPM1DyHqFiEVogj/nfZ+VCiO4bIx
+                                       F+vVQX+EqQo0p3bRvfSxpY/I7fM0P6/cZlQ= )
 txt500.edns512.                60      IN TXT  "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789"
                        60      RRSIG   TXT 10 2 60 (
-                                       20441126192400 20141204192400 22703 edns512.
-                                       pyVym8pGT2cH1p2eowM9Lhlx2ftIZrO65uXR
-                                       TQuJXLY97nJBImwcwCaOh6u/CMcxrHyS2Dcn
-                                       G9oY41QVjCJvEM9TW7uueiRrVyghrCFYYqKK
-                                       U8l1HZxeXqc3nQ0lLWXR7bEIUW6eMbymM4qW
-                                       uY2Zms3P80OKZnvHrNRms9RYBXHJbntVPEXy
-                                       GRv7a811sQSQXJ/+F+LiCl2RwZuuPEkEBYGS
-                                       3c0Gk4kQ0O8/IAn/poyP+kWz0J8Hwt2DKlHK
-                                       CXTFozYY9J1ngcc1w9gf9+9l3YhQHaNJljV2
-                                       6fT5ymztjhk0q3cjUIYoOKDNy0tD5znRhKtD
-                                       69KLgkPkJrHUUV01FHZJZzTWHOjg02XnAgLV
-                                       HGJiaKQuZ4l7GEhBf9HEgOD5WQyDPxEeSOUf
-                                       kJzzcO1EpQHUew9vOADj6xSEMqFH/SVnz4PA
-                                       Kpb+bxjdXk0fvYLwYWXAJdh71Cb1M/4qBooZ
-                                       WjL9ag8annsGl3too7h86zbRhXggIBzmARrJ
-                                       W9tVUuKzm+a9NHMpUWvdyIdWS2ohs2giuzId
-                                       CSlX5rXrSy/2AT7DFQ3M0ZoZkNvTCwHOtLJz
-                                       Jhtm5qrV/BZmUVk7irgFvFaZ1/ki0l7m3tFR
-                                       +zJo5hocLNcXF/TN1dCmB1xVDiFnYk/eP73P
-                                       K4b0x+tOfTAIf40hbwyFH0KtBrQButsQjd4= )
+                                       20441127043557 20141205043557 59033 edns512.
+                                       OtzlxomsR6xFpPI19gEpl5edx+rbqjrhR6CI
+                                       zWiqpjHv5HhdydRPIW6M8KSuBDK/AOuUCy1P
+                                       9qOy7J0QUIGK8Ds4wcw09VCqkxImVu6w7e+z
+                                       HoaNJzKT4Oxf1LLrvUnitqEbS4cME15r+Fj4
+                                       cUlkpSZgttMcGhV+VPEiG3z56KzXNAViapJl
+                                       HaV10Be0nx0UtEpftkAtgnkXwNPIaDrbULUI
+                                       tvD/uvu3ICV5gRATriy3RcanB9c0xKEO9NAm
+                                       nbWQD8a7o+zs3OqqDRcZqvq0PRuz7X8Q4T/n
+                                       fPYNkGoph1etQTaM1F6V0gP/2Hxv/oQclL77
+                                       IQSRZ8zCZJech8qgBlEHgdY/4hqJzJtO98Ha
+                                       OfB7ixmHp9fE5dGInIot6eMKN+Utnl2KLjjn
+                                       oO05gh9VESsgDIOM2amN/aViP54ad5DFtJni
+                                       1mLRhV7FmBD2WSkdZF4/u4SvxjKYpWF1pspO
+                                       xNPhgaavnAqkM361P0kV13StLXzff9g9QsuB
+                                       S8Z4v0Ypiv4s5SlXsKeTpa0Y1gKXf8U1UZGq
+                                       /+2089ZurC8S1D89m72M3hgP80TDnLeuDCHY
+                                       /3tpU4V0yZ0u2riJG8/4MVFeeo8suk/z2gq0
+                                       nvs3YD7U0XB5ozLUlnKTT+NK49lnv5xoIByL
+                                       +ezP5zXMz4D0KAfKk+Wn84RgYn3ADABr1ZI= )
                        0       NSEC    edns512. TXT RRSIG NSEC
                        0       RRSIG   NSEC 10 2 0 (
-                                       20441126192400 20141204192400 22703 edns512.
-                                       aueaaAboAPuBBT8Y1zd4x1jv6fr14H/jp7QB
-                                       Mkexh+vID4C4+crx2BWOR3k1aJObAFa8P7VR
-                                       UQuR1kzIAu87/2JzZUhBbjHhv2Z4jWOa9qQE
-                                       fYyozNRs055VnF4UC714evpOtMVV61rNic5U
-                                       YmHqDj9nDNA+XleySv4SkX3YjdVKhOZE6ReA
-                                       l+y9FPO9Ep5v4Kx9LxmtdSsAZuWIe409VQ9I
-                                       6IcUxmewpC/3hUiDHdi3lEYG6+cQW2zzfE+p
-                                       Do5BfZbSpPdKjsEtdv+guas+ciAm/epD+bA5
-                                       WWOtxeyomPwmmFDKepR19PcAm/MXrOltRs9l
-                                       pPZgZhZAHnzFod5cv293TYSQgITtFV+hju+h
-                                       +qF73tOs7EmTpe2cLdfU6otvoKCjm/MkyrFd
-                                       5dP1HEEIK2VUEjo+MblYtIkMVi2vCTm5L07z
-                                       hIwgK4rg56hFyusjmHY3pjGYzPIlieE2roeb
-                                       JtzpRxYCzJyJGZRJP7sqQaAllor9pBkBtV1H
-                                       zWh/jCsdCU/DmNiiGYlmXNdPZ7IfMoFyryF7
-                                       BPw0JnU7MMJs66ChHvDyaoS6/yHo+AQ3II/x
-                                       Dfd3LQ3myVoGbwAPQeUN7SMg44OkI6T7OLaX
-                                       KJo7pym6xpAVSxdjIqmpOqIO4MAlj43OTPfc
-                                       3FoIJBrY2vjrZlvyII1/7Ee2Gl94g1bmqBw= )
+                                       20441127043557 20141205043557 59033 edns512.
+                                       nFZKkyTy5O+je3VUaWt/eqVDqPtpktHFJt5X
+                                       K1TJHvRbuEanNMJoQJidS6ZhawgJhK54qgcM
+                                       klsR2n/eZ61Wbr1dpUscI7PNWGtZThW18d6W
+                                       GQjfxvLVSi+YVcSlAt5Jfc+4KZ+Mcte25xOD
+                                       DJMWVXTv2AgKt9T7JdOQTrpiugkpflct87FQ
+                                       95POqtj5j72xnTvpjzaDcL22rD5q3kLQlQ14
+                                       xDZV1hOgqCYgbYVgwxgxigWSuWkKjiHiYR9o
+                                       YkLPkWHYNn7aDDFpAve4MJXRpuwPP9/TLQKH
+                                       hV4H8q7CZK30uKpUqy38JGTQzr7FDgTekGCd
+                                       InPLwSrURIkn3rVyCRq7PgvSBNXNW+3h9tYX
+                                       gMj6FDNyroWRH1eWmDFg3BmXKu6hUxrZ2fOk
+                                       wyhJ5M0LtZinjd5RuHy0CCKFuFA/Gv3Zga0m
+                                       vc34auzfwLnQmJc94j3JfwUGlMDeKtizKrhK
+                                       PahfCxEMVhY9E9LKx0UsbtJJ1ZgeNsm+zF5E
+                                       6TkzYFc+hHeYM2/Jb2PVxjTmOkbfRoDmnRCd
+                                       9Fus/kFtbgUK6ukpaQsNgdkwtLT8++FiaJUs
+                                       ion91SQWK7wjW3Fm+zMA88K/vzSQtv9mGUry
+                                       oZ4qpK1PFpafpzUVODx3HSS5RCPGZzd4zuDR
+                                       6u7jgRUH3mokpudb4X1qt9L6tVyMLPqAaq8= )
 ns.edns512.            60      IN A    10.53.0.6
                        60      RRSIG   A 10 2 60 (
-                                       20441126192400 20141204192400 22703 edns512.
-                                       keJKHX4w4MtMfwGM3RIVQrHbjIiW0W2qKyqX
-                                       jJEF2AYk9nHKFC69LQpCY6F1asCDNtljPc7E
-                                       Hv/bQTsJQnLJLJOXUTzll/3hcpkD2uhIxGsd
-                                       Ch6WDfKcAsOpPJRUVEOSMf7QgHZA2QMn9FPA
-                                       8ruQQ75D4FXzER3YxS8huPJC8mCz9llliwq2
-                                       R7Befcdp8gAaxl2SiQde3dJilpVo1P3HUuAp
-                                       VFBvt9zkhv/vSCq/Zs6grAxlXKEQbEXhjUHn
-                                       MIRnXXySkEsud4Rhw7BwJBSe36YzYhPe8oi9
-                                       xBeYE0XywH6hlXQy5n1KEDtRCFX50RIJFDgJ
-                                       S1jH0Xqu8rAqA/nBL8IIxgN0DM+93T5PGN3r
-                                       hRbVuQOtBG0+cjYDL0UCPTK1hUWiKi2qeJtZ
-                                       nd6h8pz7pCGmtAl6YErNZysy+Y3c6zEwurSh
-                                       9wk2Z+YlCdqHeTonoNXPI3HhjwC9tgAqMyHP
-                                       73QsLJecB0m6pSRntv+4R3x+7Ev4Pq8XRcCQ
-                                       n6d3K2TSmCafNBoPJG2JX1uxoUHmyo1R90j0
-                                       sRjgVZxx6BdbMZ6fWydcbMsuNT0G3h4kx0tM
-                                       6edfhCVS5BNCrOpPzerJWep1TDpRyCTO+A5R
-                                       lJvwoYUNMk+bXgNBBs/8c5t4DEQnohxsUSUW
-                                       151tFsrAJAF8v/+GaIUgE6PI2UCDSnTwsHw= )
+                                       20441127043557 20141205043557 59033 edns512.
+                                       BLCw43y8QO0QFaQpBPbMgLk3iIStBvp08qp6
+                                       wRCslXGRNK279mlNd29ZROVwmU7jrNd5jTIt
+                                       KhYlO/9DX0JMuTrG3W+tsGkGNqx3LNsVt6/U
+                                       rfF7iAxzBjnY4MRv0DIIKJqgEuz+A/vmbGQi
+                                       L0QxukaNPycQUEnMBbNmVvEi6uETW0yMPugn
+                                       BPg2jSVbrd/lY40K1yyUme//q8ljvneU++Mg
+                                       mmQ2crmINUQX3h4NBmXoOun0T5hehqiSvz4n
+                                       TUO9rhSMWFJxCvUcjndha2MBEm3/H5MhqHqH
+                                       vEFlL9/yDScmwT6FW7yoVtcoQzPymgimBIlB
+                                       SW75upaIy6EQcx88WhANB+oEm3JsIwufcpUl
+                                       jwe7taxtCV1VYxqbqH9ynEzbUH956pE6gsvW
+                                       1lYrqzkmKl1l4YdJEr/Um8daVT88OR8ClP/3
+                                       v3OhAjmvnzl6WolaMPARCkFtswK8Awd61qDw
+                                       T11lTu7k0jB7Xx0JNzP2L/ehPaLokctPvECl
+                                       lMbHUryP30VnfBahCewO3/15+sUEhKrrlCif
+                                       G/MSFzDWbV11X1ItEQcBWgfcvhNfmAgQ0bsi
+                                       HgrgUuFIkmosoQUPEqJFCggTMYNZ769zEv/a
+                                       9gJpLo5AmQqZYCn0sOw59IgXHUOsDoStB+WB
+                                       vAl9Q3ePoJ8wd+4sBC4KJs++Hw5pJ1oU+ks= )
                        0       NSEC    txt500.edns512. A RRSIG NSEC
                        0       RRSIG   NSEC 10 2 0 (
-                                       20441126192400 20141204192400 22703 edns512.
-                                       rCuaQsSjovf8bD3Ftk3x0d8wO6/h5YYrJGlM
-                                       ENA07ysh5oQ2J63qQMjF1rZIk5MPEYoZUYmg
-                                       /J7cclKoV+ucVoPbEJmcEWqKvu1U8/o650YZ
-                                       BX7uFPayzsoc5U0+W9PAtcuxtg7FBhL+B0Dd
-                                       vAekyWq97oizupM5WJ2h2Gj+rKobejb1zLLz
-                                       CvpEN8rs2HqJoXN3/3cWMl1SLT+JKwKSwxQo
-                                       XBjV7JHT5u6LbFpLFn1y0Tdz3e3eneQX+6W5
-                                       kREXMRqna8UbHWBYDO910+iCKZ3GSuI/iMz9
-                                       2HhK+lQ/xV1cy0kFf7e6NqKquJaKddk6Uhx6
-                                       pvyr0aWxyuS0W14hl65B+UFIhWd/oBup6GLn
-                                       VRZTtx/V4+zqfzJNhCAFfAGKPdz8xh9O3v9e
-                                       5gp9AuIgJQxuSPT3RfM0iujRSyLxPFR+uEtY
-                                       lA4bgGnED+HqDSXqK5ojyzK1YjhFqO1NhagI
-                                       Tdh68ifLhOfassm+lWuYXkwiQr6JBF84XR3m
-                                       Rz75z+Od0bt35vqtJXmOMe+577QSrf/YA4bt
-                                       ypHiQ0g4Uy9iAKQbvBeg9MWjjy9eRUQ8s2/h
-                                       /SJPpMUgsXe2Nd8qgX5DQfLASshfFo7zpZ7U
-                                       MadCO5HtBmpzCIRN4dtPliWyz13KZg7TfTcw
-                                       00ZDfS19xR4EGIwGVw11IjbAo0Hk7HTDjeI= )
+                                       20441127043557 20141205043557 59033 edns512.
+                                       DP0dAdDzZRS91BYNOzrHPbcGRRDTdkk+fAHi
+                                       Zb+kQ6Eur3EbXrrc/zH9UBmqircogWtOk8iv
+                                       h83G5y7Ry/tKQdrqb2igbkLo/BFsyeLKZFLh
+                                       DuWbSVvC1Hhs9tzFHVcH5gUObmlrj7wQd3T5
+                                       Iq4ZHbQCHg4OWZbS2gn+90uL/G5OHncE2Ni9
+                                       ELp3puFG+mO5RJJbF6CpU6vVGRs+kQyHREmj
+                                       i9kQ6C/12SHPnuIW8v/IP6EUSNb92mJk5n9P
+                                       N7EW1E67zCrHSh0rURz627hZRkpt831uod9H
+                                       Yf/Uj88zyTkprnBYdflydOzsjBiLMJwMh1CZ
+                                       BQ4EkEuRinkFeE3fmKHzv26S/HSbhVIS9E2z
+                                       nF7InmHB67uJvqj0oBTP2YFQdrDx5KWNBrqG
+                                       4wB+OYnc6RSKrJWuvzUzyK4mCK619lVhgMi5
+                                       Jl6kBo7swgeriVhEODJVcX1ZEkd5WUwkpumw
+                                       JReLYStQKM8AbulcLQ4/bPwurhVPDpoNK6WL
+                                       kuv0MXijsFWps43ojok6DGPD01c7FRWxAKZV
+                                       eywmEIGLSYHDnWAzVIErXuO7RPfvLIVlZJzq
+                                       nzVj0ZLDh2BrrwbLt5zoETY5Ka6d6/YUXJLQ
+                                       Y+lxqTaDuJHnTqF7vcvxdkjYtR6JhsA4nfAO
+                                       TJHTtETInoRdXBTHahG5Q6tkj3kbhqR7dBc= )
index d4ded5ed362ae10ce38f9f9f0f5dd2504f48e458..87c8036444aadb0d3eed96997c60ce44263a2016 100644 (file)
@@ -1,5 +1,5 @@
-; File written on Fri Dec  5 07:24:02 2014
-; dnssec_signzone version 9.10.1
+; File written on Fri Dec  5 16:35:58 2014
+; dnssec_signzone version 9.11.0pre-alpha
 edns512-notcp.         60      IN SOA  ns.edns512-notcp. marka.isc.org. (
                                        1          ; serial
                                        0          ; refresh (0 seconds)
@@ -8,241 +8,241 @@ edns512-notcp.              60      IN SOA  ns.edns512-notcp. marka.isc.org. (
                                        0          ; minimum (0 seconds)
                                        )
                        60      RRSIG   SOA 10 1 60 (
-                                       20441126192402 20141204192402 22703 edns512-notcp.
-                                       SR5p0yh8vXfjfcGQGn5/FvvMgruFRRdlPKxm
-                                       oc179w11rpfxSI2JmV0TLRzbohckAYvAC+04
-                                       Og+nI8AGM+oermJcxoTOTLNfn2gBiTPsw7sf
-                                       Uo0A4RQLj+LJtz+mlDF8Uc1lwm8EWBVKS8/o
-                                       HO3ArHd6j+zqwKJLonC7w6XOnUUL88GJ+WXW
-                                       pEK0acjW2fFAE1CV/5FgiH4u3Wn0auA43y6s
-                                       Otjiu8mDPHVrX9pRzKjDTQ3BLXKlBuZeO0MF
-                                       8xRdIpA5pKU2hgFZjTcwa38dJ2mZ3cqrQZxr
-                                       2uu1E/4B33w3aRHewUa+ZlXpmA83teCcGJRL
-                                       2BL6+A3yiMy0FcoUqdUx77ICpDf7AYk8Pma8
-                                       8LogEnMEW4QSGb6VoVM4MCE7T/3pG6iDuHLx
-                                       gw57hwriyHpBWI3BZrqv/9o5cl/xJPXjt+yj
-                                       wv/ET2usk2YOSzHu0ZgGiobhfg5rr8RvXYX1
-                                       3hZUtHiNSMeVIsyoE0ksfzp4rpXS7aEPxEtV
-                                       NXOh2efbY6IsM6elzy0b1YB9JH6f/i0xZ9Yj
-                                       loyUpq35WM6/S4v3jnPsP+I3C8EN/F/ZXlv1
-                                       v31s/EK7S7jF1vBdVrJebeunLiY52C/hCVNm
-                                       f9C/DGQTegXKBjhQMdFRZYWK8le1br8pKMFd
-                                       NJ48TvpFdCQOBx7wrhuyfq5f9Mh7uAVuNzs= )
+                                       20441127043558 20141205043558 59033 edns512-notcp.
+                                       ESBGgT1akISzDYasx1vDn4479d3zRZKvHIEb
+                                       OJIn2UqPVl6YDzcuUIqRwvFoqV7/eT4tllJ/
+                                       DSywHFPKV5t42BvnF2bEtPJZb6GUg3ZCqja4
+                                       CEaUNtqd4xyIT8BMT29w+d0OE6wbjaF3F3rS
+                                       RePp8RXde62vuR1rseTYLCF/V3jh1RvZCf3b
+                                       HnmavjU7Gzu6SG1IyBnxxJ43lvUOpKPbEiLa
+                                       H2MTRNzMxQ1CB7nv953XuWDjlqv37LqzQgt+
+                                       qHYC+Tjqx5KVUMewOAbcc4sne+ohMgz9p04h
+                                       JS3TIejgOfybFcmsZnsiqPkR9GKlDJ/L6hBH
+                                       azWKrnaHgS5n/j1rIWteV70E/VKXmiVspWkj
+                                       asOQM5F/7+RZWBA/bVsJqQOUdt3o04h70bQ5
+                                       mbPYY3AFpcpfPRVHoPAhvhMd5jdQoAY2SiI3
+                                       Uehleuyt3K+tDPCdgRhkkFwI15OBH1Jh2Y59
+                                       7jvcXLqgI7T9kzUAbRpKOpR3+73Sa+UCx/Vw
+                                       iZqr03mBT8sSaZR1Zyd9y4b9yAQ7W2gHY1VM
+                                       0N3lStdS938bwhcU5gN4ElkqXrwkCgVP8BoY
+                                       3FotvKHUcLmnvrfKgnjcwReCJ66GeI+i205x
+                                       NcbDnmSfxYcW4VsLYA8yoQM+0NWmBBXT5JT/
+                                       ybAmt683yRwbFnl/YovtNwXtNKMb8+FKJjw= )
                        60      NS      ns.edns512-notcp.
                        60      RRSIG   NS 10 1 60 (
-                                       20441126192402 20141204192402 22703 edns512-notcp.
-                                       fkupVLnyTQyMoV6dX6uI7GIgwC25HfZHRkhq
-                                       t9X54gwAesym2K7ErfzXbYLBzntPo5aMse1y
-                                       8zTpE68LMK/pqnKRdF5bcfbrn4iFJ070QoR+
-                                       uF+dbE+fUGOly2ps4+63a2qhzzSghC4ibZjj
-                                       wGD1gcJ5etO/BjTInsTrTexVYjIE6B3KwC6E
-                                       SB1mUqZ6xQuHDyGHfCtHSXAEpB+7T9yu9bb3
-                                       MOcvOnue5DVknp/vCH+Gdvo+KBf1q6bDzt3s
-                                       RRz+PQ+lZSeWplewlkMX/M3yTUyQS4fNvd0o
-                                       jMcqsEm4xtVGnhcwLpxWxTKlI/9q9C2uSX4K
-                                       F8K+S494zGJ9Qn/0Imf9+hv5/+lD3OwyCVyW
-                                       k8nEY4MJ9UH/XXvrtJfDKrDxTnbUD+QZaf5y
-                                       WlbEDp5m5LbqI9reYCRkL1ba5Px+Ms9a3sOq
-                                       gN5F0a8qYWBPiz+f/o+WGSv1hNYASzRYs/QS
-                                       mjy1qfIRC0AO2VYgw6YLFnKR+0bI2+QXDFVi
-                                       oNCwng6iwLCqLS5WPtTGusaE0hL7jRlJKmkp
-                                       FR5PWj866DvMYOJVcjRApjezMtS9eTjFcRi1
-                                       uKn+JzKxM/hLfyMW0soIpAyNmTnqXSeigW9l
-                                       fPuOhXvG45luAgyCJ/EMoQyah+H2Tgqma5qU
-                                       LD4BS6UrjOyJqgaP4NErS4PWuMTq1XKGVlo= )
+                                       20441127043558 20141205043558 59033 edns512-notcp.
+                                       FLwTgbguhIW1UHjObRRogJg6RA5/32Sd7623
+                                       +btt7TqXchUMJyQsiIdZ0g5+NKQNawnhY4CV
+                                       NwNTeEiW55fjrZJC1A+nwBXGeE0MP9a2ngkj
+                                       PNK6spLXe67hMqudgbdp3toSfx1M3jI4PJ0Q
+                                       ji1UryuIqleR6w77JiaSB55MpoVDUVui/y/Y
+                                       VYHJ2z4wVBA0upoLegE5S9fWWpWIuD8aCU9y
+                                       +WMWhUd92Jm1Z9NWc7M9cwPp5/CAmitV5wjZ
+                                       wWu17WytNbwpYBww+DB72CrvvMZvVw8fcbdC
+                                       5FIxIr6Ed0dNjfoakcPTW5EtDTk9ms6AjdMn
+                                       edNRZXgVuGZEenqmmsfuHFvNCurrNZJHG/je
+                                       xm5qhN9N85pmBILWpJPArKxwC37i00t/28Wx
+                                       FY7H2a7RWgtHkxuvnh4pwpidr2ZD+L5hQQ+c
+                                       O7CpzQMmS+dFOLF4/FOs6d/Do/7rxs1plUgp
+                                       NjOW3ts4tK1OkKPypXovuMxyLQstrnTkCNjA
+                                       pA+K5OBXdEsmtbIhXVAlARcyXXoKnYVFqd9c
+                                       Czu0kS4xy8B/auWcBzPMVYuTWGhNWemm7J9P
+                                       0zOOB4n6nsaM7/UIoWK7Qx1CJLLOiWdEYNur
+                                       ouS9X97/LnsRcO/SPWB0aBTJgsMVQBkDB073
+                                       0eZBJmUIAMidot4okbC3hQ3atQ0pGhDaAIo= )
                        0       NSEC    ns.edns512-notcp. NS SOA RRSIG NSEC DNSKEY
                        0       RRSIG   NSEC 10 1 0 (
-                                       20441126192402 20141204192402 22703 edns512-notcp.
-                                       hCprexvLdl7bWTJ+b6qcBPEH6h4NnAxz9XAe
-                                       +sycXEIBuAxDXWz043rxFHKoZYFM6uJsolFD
-                                       0IMtkuXj5nsA6y7pyRoKvHqq/qJwdFoZZ8TV
-                                       iOenTvgVkyY1TajyA5FrwoOoUApzBHQ/pgrn
-                                       u9cZ081ZW2vvDnQs3hhyVIAflJHhss3ZaLuv
-                                       C5DJSLE0Z6bihgE+95FuVJMRC7q2T3Wfc3JH
-                                       JONMxrIAJZvHEQh9IVZt28Ra4WvZL5DtZbnD
-                                       +328IjoG45mQgEqG2nIWDRC1JWB2J3Wdn9j5
-                                       M9hZzxIRs0alZJtcNBz3mt/zSebbKndyKeIZ
-                                       0DSjXwkP1j+43xAX45hOuhP9J1w+3cLQ1irB
-                                       bACusrk/slU2zEB/aMyccyqNk/V1MlG5bFpx
-                                       Vx+nYYizNUsV1+bgqRpfCysBNTdilNGXwDyF
-                                       OVPx+RaJg6J4dJShNVSMchoVDfmgH3lRmgna
-                                       11DKk43tw0ZQgfww1LhkotL2oxtBWlXdpmIr
-                                       kTTVz09xSFAhErfanDkeDCRmIoxOnuwNXifx
-                                       64nx0AOfftRoEPH4wMSTata1r3+a+wctUyEu
-                                       f64fLcoZkWwoDtEFwlifeURzUYARYZIXQP7z
-                                       9NrBfujJzG9V2vB8F8F1V0wgNr60teNWoKvo
-                                       3A+8HVgk0p+K0GRNbvwbRjR7eAGeCSEmC9s= )
+                                       20441127043558 20141205043558 59033 edns512-notcp.
+                                       JEdGV3CAGd23NG76F0B6FT6uz6TNWmP3Ecck
+                                       aI8djQLmnhu8vV1eYf4JCAS/EBOU/gS7iP+R
+                                       ziiJ3bPrvA1JSJhieTGw8K5IplUSTGHmlaIq
+                                       PfKRqN41mB9f3qI3PkN8h0Y2SbLKjYMIrHG1
+                                       1R3LubcKwyEc+Y4ylqySaYO7JPcGznvWiu8k
+                                       KLcvYsBOy2V9gjY2Q1BYP6TR0QyYMXDht7cR
+                                       27YSG2D+LP0HDIFV4f7T1SLjGmDl6ROh2Rnn
+                                       i51tnK02IwoDs207RC1ExlVqD4n/3JZIkh+M
+                                       c5FoPK/fV6IRz5cdwLk1Mv2ovihxPjryFLdw
+                                       1ULSEc7gK8EkYfedv336GgZbDEWhWQgmVhPE
+                                       h26vJNF+ZSqWlo0tkKLAKzbd8yEguPf6HY1e
+                                       0v5KVnUV3lINJIOmWtXDZNXho8WzA4WViqqW
+                                       yn+nTnRBg/20WdpHEhVDJKywQvKY6zsXMN8G
+                                       J++lx6FalaFdgE4gNcQQsu11VQDnJO90kKBU
+                                       uVRkFQArPj0TEaUWq+ZC1eJLKtraO9w/5ybw
+                                       LaIKBJBAcyU2jy7ieRc+NEY6rE2XOfJs0kEa
+                                       8q5vM9/AFbX01yUEKnYj2CO/VhtfUa2tHEVo
+                                       JhATux63HBiTwhiYcyjfKhYcML2KoEYUCYU/
+                                       DAdy4zrs352EC3gVxagyUxCNJZ1Bq0wq+jI= )
                        60      DNSKEY  256 3 10 (
-                                       AwEAAdwTnHpGZWh3uhJz+u6h6uc8k7m7KUpH
-                                       d7PhipDP0GH9heS2xetSMKPwz7+dyY7um/9X
-                                       7U+24J2SmZDGclNZFCHJxg050VO3eHwwiGeH
-                                       hwQsAJdWUnpcjzByRet1yb9u4AVeFA5xPjAE
-                                       N3cd/xL4v/4WugefF1AqBvrEz/AAzuy9PBk9
-                                       oE6AYU3PlPtW6pxkEBfEjGJ0ZnpkuukSw75H
-                                       NfcYq1Nbhw3o/UXB1btqyhFMqXRxW+WaqY9O
-                                       OpKDdOBG8lUEwtlleR2y83MIO/SrRIIZXkeH
-                                       72pPhEYY/r3qtxQ28TjVhtGdp3LsXgBt1N2b
-                                       kQvkMvzoHYguJSpRxxmoZGTvHdk6s0SgOFJI
-                                       IemPX5rogeHDFNyc+e+6rFA/ltuMegJpX4N5
-                                       wFFe6sbZQXlS0qyvIDFoP1U5GYNvuTS8/Kz/
-                                       OKZj+HOXui5UqUo+SDXo6V5CHuSyM8mStwbr
-                                       Lu3UlWPQrpa8XrR+dGriRrcJXoxfGiVPF/TN
-                                       4Bcvkg6BIlO5JTox/gOy8fc3SIAVO1A3rRIi
-                                       qaPGQYZwIYQ925whn339aDeeIC+J3dcUMz4a
-                                       kDzoJoJxsQ5kfZjG1zMgFVR/OL0NpBjos1ZL
-                                       lJaxU/C8KnX2x/wj3m8S3EfZRc1gnEuiXOGV
-                                       BRLbo2Btwv9hMt59xs4CEkUyvK4RL/6Vq1A1
-                                       JfO3
-                                       ) ; ZSK; alg = RSASHA512; key id = 22703
+                                       AwEAAcEBkn/cuVhdRTWMHt19O7h9F4Hx2t68
+                                       u1JUZg7swLLvwfljqnNYjsKYk9EzUhIaYOAH
+                                       tVe7//cYwoVU4BFhY2DGbx1YE1LnKIGxfqpo
+                                       pFxDZC34TTl6jpoTP6kvj+XpeO0HfF2+DcyN
+                                       gnQcMGgHXyLWeRUJFt1As6o9tmsBiInGIZMT
+                                       E3/rANhtAGMLNzhRLN7CS/Tc5GhKaL66ueby
+                                       EYenEOAyDVgsuhr8Q9D5ka6xZmxzXFVswy2K
+                                       vsSxu9aoxVq4nACjIeTZ4GJy0v83zclV7hA+
+                                       5jlPDXMFtIpvwux5XALrNkUUPq+Fb5sc5/u1
+                                       41LcvdASnlk58I77HbsnfausvDxdYYxEns7K
+                                       9e9N85dwyreM/OGTmm8p4hNDngZESAea7MrS
+                                       CsJpOGn9XLkVe6gZnBgB1cra+ezzTSWn+4QH
+                                       17lIhFXYNjMV83df2h/gH3Gmthqnr9RgknZg
+                                       a8B/Czc7TeX6iy2gAOshKGyb6w12eJim1L8t
+                                       S5T138V8d6SigzxZz1raiJNolVhXyA8SbbDp
+                                       gBrcoEXN/WjwvWI+2ol5gzlqMeNw/F9SMoWd
+                                       pGIWkkNCNWBbhLWhp6qfhpRLUFwVys54LGOI
+                                       GSVRd9uJmc2hPdXoP8ephnCIeNJb8Zp6Dnps
+                                       syN0JaF815dKkOHff9GEjaiRLj0xWvtZSqNF
+                                       aGoB
+                                       ) ; ZSK; alg = RSASHA512; key id = 59033
                        60      DNSKEY  257 3 10 (
-                                       AwEAAdwTnHpGZWh3uhJz+u6h6uc8k7m7KUpH
-                                       d7PhipDP0GH9heS2xetSMKPwz7+dyY7um/9X
-                                       7U+24J2SmZDGclNZFCHJxg050VO3eHwwiGeH
-                                       hwQsAJdWUnpcjzByRet1yb9u4AVeFA5xPjAE
-                                       N3cd/xL4v/4WugefF1AqBvrEz/AAzuy9PBk9
-                                       oE6AYU3PlPtW6pxkEBfEjGJ0ZnpkuukSw75H
-                                       NfcYq1Nbhw3o/UXB1btqyhFMqXRxW+WaqY9O
-                                       OpKDdOBG8lUEwtlleR2y83MIO/SrRIIZXkeH
-                                       72pPhEYY/r3qtxQ28TjVhtGdp3LsXgBt1N2b
-                                       kQvkMvzoHYguJSpRxxmoZGTvHdk6s0SgOFJI
-                                       IemPX5rogeHDFNyc+e+6rFA/ltuMegJpX4N5
-                                       wFFe6sbZQXlS0qyvIDFoP1U5GYNvuTS8/Kz/
-                                       OKZj+HOXui5UqUo+SDXo6V5CHuSyM8mStwbr
-                                       Lu3UlWPQrpa8XrR+dGriRrcJXoxfGiVPF/TN
-                                       4Bcvkg6BIlO5JTox/gOy8fc3SIAVO1A3rRIi
-                                       qaPGQYZwIYQ925whn339aDeeIC+J3dcUMz4a
-                                       kDzoJoJxsQ5kfZjG1zMgFVR/OL0NpBjos1ZL
-                                       lJaxU/C8KnX2x/wj3m8S3EfZRc1gnEuiXOGV
-                                       BRLbo2Btwv9hMt59xs4CEkUyvK4RL/6Vq1A1
-                                       JfO3
-                                       ) ; KSK; alg = RSASHA512; key id = 22704
+                                       AwEAAcEBkn/cuVhdRTWMHt19O7h9F4Hx2t68
+                                       u1JUZg7swLLvwfljqnNYjsKYk9EzUhIaYOAH
+                                       tVe7//cYwoVU4BFhY2DGbx1YE1LnKIGxfqpo
+                                       pFxDZC34TTl6jpoTP6kvj+XpeO0HfF2+DcyN
+                                       gnQcMGgHXyLWeRUJFt1As6o9tmsBiInGIZMT
+                                       E3/rANhtAGMLNzhRLN7CS/Tc5GhKaL66ueby
+                                       EYenEOAyDVgsuhr8Q9D5ka6xZmxzXFVswy2K
+                                       vsSxu9aoxVq4nACjIeTZ4GJy0v83zclV7hA+
+                                       5jlPDXMFtIpvwux5XALrNkUUPq+Fb5sc5/u1
+                                       41LcvdASnlk58I77HbsnfausvDxdYYxEns7K
+                                       9e9N85dwyreM/OGTmm8p4hNDngZESAea7MrS
+                                       CsJpOGn9XLkVe6gZnBgB1cra+ezzTSWn+4QH
+                                       17lIhFXYNjMV83df2h/gH3Gmthqnr9RgknZg
+                                       a8B/Czc7TeX6iy2gAOshKGyb6w12eJim1L8t
+                                       S5T138V8d6SigzxZz1raiJNolVhXyA8SbbDp
+                                       gBrcoEXN/WjwvWI+2ol5gzlqMeNw/F9SMoWd
+                                       pGIWkkNCNWBbhLWhp6qfhpRLUFwVys54LGOI
+                                       GSVRd9uJmc2hPdXoP8ephnCIeNJb8Zp6Dnps
+                                       syN0JaF815dKkOHff9GEjaiRLj0xWvtZSqNF
+                                       aGoB
+                                       ) ; KSK; alg = RSASHA512; key id = 59034
                        60      RRSIG   DNSKEY 10 1 60 (
-                                       20441126192402 20141204192402 22703 edns512-notcp.
-                                       Tlu52WCdmN5Fo48p1oWthkt1+/nckuH2Z3F5
-                                       kY0EE8/ZqkdJq4uMzoVsMvpyYGOpeux6WT8W
-                                       6XQLyLm3Ph/vYsRo519O4kVM54Vw2mJMVW/V
-                                       IcnPzJFALs+QueN4sNK4OdN/T0X6aEAtJSSO
-                                       SWEj741tvzJ1NcKM1vQ14nLCqUmAL6Pw/CKa
-                                       ABLFkJZe6l7B4Zuv7QgybhbjlI2KVK/kfBSF
-                                       pvNvExn3xlFpTzT38HUyblnC1rEjLK42yIKH
-                                       LkIvs9LKIQImoOXsCHo//mdH2YQzdQJuHkAJ
-                                       dWLjh81uhTqF9W3EchMcQfUOkgthp3SJsryf
-                                       TvPxL34ccxwkd9unchI+oKQRB/kjRn85RBYV
-                                       cAJaqXgE0WVmtQzk1sFTB0N+LHjUNOxVjADT
-                                       T2KCoxxdyI0gZ5mBgo6RQdCV4/6vRbhwtT14
-                                       V9hYskb8N0Eg7e2LiFUegF2s2ZAoDAr8UU2L
-                                       iHuT6hakv43ddkSR+LJiqSsUcrlirT8LI06X
-                                       5BJLKnL4Az6FinjlPOHRFl5ISI10fvmYhz20
-                                       N3OhUl48+bplyBkwLAwJLEzkbBfrUBKcV3BW
-                                       EG9jWypVA+m/Tw5MtH6nZQLCp1Cv/yD6CEze
-                                       AJloHy5tPZ8YI4KPVUibIWVxIPtcxQ3ZjY+e
-                                       +cOXqByLeAbB5QmcoP3ZnAI0NRDnIPjnAJE= )
+                                       20441127043558 20141205043558 59033 edns512-notcp.
+                                       IrMpyEssdfDiqBDfMI5BVicoN5Upu20Bq0eL
+                                       BKXuiYBoRhBJhBnv6bovD0XWMf0spgPMHz4f
+                                       lgc0zT+41lQykiydy6WDLJ184E4If35ip9jp
+                                       Lj2yJGKUCr1FrvtciYPmYuH3wBIWl5wNlzJd
+                                       qH3P6nO3xYU4lgsBQPDUKvLHX7HIuSJB+2by
+                                       wbs3jj5Q78Ri1ELqKCCicfKbZwsRY9vexjw8
+                                       ptuJh+Y8kvhM/Yh7NyG5PByb5GRVVCCZ20ms
+                                       msBCiniPb/5IFiy7iUUiderLsa3y4UauTOKD
+                                       pKiOkBbB0XfxZtAsTZFU2W5seo6eoW3LfLp5
+                                       fD/qqUKyRZzPZaqJmp2n7egmX3WmRw11ILXk
+                                       LEuXA3P65YVbfqv08lZHz5K6xFhWsIJoBeev
+                                       2leb3hN6nmSFApltdF0PDEfq1ZV+sBpOBsKN
+                                       EekIGAYO28u3+7pjxMzMe5EMtDAajb9bZCT6
+                                       3ZTMPjlyT5ChtNRSIvgzgbfYAn1bigtQ+Opu
+                                       Jp82U+N1FRBNaSz7uw2uDAiE/cSNgfGIC7Dd
+                                       KBzWE6z/HFCzQp/gF8006AjztDq/SnyHWnWX
+                                       RzfMi1pE2IOT/GoCKOQwQNei0cG/ar+/ntVp
+                                       3yg9PbYdhdMH8IQ1GpwczFfD1/I2/wuOGzPw
+                                       1iFhd3dT9Sz2xgF/8xS95Ljgy8YgP+pmE3c= )
                        60      RRSIG   DNSKEY 10 1 60 (
-                                       20441126192402 20141204192402 22704 edns512-notcp.
-                                       e3Fn3zXhjGTRE4ZYY4pPB61pdbcFhkjEzX2a
-                                       f5EBVqWfXFG+DvrDfkeq4ugrbOOGTPQLTBfq
-                                       kxGWVlg35NBwOcavUJIiRMuOhaxWUJnVHx6h
-                                       /+6+m03L9VuJmLyCaIjcjQdjc4gP3aXwyavW
-                                       Mv6BsTj1qyGObRUW3XTeT4/BmhG2Hqzc7qic
-                                       BYAaJeSQ3f6909YQjwQL42GPQmKJVAbYO0dZ
-                                       DguBoRrh1GoBIdJvicuEr+5f5jLPyyWLDNQs
-                                       hr+N1RY0uOqIJVWeK3zE0kQGS2gxBl+vpT3b
-                                       PS4YXlb0ljLrgu3O+F+5yDKhwoUcyoj9VqEe
-                                       TYHX5igwIDMsVYtg4Bgq+rs+fX8skOiyfBgP
-                                       6keta9I5/WkONhQ9LbjEDsn6mpu7Ma7soWUI
-                                       YaNaw96BzXfRAUGRROK4/tXao9wwl8xISnhY
-                                       8Wx9TbvL11tdHG7fiLXXUbQVZ/gLSZfVby9b
-                                       qOr9mTA1/MgktlYDyaK0vLEqPlvTJt/VtF6x
-                                       ecM91nZFTUgJ0MeavDPiWGBMepTR96RpRHnC
-                                       UytRl4RGnsdn6JQd2DEkk/uO4i48y0lyCEiQ
-                                       QAfFijH+yltdhZIEx/haB1vd00aUfBDdNDyx
-                                       OGH0mjABJ21WdaSaes3q5QIhTY6GHBqhaETQ
-                                       hRkqzBSYZNj3mBlVP3G0+GuXIjYIoCCuAKc= )
-txt500.edns512-notcp.  60      IN TXT  "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789"
-                       60      RRSIG   TXT 10 2 60 (
-                                       20441126192402 20141204192402 22703 edns512-notcp.
-                                       L5mBYtRAAsptWrFSayHrg321Lk+UjcdTjZ2w
-                                       /YjtQOq4vhfLC0I6rRbFUIvZHGWVtn6BXLhf
-                                       4QRFwv1YrgRn0rFTFsUfLRp+/TXiVS4Tdh8I
-                                       BLeXs/NahZzJnkQCk8Y+FwcLWsPszyvWVE3K
-                                       JqWCYil/SIJX/OOjeqvjigLNyTfqR5EgEfD6
-                                       TfoUOSYpav/0Lu4scjunC6HSqmI+dGTmAlF7
-                                       AsjF1gxIDaK+dK1LaX0eYYyW51snhz8HlV8b
-                                       kuyYGB1Ntks33WyHEvEDp310ovrGIYOqHiQI
-                                       KC1FM9bSL7H6fI+fiWd+ltRFG/qW6Rmy8QOu
-                                       Kw0KdtX87PBKPBUxh5FeMym91YnN+rlv7BMl
-                                       sftjRQn0LhbmbqoKk5NAVgLeJgRHMr+UWiTy
-                                       PlSVvCO1NFQCTFF2qFS2BLboVo+SZOdyFK1j
-                                       RIe7wNrU6UbJwOWIh8+82M6SeJIPkuAkCEPJ
-                                       9yUUxGEKGyyzdL7MAcug0eLLkYFP3RHXg40l
-                                       zMSzwySGhdWXQgFwhRO35RlWmRrKkH+CrLKK
-                                       I7A4sFS1Lum3c5WuCmh93PJguY5Ry8uNbM9x
-                                       7vQHtUOX9P+qW8Nc11tuT1iDsSZL8n0lxFgC
-                                       06ABXxO2ZbJ3oyRS9AuIXhS1J3kYG/oN368d
-                                       4Up6AQJ7RGbc2tipXWA9JkVuWb5nyjHSor8= )
-                       0       NSEC    edns512-notcp. TXT RRSIG NSEC
-                       0       RRSIG   NSEC 10 2 0 (
-                                       20441126192402 20141204192402 22703 edns512-notcp.
-                                       dE8ttS8t4l8hD4O9f1lfUd+gHbTTs3e7k5h+
-                                       IruGMhav6do947pIooWoDdMCBqLt0LaXqvyU
-                                       tH07NMFiundqhjTx3kOPcYeH2nB9mwyqbqUg
-                                       TQ6zJ5xRCzHcrdL2sUAwoAJ169/2XCdVqBfw
-                                       lSu82hA8Je8T2Fu2VbOgE7qe3ONmW8aUsakK
-                                       U7RvaY77y2houd2DPErwn0ER38XP4AjZVag/
-                                       Uk2k3STRlRHxlEOrJztx9qyzUcMJUBGd795k
-                                       rKnhTXxeDe4p4EBOf4R9XVKDjRXDXZGjNagK
-                                       +a5seTaTyrczSspJ2l+tIquhqsaqlQWQHzJd
-                                       gZRgImBYJ4GW/J0oDUj4wqIkbbr7rw9m/DWO
-                                       d8niHhAddGbgu4HLT4th7J0OnNGbdTsX+81z
-                                       uk1PgxCXqepsWGhMTBzfB4MrbX+CMdGHjliX
-                                       NHksJp8gxS1t309qSWSDV1xkNwnR1E1CXo5W
-                                       Rt7ikRexJxCtHU71RTruvWddanJrn1pM4/1D
-                                       pa1Pkz5sf25kHRUeUh/0mWR51Kocp7GvRZ8c
-                                       ULarwuaM8zwC8D0Fe+WfQPOSsCbiVdUAauCX
-                                       35hcKR2sBz0GwB9EMfTl/OVL4Fz4Ao0F+dLM
-                                       Hh6Be8R5Rw+9nOHahPhgl9UMHKRwwHwI5vrh
-                                       YXbqsfnab4G3XrfARXnc0UKT2KbJt3nMiuU= )
+                                       20441127043558 20141205043558 59034 edns512-notcp.
+                                       VusByVbeIayH6KfnbhxLKycQfjU2L2Ilfa9o
+                                       K/MjEve4vMjqKeYV0oNan2X4DvPZusKeMVJp
+                                       JhQxvBz2GXE6syjrL5eEQtdcn6MW5Ew40w2E
+                                       i7BCGiHYrxH+SJqSORl5pBjihe24dRWoHHt/
+                                       3CVBE18TU+ubSdLgOT3SvBtffJ1NVtvtCgpP
+                                       /yIgffhHOU/F0J+ewL6lmYzrkj/48Ep8F9e9
+                                       suAoorKmRP4zmeiojQedM+4PfbRn0doOLFIR
+                                       8RZK8rv9WeQv1mhUh9s0zY4UARRGRb9i8Zhr
+                                       ERor3lZprmujx/Ok6XndTW7vRY/0IfC2i99C
+                                       0zfcIdzuZ96YtiUFFTynptz3yxrJqQxeJaFt
+                                       vuZ4rd5XqSb3uPu8wVzYJEwhNRPJGqBpRAba
+                                       vxqOV1HAw89t1sUKXQR2qQ4HvpIzRIxFpIKQ
+                                       hRPMyd6uz0EtPQFE6ri1C5JkZkbdZ0r5SauY
+                                       EqZMsIl8oGtt1S5kEK2Agqx4b1pUfSv6cOLb
+                                       765SGYVr1RdjmFZ7ftYYZPyMKJl6t3/ruZ9f
+                                       iazQGzoO6O+nQq3DD8EjZynsnAedzyEe3Hxd
+                                       tJM1Rm3nWAPka4QV5hdzpU93N/ao4tRuCYp/
+                                       4pnVlc8MStuyuy9RRapEoOMs0iIQFPdidU+V
+                                       aM+ZSOa6RbYwzvzmX7I1UxBf5gKJzuDydDA= )
 ns.edns512-notcp.      60      IN A    10.53.0.7
                        60      RRSIG   A 10 2 60 (
-                                       20441126192402 20141204192402 22703 edns512-notcp.
-                                       B3vpbyFDz76cfXcxQduo3BBw4or+uhJl/0GE
-                                       ASAb6EbpQWEIh9wr3Wlnw3DaSg+7nZCYPULk
-                                       0ss6rU75Hc8eRN0+1oQJSs++LLFxR+d3o0kb
-                                       bjEN4Q4yNrkHG/DQ08/rrh9csSjDYVXIOcCz
-                                       cuoXwsR3+/3rBwPMR2QYeTUMQaODoQkW/HE9
-                                       VmBkFxw88YBy8eLC5dPcy14rrAmgC+cDQg7E
-                                       rQ4Qh+3UrScw9w5Y5ni8zo/FcxA2irRF1yMQ
-                                       8lNMchikEvRzpvvK7yTapIpJafJScSKbS2gR
-                                       BQ4n6cN9ElPbM+0frvTgNpDcZobqMW+d6ZC+
-                                       Zu3Dqa/QU/49mnhOzgzv5+8n9mfE0waOpErp
-                                       KxjI2t8XY8bBG8RVGNROag1RD7NsPuHLSd3N
-                                       DJkiE3CJ8py9ekMEbsW1scPtwAkT78LHY3MM
-                                       RVuFx4eYUH3TTVYm2N4xktUds7kU0ryK9MWp
-                                       7mEk8aSjcnaHIvmssFbJaanHZhNm+1wqk9JW
-                                       ybtJ0U+iHOv/FYdWwE7BRwmnuOubC1hx1LNl
-                                       oPMvFPL+i8qCgyg+3e5EagJZqPgk52Bd4aMt
-                                       R8nPYwhZNgEJhCpst4EJvnc36XWNg1/YtpEO
-                                       4OElZQSR6/+U4jbj6VFoVqlJj9A/Ny1kLIkI
-                                       grGGgihfFLUi3xLSNdawxcMnsGF/tnZGf5M= )
+                                       20441127043558 20141205043558 59033 edns512-notcp.
+                                       eY/gUZcEKDE0loJ4zaxwJDg4E/S+ILJOrJrC
+                                       Yb64VWSE7RAzoQt8gYXAcEec4NLo2ZFsckTL
+                                       O0jD4db+q1rJLtniw+Xg/fckXvjxt21jNR43
+                                       +rW17ZuEYYlOWg9o+NyP9QnLjxNOR22f6gSx
+                                       FCLOca+8Yoxf4bw7EsdV98KajMFpcljQu2iE
+                                       NOKCoDSdunaZnhdP8kVuXO7P+VEXRa1OFzxb
+                                       mm2axihSqXcA7vdEdpGmTWoUFdG7p61Kl8Jw
+                                       rQzT7RiA3PoeyYoQ2wC2oitRr4lnsN/IF1vz
+                                       D3ldJ6pnYNVYmSHaS2potOMNDSTZtgV2LUmx
+                                       pqsaa3coYaJPJj0ijWzxw77nAXXQ7u/YWIzz
+                                       vUhXKygQIZaInl1msFPkFRy4AqriDmDnAAfJ
+                                       YyPunq7VkR2ExUhU1iFGGmDFE35ktxFl6AWL
+                                       /0CWElHPwuvqGksLnxrE7Syr25TOC+EhqDUS
+                                       G5X7/7Cb+Hl/twlA4oYDv8eXCwxMsncMp1cn
+                                       VDfwOrN4/JWzYcqNLTZHFRr+Uz7Fo8tGAri0
+                                       p7yDVHg35QN7usMKfsU3WnoOm1VlD/sU8bTW
+                                       32dudd3yauhdKlmytZ2s2PMrXBf7/fsjDlY6
+                                       ZEc91TwM9Yt71FQ27XKoP5eFGajlxG+haoyB
+                                       6jfoV4cIDq4MVerLOSUlczFjczbBXLHwLno= )
                        0       NSEC    txt500.edns512-notcp. A RRSIG NSEC
                        0       RRSIG   NSEC 10 2 0 (
-                                       20441126192402 20141204192402 22703 edns512-notcp.
-                                       RqymFvKKhnoOXHvZSagAEfZmAVIvvaHBPW25
-                                       7MWvBWHRODRGPMrzTTKp0QB+tgr0qtP9YrTx
-                                       4gO8fSr4MKq7YlYy6cd+H7BM+jDcn729LiNl
-                                       vs08QOX9++iQ2Gg1KgrZ5mRAGws7r6serLS0
-                                       F8MYffNrppuIDp+lame+ibgi1pEk1sIn+58/
-                                       rqfxnNgIMkqb6dYCoUBlq6KXkoee+uNM5hoP
-                                       QkYYkQqnJOaL4w6WPSaBTp8IODhfWuI1HzOh
-                                       u/Mj/rdGN3BlUs4DPu5iiCN3n/EH/kVys90m
-                                       WiT71x35cEpCnqBqtV9g7ugWA4yLcdPp5Pws
-                                       DYsqExFKGldM1lPVCqHuBzkv5ekRaYpyAYDA
-                                       HlXYDAMfuDCfi8Aut4vHSGYX3ly179OxY1t3
-                                       UAVvQMAjriRWwqcqQb5oS0qbuwQxJQX5MDKw
-                                       J2U8zcmr4LKAl5f90L6/drC8RdHHB7Wuh6Q1
-                                       buw0hn6UCLzv4zN7cRzmEZRd82lzwmuKtk7s
-                                       AxlYHndFlJcj8Ybflab5nE+UaK0FG8gOYlNz
-                                       hYBnOpBR8Abry712GvUR7umDfZxb1E2u8cHG
-                                       taILhVqCRs9PsqgpVeSFAJUghN9wZzOudG+o
-                                       uN2AJ9Vxi9t+WS3tBkb+9NLAIYA//xNYxpoK
-                                       flp+dgdtvFTCjM2eyG7zTFHYVY0Zp3q0Iko= )
+                                       20441127043558 20141205043558 59033 edns512-notcp.
+                                       mR1PHdEWNP90/80SAlKkj7jV0hBj0eDxM5Q0
+                                       RGPbv2pb1fOT/W8dTe2Qm/qwE0aY4nmRfiah
+                                       8klCAXH9gvVAQFbPlz8tkLKEOrKjZM/YP9Vd
+                                       EoUmYj6+G2OXYvvetVStpqfiSK731iPUhKUD
+                                       Y0uYUzTyqgmOyyKWApk1+C+b3fYNS2E0jA77
+                                       riOCULE2FSPim7cEGS7JWE22qRY4//ENQZ27
+                                       eA+KbkXWR+vdqnQ6vs1cIwsbGbFFzmcogMT2
+                                       3cN1e2lNbzTZIpVd9ukwp8FqyT0p7oz+q5r/
+                                       so4Zq0EGx473OgThMfTMs6pOg7L6M60jMhmF
+                                       8V50dpePHmFLxI/Nn4kvxcUt684L3TWGObFQ
+                                       y9vxO8Wh66+USSX8jyDnP8mtMnGEeHD9SVYz
+                                       WIbCDVUsvSkFqSi/2o1/SZYWQ+wXkj6qO2Mz
+                                       JIgJKucALub0dOfaoncPYa7kfOxEOmgwY39I
+                                       RQodc53Brhgn6IF/1zNxZd5/FpWUs4ivrpsN
+                                       MOKy/E+MJiaGOdj1RwNlDdZQNtamexxOjcaD
+                                       6pWAD44LgakoELE0Ktxtl/oMmouky0Dx/zwN
+                                       e9nEBTe9nTbG99lbzuGZ2vWkfqA1EsliCryd
+                                       wH6+EF3l5w9EEKBdVgBIEoHZ92TaiiJfRmFQ
+                                       LwEjS+AYjQKzmvp47lGqQf8/ggvMxcv/SCE= )
+txt500.edns512-notcp.  60      IN TXT  "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789" "01234567890123456789012345678901234567890123456789"
+                       60      RRSIG   TXT 10 2 60 (
+                                       20441127043558 20141205043558 59033 edns512-notcp.
+                                       fpzr1/DNby1CMHfZclvga7Pk9S3tqWn0wwC9
+                                       xsUhYoPRcaIN4o9g5rOC0fxX1W4Q6gEXt0l2
+                                       fKzUdxE9QqTgpJOAOcMJa7D1yRo2ifVoX3Oq
+                                       M2lUYusg3o0Wg1JuNnf3DXaSaLOiYOrS2ixs
+                                       XnPwU0pLiniGIT9Bh2OuMBPs5YP2dZRKKJ7z
+                                       VrxE4F213A0FQfN68tIbN5XrzwO8EfyjBTyM
+                                       YtApC33vMajYeILnFemLrs9VL5hbLoyKcyqg
+                                       1n0eSXhneHlYgsS5anSXWOSd9sT46jqpFwYF
+                                       O+frR2DNmdua4eZiUqA9HMgvaQnNodVU2Z5r
+                                       5lzrHSVSXS/Au7kp4FZtYCUj2W4m/grOidH9
+                                       ulwM0Ut+OZOOLHVcwBQGuedEEwU/h+YGbJH6
+                                       fomTvfW+NAaL6X3IJggcQnHmCOTf0f3xXeXT
+                                       iHK1hE+iabTQ8gCabt4KCQ11Oz8zu3j7ZB5T
+                                       2byQ49N2jj+i8+p2wsRbnz5Algx15KP11NM0
+                                       lUb+fhPlIrhbgwqPtv8udeRsBpRAwHXWrz5m
+                                       BxWQ5X52frQAPNoi51q5tTWE7UlpLYFBeXtW
+                                       0XY7o6+TqP+EN5lGwddNhS0wYRWE10M2Es8A
+                                       2q1RKIBDSPB3XEeULrQ6ciDgiDQ7T55p1KKM
+                                       r25OyqYCGZs9obDHnNVNQP2rTjfm6062TSo= )
+                       0       NSEC    edns512-notcp. TXT RRSIG NSEC
+                       0       RRSIG   NSEC 10 2 0 (
+                                       20441127043558 20141205043558 59033 edns512-notcp.
+                                       pTTiIXjWLSH1Qm59kZlX0QmXtm7gDhL4RdQF
+                                       sHMtxZA1JhWjBC3u48C8M19ZWTu1xmTrhuil
+                                       tPV9a4u9zTasPWOy2HSKnl/jMaqGZ3xa96mo
+                                       I1qULVqb8XRTYqPsJ3reD6x9jJepEFAsK+xa
+                                       /TdrFTfZ5Oc0RYLQxH2qrJVc2n7S5gCHp10O
+                                       extcck2cyhiaRnI/wha6PdAXKG0ikX/oKAQL
+                                       hMcNUpOeewJLTvXasVPf4cF9O0B1/wXun3C4
+                                       lkzKF+fYBe2qg6ikGgsHws72/TYD2xDOae41
+                                       yjkVwdthTECDzedPc6jbKeApyEGA1G2lc7Ie
+                                       DE1rLRP3OhME5X9bhPcQnop4k583RQI0QY60
+                                       PUdZ/cr99eM6Zj3Mal6zBrebPiBAJVnr8C4X
+                                       /ozv3MFmaoNalB0JuTVojCboQ6Sf7+UCumXk
+                                       VK56zx6ZiGcwtnKHRQZIGGsHpPt28zo33wKJ
+                                       0xljGuxfnxstGGmUUCTrhi0U/8991ZdqnjHg
+                                       hBkWxmEm1X5ioIVy5c5M6baSoEmls4iwad/O
+                                       vU9cx0aXxqir7/5jYlMFjn6Xo2BuUVQWf/LY
+                                       E9rZRZUN0a4sh7Wj8pjKS1hJ5pTK9C3ijEqD
+                                       Y9B5OslWHcOhSlv4q9YwuZkBo/b8UiV6EOnS
+                                       vE/TgzfP7DcXjTI5qErka0iJMxz/m90VuiU= )
index 132b6c28e0a1bfe8b4038591ac0d6f00f7503c89..e48218cb361ced1db854ca7a7f793d60c2273070 100755 (executable)
@@ -30,3 +30,14 @@ keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA512 -b 4096 -n zone $zone 2> /dev
 cat $infile $keyname1.key $keyname2.key >$zonefile
 
 $SIGNER -r $RANDFILE -g -o $zone -f $outfile -e +30y $zonefile > /dev/null 2> signer.err || cat signer.err
+
+grep -v '^;' $keyname2.key | $PERL -n -e '
+local ($dn, $class, $type, $flags, $proto, $alg, @rest) = split;
+local $key = join("", @rest);
+print <<EOF
+trusted-keys {
+    "$dn" $flags $proto $alg "$key";
+};
+EOF
+' > trusted.conf
+cp trusted.conf ../ns1
diff --git a/bin/tests/system/legacy/setup.sh b/bin/tests/system/legacy/setup.sh
new file mode 100644 (file)
index 0000000..5f190fa
--- /dev/null
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+#
+# 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.
+
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+cp -f ns1/named1.conf ns1/named.conf
index 9eefd49719ad9bafedbc4b41302902132979a81f..533a856a29a24ac43b5643f8912f9345a8a82a42 100755 (executable)
@@ -83,7 +83,6 @@ $DIG +tcp  @10.53.0.1 -p 5300 plain soa > dig.out.test$n || ret=1
 grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
-n=`expr $n + 1`
 
 n=`expr $n + 1`
 echo "I:checking plain dns + no tcp server setup ($n)"
@@ -126,6 +125,7 @@ grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
+n=`expr $n + 1`
 echo "I:checking edns 512 + no tcp server setup ($n)"
 ret=0
 $DIG +noedns @10.53.0.7 -p 5300 edns512-notcp soa > dig.out.1.test$n || ret=1
@@ -140,12 +140,26 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo "I:checking recursive lookup to edns 512 + no tcp server succeeds with server { edns no; } ($n)"
+echo "I:checking recursive lookup to edns 512 + no tcp server succeeds ($n)"
 ret=0
 $DIG +tcp  @10.53.0.1 -p 5300 edns512-notcp soa > dig.out.test$n || ret=1
 grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
+$PERL $SYSTEMTESTTOP/stop.pl . ns1
+
+cp -f ns1/named2.conf ns1/named.conf
+
+$PERL $SYSTEMTESTTOP/start.pl --noclean --restart . ns1
+
+n=`expr $n + 1`
+echo "I:checking recursive lookup to edns 512 + no tcp + trust anchor fails ($n)"
+ret=0
+$DIG +tcp  @10.53.0.1 -p 5300 edns512-notcp soa > dig.out.test$n || ret=1
+grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
 echo "I:exit status: $status"
 exit $status
index fbb9bb9ecfea578e7b0b0a158522d9968d103943..ed4b8c3ddd5702886f1dc128a3d6a947c3a88a61 100644 (file)
          the newly-created "cname" log category.
        </para>
       </listitem>
+      <listitem>
+       <para>
+         If named is not configured to validate the answer then
+         allow fallback to plain DNS on timeout even when we know
+         the server supports EDNS.  This will allow the server to
+         potentially resolve signed queries when TCP is being
+         blocked.
+       </para>
+      </listitem>
     </itemizedlist>
   </sect2>
   <sect2 id="relnotes_bugs">
index 58f38dea947e82e2dd60599a73761021638b0626..2f0c11b7a4035f085cde6299b9a72c863375894b 100644 (file)
@@ -1833,6 +1833,24 @@ compute_cc(resquery_t *query, unsigned char *sit, size_t len) {
 }
 #endif
 
+static isc_boolean_t
+wouldvalidate(fetchctx_t *fctx) {
+       isc_boolean_t secure_domain;
+       isc_result_t result;
+
+       if (!fctx->res->view->enablevalidation)
+               return (ISC_FALSE);
+
+       if (fctx->res->view->dlv != NULL)
+               return (ISC_TRUE);
+
+       result = dns_view_issecuredomain(fctx->res->view, &fctx->name,
+                                        &secure_domain);
+       if (result != ISC_R_SUCCESS)
+               return (ISC_FALSE);
+       return (secure_domain);
+}
+
 static isc_result_t
 resquery_send(resquery_t *query) {
        fetchctx_t *fctx;
@@ -1995,17 +2013,17 @@ resquery_send(resquery_t *query) {
            dns_adb_noedns(fctx->adb, query->addrinfo))
                query->options |= DNS_FETCHOPT_NOEDNS0;
 
-
        if (fctx->timeout && (query->options & DNS_FETCHOPT_NOEDNS0) == 0) {
                isc_sockaddr_t *sockaddr = &query->addrinfo->sockaddr;
                struct tried *tried;
 
                if (fctx->timeouts > (MAX_EDNS0_TIMEOUTS * 2) &&
-                   !EDNSOK(query->addrinfo)) {
+                   (!EDNSOK(query->addrinfo) || !wouldvalidate(fctx))) {
                        query->options |= DNS_FETCHOPT_NOEDNS0;
                        fctx->reason = "disabling EDNS";
                } else if ((tried = triededns512(fctx, sockaddr)) != NULL &&
-                   tried->count >= 2U && !EDNSOK(query->addrinfo)) {
+                   tried->count >= 2U &&
+                   (!EDNSOK(query->addrinfo) || !wouldvalidate(fctx))) {
                        query->options |= DNS_FETCHOPT_NOEDNS0;
                        fctx->reason = "disabling EDNS";
                } else if ((tried = triededns(fctx, sockaddr)) != NULL) {