From 1611ceb8b2d056cf09ea42b847498f2986432ac0 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 11 May 2017 10:54:52 +1000 Subject: [PATCH] 4622. [bug] Remove unnecessary escaping of semicolon in CAA and URI records. [RT #45216] --- CHANGES | 3 +++ bin/tests/system/xfer/dig1.good | 2 +- bin/tests/system/xfer/dig2.good | 2 +- lib/dns/rdata.c | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index a5b23556c8..44e138290d 100644 --- 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 9af36c4159..e47bfc401b 100644 --- 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 72d4fc16ef..443dec3fc7 100644 --- 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 a65da6c469..1ea05151a5 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -1594,8 +1594,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++ = '\\';