4622. [bug] Remove unnecessary escaping of semicolon in CAA and

                        URI records. [RT #45216]

(cherry picked from commit 1611ceb8b2d056cf09ea42b847498f2986432ac0)

diff --git a/CHANGES b/CHANGES
index b61cc9a99f5990939458df7246e8825dc36431b5..f27645cd8da943996d048a57859a92f3eefbf287 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4622.  [bug]           Remove unnecessary escaping of semicolon in CAA and
+                       URI records. [RT #45216]
+
 4621.  [port]          Force alignment of oid arrays to silence loader
                        warnings. [RT #45131]
 

diff --git a/bin/tests/system/xfer/dig1.good b/bin/tests/system/xfer/dig1.good
index 9af36c41593a6593acf1a3e35015835348b91387..e47bfc401baf73d8a5d88b54aec5594d05b6e19f 100644 (file)
--- a/bin/tests/system/xfer/dig1.good
+++ b/bin/tests/system/xfer/dig1.good
@@ -10,7 +10,7 @@ a601.example.         3600    IN      A6      128  .
 afsdb01.example.       3600    IN      AFSDB   0 hostname.example.
 afsdb02.example.       3600    IN      AFSDB   65535 .
 avc.example.           3600    IN      AVC     "foo:bar"
-caa01.example.         3600    IN      CAA     0 issue "ca.example.net\; policy=ev"
+caa01.example.         3600    IN      CAA     0 issue "ca.example.net; policy=ev"
 caa02.example.         3600    IN      CAA     128 tbs "Unknown"
 caa03.example.         3600    IN      CAA     128 tbs ""
 cdnskey01.example.     3600    IN      CDNSKEY 512 255 1 AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aRyzWZriO6i2od GWWQVucZqKVsENW91IOW4vqudngPZsY3GvQ/xVA8/7pyFj6b7Esga60z yGW6LFe9r8n6paHrlG5ojqf0BaqHT+8=

diff --git a/bin/tests/system/xfer/dig2.good b/bin/tests/system/xfer/dig2.good
index 72d4fc16ef3b8c707e749be58b97b0f3d8d798c1..443dec3fc75dd8a6811c826304742a108c434562 100644 (file)
--- a/bin/tests/system/xfer/dig2.good
+++ b/bin/tests/system/xfer/dig2.good
@@ -10,7 +10,7 @@ a601.example.         3600    IN      A6      128  .
 afsdb01.example.       3600    IN      AFSDB   0 hostname.example.
 afsdb02.example.       3600    IN      AFSDB   65535 .
 avc.example.           3600    IN      AVC     "foo:bar"
-caa01.example.         3600    IN      CAA     0 issue "ca.example.net\; policy=ev"
+caa01.example.         3600    IN      CAA     0 issue "ca.example.net; policy=ev"
 caa02.example.         3600    IN      CAA     128 tbs "Unknown"
 caa03.example.         3600    IN      CAA     128 tbs ""
 cdnskey01.example.     3600    IN      CDNSKEY 512 255 1 AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aRyzWZriO6i2od GWWQVucZqKVsENW91IOW4vqudngPZsY3GvQ/xVA8/7pyFj6b7Esga60z yGW6LFe9r8n6paHrlG5ojqf0BaqHT+8=

diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index ad22b43a0a72531649d076739bfed2499a15508c..72dd5f3201b5f1b50976f9650a4bf6ba0aab05a9 100644 (file)
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -1590,8 +1590,8 @@ multitxt_totext(isc_region_t *source, isc_buffer_t *target) {
                                tl -= 4;
                                continue;
                        }
-                       /* double quote, semi-colon, backslash */
-                       if (*sp == 0x22 || *sp == 0x3b || *sp == 0x5c) {
+                       /* double quote, backslash */
+                       if (*sp == 0x22 || *sp == 0x5c) {
                                if (tl < 2)
                                        return (ISC_R_NOSPACE);
                                *tp++ = '\\';