upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 03:29:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

address merge error

Browse source
This commit is contained in:
Mark Andrews 2017-07-07 15:46:31 +10:00
parent 4e69e1d072
commit c4f0e9c412
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -277,15 +277,9 @@ CVE-2017-3137, and CVE-2017-3138.
#### BIND 9.10.6
<<<<<<< HEAD
BIND 9.10.6 is a maintenance release, and addresses the security flaws
disclosed in CVE-2017-3140 and CVE-2017-3141.
=======
BIND 9.11.2 is a maintenance release, and addresses the security flaws
disclosed in CVE-2017-3140, CVE-2017-3141, CVE-2017-3142 and CVE-2017-3143.
It also addresses several bugs related to the use of an LMDB database to
store data related to zones added via `rndc addzone` or catalog zones.
>>>>>>> a03f4b1... [v9_11] address TSIG bypass/forgery vulnerabilities
BIND 9.10.6 is a maintenance release, and addresses the security
flaws disclosed in CVE-2017-3140 and CVE-2017-3141, CVE-2017-3142
and CVE-2017-3143.
### <a name="build"/> Building BIND