From 6750780e88248c21dd4d83105af540580acb52c3 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 3 Jan 2019 16:08:39 +1100 Subject: [PATCH 1/2] allow for up 100 records or 64K of data to be in a ncache entry (cherry picked from commit 604889e6274d80845ffce529a4247818c3c4b50d) --- lib/dns/ncache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c index c5078dedfb..d71f0d8f1f 100644 --- a/lib/dns/ncache.c +++ b/lib/dns/ncache.c @@ -28,7 +28,7 @@ #include #include -#define DNS_NCACHE_RDATA 20U +#define DNS_NCACHE_RDATA 100U /* * The format of an ncache rdata is a sequence of zero or more records of @@ -129,7 +129,7 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, dns_rdata_t rdata[DNS_NCACHE_RDATA]; dns_rdataset_t ncrdataset; dns_rdatalist_t ncrdatalist; - unsigned char data[4096]; + unsigned char data[65536]; unsigned int next = 0; /* From e9d979094824cd1cc7b5ed8e8d106af65f5cd7fa Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 3 Jan 2019 16:11:19 +1100 Subject: [PATCH 2/2] add CHANGES entry (cherry picked from commit 3328116b572605880cd54e84a0b320ff20581370) --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 47d15a4e57..b04654a390 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5125. [bug] Allow for up to 100 records or 64k of data when caching + a negative response. [GL #804] + 5124. [bug] Named could incorrectly return FORMERR rather than SERVFAIL. [GL #804]