Improve TXT records in example zone.

This zone was copied from a zone file in BIND long ago.  BIND contains
both sample zone files and a script to generate sample zone files, but
the committed files appear to have been generated by a broken version of
the script.

This updates the TXT records to what the script would have generated,
which is far more complete.

diff --git a/tests/example b/tests/example
index 2378ef0ca4b9a059be297dfe990db96a65961b89..c35ba47009fa8eeaa95a04ff4ee381c0aefeaed6 100644 (file)
--- a/tests/example
+++ b/tests/example
@@ -140,17 +140,19 @@ tlsa2                     TLSA    1 0 1 efddf0d915c7bdc5782c0881e1b2a95ad099fbdd06d7b1f77982d93643
 tlsa3                  TLSA    1 0 2 81ee7f6c0ecc6b09b7785a9418f54432de630dd54dc6ee9e3c49de547708d236d4c413c3e97e44f969e635958aa410495844127c04883503e5b024cf7a8f6a94
 txt01                  TXT     "foo"
 txt02                  TXT     "foo" "bar"
-txt03                  TXT     "foo"
-txt04                  TXT     "foo" "bar"
+txt03                  TXT     foo
+txt04                  TXT     foo bar
 txt05                  TXT     "foo bar"
-txt06                  TXT     "foo bar"
-txt07                  TXT     "foo bar"
+txt06                  TXT     "foo\032bar"
+txt07                  TXT     foo\032bar
 txt08                  TXT     "foo\010bar"
-txt09                  TXT     "foo\010bar"
-txt10                  TXT     "foo bar"
+txt09                  TXT     foo\010bar
+txt10                  TXT     foo\ bar
 txt11                  TXT     "\"foo\""
-txt12                  TXT     "\"foo\""
-txt13                  TXT     foo
+txt12                  TXT     \"foo\"
+txt13                  TXT     "foo;"
+txt14                  TXT     "foo\;"
+txt15                  TXT     "bar\\;"
 $TTL 300       ; 5 minutes
 u                      TXT     "txt-not-in-nxt"
 $ORIGIN u.example.

diff --git a/tests/example1.good b/tests/example1.good
index 8c5e8bf79bf7cf1a1ce3f7e7527890af52ce7569..a52e55c1e41c0e7846f05b81147ef3c1160da984 100644 (file)
--- a/tests/example1.good
+++ b/tests/example1.good
@@ -121,7 +121,9 @@ txt09 3600 IN TXT "foo\010bar"
 txt10 3600 IN TXT "foo bar"
 txt11 3600 IN TXT "\"foo\""
 txt12 3600 IN TXT "\"foo\""
-txt13 3600 IN TXT "foo"
+txt13 3600 IN TXT "foo;"
+txt14 3600 IN TXT "foo;"
+txt15 3600 IN TXT "bar\\;"
 u 300 IN TXT "txt-not-in-nxt"
 a.u 300 IN A 73.80.65.49
 b.u 300 IN A 73.80.65.49

diff --git a/tests/example2.good b/tests/example2.good
index 65efdbfc29756124fb8d458170f011010671afeb..df0fed627096ae0d1348fc0192fb3a49482d0a38 100644 (file)
--- a/tests/example2.good
+++ b/tests/example2.good
@@ -121,7 +121,9 @@ txt09.example. 3600 IN TXT "foo\010bar"
 txt10.example. 3600 IN TXT "foo bar"
 txt11.example. 3600 IN TXT "\"foo\""
 txt12.example. 3600 IN TXT "\"foo\""
-txt13.example. 3600 IN TXT "foo"
+txt13.example. 3600 IN TXT "foo;"
+txt14.example. 3600 IN TXT "foo;"
+txt15.example. 3600 IN TXT "bar\\;"
 u.example. 300 IN TXT "txt-not-in-nxt"
 a.u.example. 300 IN A 73.80.65.49
 b.u.example. 300 IN A 73.80.65.49

diff --git a/tests/example3.good b/tests/example3.good
index 8c5e8bf79bf7cf1a1ce3f7e7527890af52ce7569..a52e55c1e41c0e7846f05b81147ef3c1160da984 100644 (file)
--- a/tests/example3.good
+++ b/tests/example3.good
@@ -121,7 +121,9 @@ txt09 3600 IN TXT "foo\010bar"
 txt10 3600 IN TXT "foo bar"
 txt11 3600 IN TXT "\"foo\""
 txt12 3600 IN TXT "\"foo\""
-txt13 3600 IN TXT "foo"
+txt13 3600 IN TXT "foo;"
+txt14 3600 IN TXT "foo;"
+txt15 3600 IN TXT "bar\\;"
 u 300 IN TXT "txt-not-in-nxt"
 a.u 300 IN A 73.80.65.49
 b.u 300 IN A 73.80.65.49