[master] add missing rrtypes to genzones

4711.	[test]		Some RR types were missing from genzones.sh.
			[RT #45782]

diff --git a/CHANGES b/CHANGES
index 30106335ac8067e8b01f006e4fafa50e0e493f5e..7cfcb7b12a87ee375b38d32816bbc00aa03300c4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4711.  [test]          Some RR types were missing from genzones.sh.
+                       [RT #45782]
+
 4710.  [cleanup]       Changed the --enable-openssl-hash default to yes.
                        [RT #45019]
 

diff --git a/bin/tests/system/genzone.sh b/bin/tests/system/genzone.sh
index 58ba004afe1ba8b71cf8c0fc00eacbe978987432..9bb9e26c1fe0106f3d1a24d285c5332c76a843ae 100644 (file)
--- a/bin/tests/system/genzone.sh
+++ b/bin/tests/system/genzone.sh
@@ -168,6 +168,10 @@ px02                       PX      65535 . .
 gpos01                 GPOS    -22.6882 116.8652 250.0
 gpos02                 GPOS    "" "" ""
 
+; type 28
+aaaa01                 AAAA    ::1
+aaaa02                 AAAA    fd92:7065:b8e:ffff::5
+
 ; type 29
 loc01                  LOC     60 9 N 24 39 E 10 20 2000 20
 loc02                  LOC     60 09 00.000 N 24 39 00.000 E 10.00m 20.00m (
@@ -179,10 +183,15 @@ loc02                     LOC     60 09 00.000 N 24 39 00.000 E 10.00m 20.00m (
 ;nxt03                 NXT     . 1
 ;nxt04                 NXT     . 127
 
+; type 31 (EID - not implemented by BIND)
+; type 32 (NIMLOC - not implemented by BIND)
+
 ; type 33
 srv01                  SRV 0 0 0 .
 srv02                  SRV 65535 65535 65535  old-slow-box
 
+; type 34 (ATMA - not implemented by BIND)
+
 ; type 35
 naptr01                        NAPTR   0 0 "" "" "" . 
 naptr02                        NAPTR   65535 65535 blurgh blorf blllbb foo.
@@ -215,6 +224,33 @@ sink02                     SINK    8 0 2 l4ik
 ; type 41
 ; OPT is a meta-type and should never occur in master files.
 
+; type 42
+apl01                  APL     !1:10.0.0.1/32 1:10.0.0.0/24
+
+; type 43
+ds01                   DS      12892 5 2 26584835CA80C81C91999F31CFAF2A0E89D4FF1C8FAFD0DDB31A85C7 19277C13
+ds01                   NS      ns42
+ds02                   DS      12892 5 1 7AA4A3F416C2F2391FB7AB0D434F762CD62D1390
+ds02                   NS      ns43
+
+; type 44
+sshfp01                        SSHFP   4 2 C76D8329954DA2835751E371544E963EFDA099080D6C58DD2BFD9A31 6E162C83
+sshfp02                        SSHFP   1 2 BF29468C83AC58CCF8C85AB7B3BEB054ECF1E38512B8353AB36471FA 88961DCC
+
+; type 45
+ipseckey01             IPSECKEY        10 1 2 192.0.2.38 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
+ipseckey02             IPSECKEY        10 0 2 . AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
+ipseckey03             IPSECKEY        ( 10 1 2
+                                         192.0.2.3
+                                         AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )
+ipseckey04             IPSECKEY        ( 10 3 2
+                                         mygateway.example.com.
+                                         AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )
+
+ipseckey05             IPSECKEY        ( 10 2 2
+                                         2001:0DB8:0:8002::2000:1
+                                         AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ== )
+
 ; type 46
 rrsig01                        RRSIG   NSEC 1 3 ( 3600 20000102030405
                                19961211100908 2143 foo.nil. 
@@ -234,6 +270,44 @@ dnskey01           DNSKEY  512 ( 255 1 AQMFD5raczCJHViKtLYhWGz8hMY
                                sENW91IOW4vqudngPZsY3GvQ/xVA8/7pyFj6b7Esg
                                a60zyGW6LFe9r8n6paHrlG5ojqf0BaqHT+8= )
 
+; type 49
+dhcid01                        DHCID   ( AAIBY2/AuCccgoJbsaxcQc9TUapptP69l
+                                 OjxfNuVAA2kjEA= )
+dhcid02                        DHCID   ( AAEBOSD+XR3Os/0LozeXVqcNc7FwCfQdW
+                                 L3b/NaiUDlW2No= )
+dhcid03                        DHCID   ( AAABxLmlskllE0MVjd57zHcWmEH3pCQ6V
+                                 ytcKD//7es/deY= )
+
+; type 50
+8f1tmio9avcom2k0frp92lgcumak0cad       NSEC3 1 0 10 D2CF0294C020CE6C 8FPNS2UCT7FBS643THP2B77PEQ77K6IU  A NS SOA MX AAAA RRSIG DNSKEY NSEC3PARAM
+kcd3juae64f9c5csl1kif1htaui7un0g       NSEC3 1 0 10 D2CF0294C020CE6C KD5MN2M20340DGO0BL7NTSB8JP4BSC7E
+mr5ukvsk1l37btu4q7b1dfevft4hkqdk       NSEC3 1 0 10 D2CF0294C020CE6C MT38J6VG7S0SN5G17MCUF6IQIKFUAJ05  A AAAA RRSIG
+
+; type 51
+; @                    NSEC3PARAM 1 0 1 868BCF7ED4108929
+
+; type 52
+tlsa                   TLSA    ( 1 1 2 92003ba34942dc74152e2f2c408d29ec
+                               a5a520e7f2e06bb944f4dca346baf63c
+                               1b177615d466f6c4b71c216a50292bd5
+                               8c9ebdd2f74e38fe51ffd48c43326cbc )
+
+; type 53
+smimea                 SMIMEA  ( 1 1 2 92003ba34942dc74152e2f2c408d29ec
+                               a5a520e7f2e06bb944f4dca346baf63c
+                               1b177615d466f6c4b71c216a50292bd5
+                               8c9ebdd2f74e38fe51ffd48c43326cbc )
+
+; type 54 (unassigned)
+
+; type 55
+hip1                   HIP     ( 2 200100107B1A74DF365639CC39F1D578
+                               AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D )
+
+hip2                   HIP     ( 2 200100107B1A74DF365639CC39F1D578
+                                AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D
+                               rvs.example.com. )
+
 ; type 56
 ninfo01                        NINFO   "foo"
 ninfo02                        NINFO   "foo" "bar"
@@ -283,6 +357,38 @@ openpgpkey         OPENPGPKEY      ( AQMFD5raczCJHViKtLYhWGz8hMY
 csync01                        CSYNC   0 0 A NS AAAA
 csync02                        CSYNC   0 0
 
+; type 63 -- 98 (unassigned)
+
+; type 99
+spf01                  SPF     "v=spf1 -all"
+spf02                  SPF     "v=spf1" " -all"
+
+; type 100 (UINFO - not implemented by BIND)
+; type 101 (UID - not implemented by BIND)
+; type 102 (GID - not implemented by BIND)
+
+; type 103 (UNSPEC - XXXMUKS TODO - this has some weird encoding - see btoa_totext())
+
+; type 104
+nid                    NID     10 0014:4fff:ff20:ee64
+
+; type 105
+l32                    L32     10 1.2.3.4
+
+; type 106
+l64                    L64     10 0014:4fff:ff20:ee64
+
+; type 107
+lp                     LP      10 example.net.
+
+; type 108
+eui48                  EUI48   01-23-45-67-89-ab
+
+; type 109
+eui64                  EUI64   01-23-45-67-89-ab-cd-ef
+
+; type 110 -- 248 (unassigned)
+
 ; type 249
 ; TKEY is a meta-type and should never occur in master files.
 ; The text representation is not specified in the draft.
@@ -307,38 +413,8 @@ csync02                    CSYNC   0 0
 ;                                              ; other data
 ;                              )
 
-hip1                   HIP     ( 2 200100107B1A74DF365639CC39F1D578
-                               AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D )
-
-
-hip2                   HIP     ( 2 200100107B1A74DF365639CC39F1D578
-                                AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D
-                               rvs.example.com. )
-
-tlsa                   TLSA    ( 1 1 2 92003ba34942dc74152e2f2c408d29ec
-                               a5a520e7f2e06bb944f4dca346baf63c
-                               1b177615d466f6c4b71c216a50292bd5
-                               8c9ebdd2f74e38fe51ffd48c43326cbc )
-
-smimea                 SMIMEA  ( 1 1 2 92003ba34942dc74152e2f2c408d29ec
-                               a5a520e7f2e06bb944f4dca346baf63c
-                               1b177615d466f6c4b71c216a50292bd5
-                               8c9ebdd2f74e38fe51ffd48c43326cbc )
-
-nid                    NID     10 0014:4fff:ff20:ee64
-
-l32                    L32     10 1.2.3.4
-
-l64                    L64     10 0014:4fff:ff20:ee64
-
-lp                     LP      10 example.net.
-
-eui48                  EUI48   01-23-45-67-89-ab
-
-eui64                  EUI64   01-23-45-67-89-ab-cd-ef
-
 ; type 255
-; TSIG is a meta-type and should never occur in master files.
+; * is a meta-type and should never occur in master files.
 
 ; type 256
 uri01                  URI     10 20 "https://www.isc.org/"
@@ -353,6 +429,8 @@ caa03                       CAA     128 tbs ""
 ; type 258
 avc                    AVC     foo:bar
 
+; type 259 -- 32767 (unassigned)
+
 ; type 32768
 ta                     TA      30795 1 1 (
                                        310D27F4D82C1FC2400704EA9939FE6E1CEA
@@ -363,9 +441,15 @@ dlv                        DLV     30795 1 1 (
                                        310D27F4D82C1FC2400704EA9939FE6E1CEA
                                        A3B9 )
 
+; type 32770 -- 65279 (unassigned)
+
+; type 65280-65534 (private use)
+
 ; keydata (internal type used for managed-keys)
 keydata                        TYPE65533       \# 0
 keydata                        TYPE65533       \# 6 010203040506 
 keydata                        TYPE65533       \# 18 010203040506010203040506010203040506
 
+; type 65535 (reserved)
+
 EOF

diff --git a/bin/tests/system/xfer/dig1.good b/bin/tests/system/xfer/dig1.good
index e47bfc401baf73d8a5d88b54aec5594d05b6e19f..7a2eff08b9a1f0de83e698b369b219cb27eca711 100644 (file)
--- a/bin/tests/system/xfer/dig1.good
+++ b/bin/tests/system/xfer/dig1.good
@@ -7,8 +7,11 @@ a601.example.          3600    IN      A6      0 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
 a601.example.          3600    IN      A6      64 ::ffff:ffff:ffff:ffff foo.
 a601.example.          3600    IN      A6      127 ::1 foo.
 a601.example.          3600    IN      A6      128  .
+aaaa01.example.                3600    IN      AAAA    ::1
+aaaa02.example.                3600    IN      AAAA    fd92:7065:b8e:ffff::5
 afsdb01.example.       3600    IN      AFSDB   0 hostname.example.
 afsdb02.example.       3600    IN      AFSDB   65535 .
+apl01.example.         3600    IN      APL     !1:10.0.0.1/32 1:10.0.0.0/24
 avc.example.           3600    IN      AVC     "foo:bar"
 caa01.example.         3600    IN      CAA     0 issue "ca.example.net; policy=ev"
 caa02.example.         3600    IN      CAA     128 tbs "Unknown"
@@ -21,10 +24,17 @@ cname02.example.    3600    IN      CNAME   cname-target.example.
 cname03.example.       3600    IN      CNAME   .
 csync01.example.       3600    IN      CSYNC   0 0 A NS AAAA
 csync02.example.       3600    IN      CSYNC   0 0
+dhcid01.example.       3600    IN      DHCID   AAIBY2/AuCccgoJbsaxcQc9TUapptP69lOjxfNuVAA2kjEA=
+dhcid02.example.       3600    IN      DHCID   AAEBOSD+XR3Os/0LozeXVqcNc7FwCfQdWL3b/NaiUDlW2No=
+dhcid03.example.       3600    IN      DHCID   AAABxLmlskllE0MVjd57zHcWmEH3pCQ6VytcKD//7es/deY=
 dlv.example.           3600    IN      DLV     30795 1 1 310D27F4D82C1FC2400704EA9939FE6E1CEAA3B9
 dname01.example.       3600    IN      DNAME   dname-target.
 dname02.example.       3600    IN      DNAME   dname-target.example.
 dname03.example.       3600    IN      DNAME   .
+ds01.example.          3600    IN      NS      ns42.example.
+ds01.example.          3600    IN      DS      12892 5 2 26584835CA80C81C91999F31CFAF2A0E89D4FF1C8FAFD0DDB31A85C7 19277C13
+ds02.example.          3600    IN      NS      ns43.example.
+ds02.example.          3600    IN      DS      12892 5 1 7AA4A3F416C2F2391FB7AB0D434F762CD62D1390
 eui48.example.         3600    IN      EUI48   01-23-45-67-89-ab
 eui64.example.         3600    IN      EUI64   01-23-45-67-89-ab-cd-ef
 gpos01.example.                3600    IN      GPOS    "-22.6882" "116.8652" "250.0"
@@ -33,6 +43,11 @@ hinfo01.example.     3600    IN      HINFO   "Generic PC clone" "NetBSD-1.4"
 hinfo02.example.       3600    IN      HINFO   "PC" "NetBSD"
 hip1.example.          3600    IN      HIP     2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D 
 hip2.example.          3600    IN      HIP     2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D rvs.example.com.
+ipseckey01.example.    3600    IN      IPSECKEY  10 1 2 192.0.2.38 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
+ipseckey02.example.    3600    IN      IPSECKEY  10 0 2 . AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
+ipseckey03.example.    3600    IN      IPSECKEY  10 1 2 192.0.2.3 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
+ipseckey04.example.    3600    IN      IPSECKEY  10 3 2 mygateway.example.com. AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
+ipseckey05.example.    3600    IN      IPSECKEY  10 2 2 2001:db8:0:8002::2000:1 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
 isdn01.example.                3600    IN      ISDN    "isdn-address"
 isdn02.example.                3600    IN      ISDN    "isdn-address" "subaddress"
 isdn03.example.                3600    IN      ISDN    "isdn-address"
@@ -96,6 +111,10 @@ rp02.example.               3600    IN      RP      . .
 rt01.example.          3600    IN      RT      0 intermediate-host.example.
 rt02.example.          3600    IN      RT      65535 .
 rrsig01.example.               3600    IN      RRSIG   NSEC 1 3 3600 20000102030405 19961211100908 2143 foo.nil. MxFcby9k/yvedMfQgKzhH5er0Mu/vILz45IkskceFGgiWCn/GxHhai6V AuHAoNUz4YoU1tVfSCSqQYn6//11U6Nld80jEeC8aTrO+KKmCaY=
+spf01.example.         3600    IN      SPF     "v=spf1 -all"
+spf02.example.         3600    IN      SPF     "v=spf1" " -all"
+sshfp01.example.       3600    IN      SSHFP   4 2 C76D8329954DA2835751E371544E963EFDA099080D6C58DD2BFD9A31 6E162C83
+sshfp02.example.       3600    IN      SSHFP   1 2 BF29468C83AC58CCF8C85AB7B3BEB054ECF1E38512B8353AB36471FA 88961DCC
 sink01.example.                3600    IN      SINK    1 0 0
 sink02.example.                3600    IN      SINK    8 0 2 l4ik
 smimea.example.                3600    IN      SMIMEA  1 1 2 92003BA34942DC74152E2F2C408D29ECA5A520E7F2E06BB944F4DCA3 46BAF63C1B177615D466F6C4B71C216A50292BD58C9EBDD2F74E38FE 51FFD48C43326CBC
@@ -128,4 +147,7 @@ wks01.example.              3600    IN      WKS     10.0.0.1 6 0 1 2 21 23
 wks02.example.         3600    IN      WKS     10.0.0.1 17 0 1 2 53
 wks03.example.         3600    IN      WKS     10.0.0.2 6 65535
 x2501.example.         3600    IN      X25     "123456789"
+8f1tmio9avcom2k0frp92lgcumak0cad.example. 3600 IN NSEC3 1 0 10 D2CF0294C020CE6C 8FPNS2UCT7FBS643THP2B77PEQ77K6IU  A NS SOA MX AAAA RRSIG DNSKEY NSEC3PARAM
+kcd3juae64f9c5csl1kif1htaui7un0g.example. 3600 IN NSEC3 1 0 10 D2CF0294C020CE6C KD5MN2M20340DGO0BL7NTSB8JP4BSC7E
+mr5ukvsk1l37btu4q7b1dfevft4hkqdk.example. 3600 IN NSEC3 1 0 10 D2CF0294C020CE6C MT38J6VG7S0SN5G17MCUF6IQIKFUAJ05  A AAAA RRSIG
 example.               86400   IN      SOA     ns2.example. hostmaster.example. 1397051952 5 5 1814400 3600

diff --git a/bin/tests/system/xfer/dig2.good b/bin/tests/system/xfer/dig2.good
index 443dec3fc75dd8a6811c826304742a108c434562..09b06b179a3279c85ba0b15a99f0c20c212fa63d 100644 (file)
--- a/bin/tests/system/xfer/dig2.good
+++ b/bin/tests/system/xfer/dig2.good
@@ -7,8 +7,11 @@ a601.example.          3600    IN      A6      0 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
 a601.example.          3600    IN      A6      64 ::ffff:ffff:ffff:ffff foo.
 a601.example.          3600    IN      A6      127 ::1 foo.
 a601.example.          3600    IN      A6      128  .
+aaaa01.example.                3600    IN      AAAA    ::1
+aaaa02.example.                3600    IN      AAAA    fd92:7065:b8e:ffff::5
 afsdb01.example.       3600    IN      AFSDB   0 hostname.example.
 afsdb02.example.       3600    IN      AFSDB   65535 .
+apl01.example.         3600    IN      APL     !1:10.0.0.1/32 1:10.0.0.1/24
 avc.example.           3600    IN      AVC     "foo:bar"
 caa01.example.         3600    IN      CAA     0 issue "ca.example.net; policy=ev"
 caa02.example.         3600    IN      CAA     128 tbs "Unknown"
@@ -21,16 +24,28 @@ cname02.example.    3600    IN      CNAME   cname-target.example.
 cname03.example.       3600    IN      CNAME   .
 csync01.example.       3600    IN      CSYNC   0 0 A NS AAAA
 csync02.example.       3600    IN      CSYNC   0 0
+dhcid01.example.       3600    IN      DHCID   AAIBY2/AuCccgoJbsaxcQc9TUapptP69lOjxfNuVAA2kjEA=
+dhcid02.example.       3600    IN      DHCID   AAEBOSD+XR3Os/0LozeXVqcNc7FwCfQdWL3b/NaiUDlW2No=
+dhcid03.example.       3600    IN      DHCID   AAABxLmlskllE0MVjd57zHcWmEH3pCQ6VytcKD//7es/deY=
 dlv.example.           3600    IN      DLV     30795 1 1 310D27F4D82C1FC2400704EA9939FE6E1CEAA3B9
 dname01.example.       3600    IN      DNAME   dname-target.
 dname02.example.       3600    IN      DNAME   dname-target.example.
 dname03.example.       3600    IN      DNAME   .
+ds01.example.          3600    IN      NS      ns42.example.
+ds01.example.          3600    IN      DS      12892 5 2 26584835CA80C81C91999F31CFAF2A0E89D4FF1C8FAFD0DDB31A85C7 19277C13
+ds02.example.          3600    IN      NS      ns43.example.
+ds02.example.          3600    IN      DS      12892 5 1 7AA4A3F416C2F2391FB7AB0D434F762CD62D1390
 eui48.example.         3600    IN      EUI48   01-23-45-67-89-ab
 eui64.example.         3600    IN      EUI64   01-23-45-67-89-ab-cd-ef
 gpos01.example.                3600    IN      GPOS    "-22.6882" "116.8652" "250.0"
 gpos02.example.                3600    IN      GPOS    "" "" ""
 hinfo01.example.       3600    IN      HINFO   "Generic PC clone" "NetBSD-1.4"
 hinfo02.example.       3600    IN      HINFO   "PC" "NetBSD"
+ipseckey01.example.    3600    IN      IPSECKEY  10 1 2 192.0.2.38 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
+ipseckey02.example.    3600    IN      IPSECKEY  10 0 2 . AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
+ipseckey03.example.    3600    IN      IPSECKEY  10 1 2 192.0.2.3 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
+ipseckey04.example.    3600    IN      IPSECKEY  10 3 2 mygateway.example.com. AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
+ipseckey05.example.    3600    IN      IPSECKEY  10 2 2 2001:db8:0:8002::2000:1 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
 isdn01.example.                3600    IN      ISDN    "isdn-address"
 isdn02.example.                3600    IN      ISDN    "isdn-address" "subaddress"
 isdn03.example.                3600    IN      ISDN    "isdn-address"
@@ -99,8 +114,12 @@ rrsig01.example.    3600    IN      RRSIG   NSEC 1 3 3600 20000102030405 19961211100908 2143
 sink01.example.                3600    IN      SINK    1 0 0
 sink02.example.                3600    IN      SINK    8 0 2 l4ik
 smimea.example.                3600    IN      SMIMEA  1 1 2 92003BA34942DC74152E2F2C408D29ECA5A520E7F2E06BB944F4DCA3 46BAF63C1B177615D466F6C4B71C216A50292BD58C9EBDD2F74E38FE 51FFD48C43326CBC
+spf01.example.         3600    IN      SPF     "v=spf1 -all"
+spf02.example.         3600    IN      SPF     "v=spf1" " -all"
 srv01.example.         3600    IN      SRV     0 0 0 .
 srv02.example.         3600    IN      SRV     65535 65535 65535 old-slow-box.example.
+sshfp01.example.       3600    IN      SSHFP   4 2 C76D8329954DA2835751E371544E963EFDA099080D6C58DD2BFD9A31 6E162C83
+sshfp02.example.       3600    IN      SSHFP   1 2 BF29468C83AC58CCF8C85AB7B3BEB054ECF1E38512B8353AB36471FA 88961DCC
 ta.example.            3600    IN      TA      30795 1 1 310D27F4D82C1FC2400704EA9939FE6E1CEAA3B9
 talink0.example.       3600    IN      TALINK  . talink1.example.
 talink1.example.       3600    IN      TALINK  talink0.example. talink2.example.
@@ -128,4 +147,7 @@ wks01.example.              3600    IN      WKS     10.0.0.1 6 0 1 2 21 23
 wks02.example.         3600    IN      WKS     10.0.0.1 17 0 1 2 53
 wks03.example.         3600    IN      WKS     10.0.0.2 6 65535
 x2501.example.         3600    IN      X25     "123456789"
+8f1tmio9avcom2k0frp92lgcumak0cad.example. 3600 IN NSEC3 1 0 10 D2CF0294C020CE6C 8FPNS2UCT7FBS643THP2B77PEQ77K6IU  A NS SOA MX AAAA RRSIG DNSKEY NSEC3PARAM
+kcd3juae64f9c5csl1kif1htaui7un0g.example. 3600 IN NSEC3 1 0 10 D2CF0294C020CE6C KD5MN2M20340DGO0BL7NTSB8JP4BSC7E
+mr5ukvsk1l37btu4q7b1dfevft4hkqdk.example. 3600 IN NSEC3 1 0 10 D2CF0294C020CE6C MT38J6VG7S0SN5G17MCUF6IQIKFUAJ05  A AAAA RRSIG
 example.               86400   IN      SOA     ns2.example. hostmaster.example. 1397051953 5 5 1814400 3600

diff --git a/bin/tests/system/zero/tests.sh b/bin/tests/system/zero/tests.sh
index dbb96e74ed00b4e8f23f40774d5f35ad32b78ef6..9b2a8515c7d899deb071299b1a8b7477cba4fce9 100644 (file)
--- a/bin/tests/system/zero/tests.sh
+++ b/bin/tests/system/zero/tests.sh
@@ -14,7 +14,7 @@ n=`expr $n + 1`
 echo "I:check lookups against TTL=0 records ($n)"
 i=0
 passes=10
-$DIG -p 5300 @10.53.0.2 axfr example | 
+$DIG -p 5300 @10.53.0.2 axfr example | grep -v "^ds0" |
 awk '$2 == "0" { print "-q", $1, $4; print "-q", "zzz"$1, $4;}' > query.list
 while [ $i -lt $passes ]
 do

diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c
index d86414238f223a31c4819b714b8aa3c5d0e561b2..36e4134593134fc7528327dd86fad26328113d05 100644 (file)
--- a/lib/dns/rdata/generic/nsec3_50.c
+++ b/lib/dns/rdata/generic/nsec3_50.c
@@ -157,7 +157,10 @@ totext_nsec3(ARGS_TOTEXT) {
        RETERR(isc_base32hexnp_totext(&sr, 1, "", target));
        sr.length = i - j;
 
-       if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) == 0)
+       /*
+        * Don't leave a trailing space when there's no typemap present.
+        */
+       if (((tctx->flags & DNS_STYLEFLAG_MULTILINE) == 0) && (sr.length > 0))
                RETERR(str_totext(" ", target));
 
        RETERR(typemap_totext(&sr, tctx, target));