diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2009-07-29 00:14:14 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2009-07-29 00:14:14 +0000 |
| commit | b00ac27ba5bfab50fde32290c7c2f29dd64f09f0 (patch) | |
| tree | 21f2ff4fbb66eab1cd04c42252470416072e6a92 | |
| parent | 7649a2ac49b94b4c9a8bb70eb127bec1e9b471dc (diff) | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | contrib/bind9/bin/named/update.c | 6 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -8,6 +8,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20090729: p6 FreeBSD-SA-09:12.bind + Fix BIND named(8) dynamic update message remote DoS. + 20090610: p5 FreeBSD-SA-09:09.pipe, FreeBSD-SA-09:10.ipv6, FreeBSD-SA-09:11.ntpd Prevent integer overflow in direct pipe write code from circumventing diff --git a/contrib/bind9/bin/named/update.c b/contrib/bind9/bin/named/update.c index 6733d76902b1..e1aee6b47f6c 100644 --- a/contrib/bind9/bin/named/update.c +++ b/contrib/bind9/bin/named/update.c @@ -863,7 +863,11 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, if (type == dns_rdatatype_rrsig || type == dns_rdatatype_sig) covers = dns_rdata_covers(&t->rdata); - else + else if (type == dns_rdatatype_any) { + dns_db_detachnode(db, &node); + dns_diff_clear(&trash); + return (DNS_R_NXRRSET); + } else covers = 0; /* diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 871ef855e7f1..e4b37cbe7c35 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="6.4" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |