ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'master' of ssh://repo.isc.org/proj/git/prod/bind9

Browse Source
This commit is contained in:
Francis Dupont
2016-01-05 00:35:20 +01:00
parent 7e9140c6b1 5affecff6e
commit 692dfe63a0
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
4287. [bug] Silence an overly noisy log message when message
parsing fails. [RT #41374]
4286. [security] render_ecs errors were mishandled when printing out
a OPT record resulting in a assertion failure.
(CVE-2015-8705) [RT #41397]

2
bin/named/client.c
View File

@@ -2281,7 +2281,7 @@ client_request(isc_task_t *task, isc_event_t *event) {
&client->opt);
ns_client_log(client, NS_LOGCATEGORY_CLIENT,
NS_LOGMODULE_CLIENT, ISC_LOG_WARNING,
NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(1),
"message parsing failed: %s",
isc_result_totext(result));
ns_client_error(client, result);

12
util/copyrights
View File

@@ -1,7 +1,7 @@
./.gitattributes X 2015
./.gitignore X 2012,2013,2014,2015
./Atffile X 2011
./CHANGES X 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
./CHANGES X 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
./COPYRIGHT TXT 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
./FAQ X 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015
./FAQ.xml SGML 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015
@@ -218,10 +218,10 @@
./bin/dnssec/win32/verify.vcxproj.user X 2013
./bin/named/.gitignore X 2012,2014
./bin/named/Makefile.in MAKE 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
./bin/named/bind9.xsl SGML 2006,2007,2008,2009,2012,2013,2014,2015
./bin/named/bind9.xsl.h X 2007,2008,2009,2011,2012,2013,2014,2015
./bin/named/bind9.xsl SGML 2006,2007,2008,2009,2012,2013,2014,2015,2016
./bin/named/bind9.xsl.h X 2007,2008,2009,2011,2012,2013,2014,2015,2016
./bin/named/builtin.c C 2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015
./bin/named/client.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
./bin/named/client.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
./bin/named/config.c C 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
./bin/named/control.c C 2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015
./bin/named/controlconf.c C 2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2014,2015
@@ -284,7 +284,7 @@
./bin/named/query.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
./bin/named/server.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
./bin/named/sortlist.c C 2000,2001,2004,2005,2006,2007
./bin/named/statschannel.c C 2008,2009,2010,2011,2012,2013,2014,2015
./bin/named/statschannel.c C 2008,2009,2010,2011,2012,2013,2014,2015,2016
./bin/named/tkeyconf.c C 1999,2000,2001,2004,2005,2006,2007,2009,2010,2012,2014
./bin/named/tsigconf.c C 1999,2000,2001,2004,2005,2006,2007,2009,2011,2012
./bin/named/unix/Makefile.in MAKE 1999,2000,2001,2004,2007,2009,2011,2012
@@ -3064,7 +3064,7 @@
./doc/arm/notes.conf X 2015
./doc/arm/notes.html X 2014,2015,2016
./doc/arm/notes.pdf X 2014,2015
./doc/arm/notes.xml SGML 2014,2015
./doc/arm/notes.xml SGML 2014,2015,2016
./doc/arm/noteversion.xml.in SGML 2015
./doc/arm/pkcs11.xml SGML 2010,2012,2013,2014,2015
./doc/arm/pkgversion.xml.in SGML 2015