CVS commit: src/external/bsd/bind/dist/lib/isc/unix

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Thu Oct 18 14:30:54 UTC 2018

Modified Files:
src/external/bsd/bind/dist/lib/isc/unix: socket.c

Log Message:
Apply suggested fix from https://gitlab.isc.org/isc-projects/bind9/issues/589.
This would on NetBSD prevent UDP replies > 1432 bytes in size
transported over IPv4, because an IPv6 control message is applied
on an IPv4 socket, which will subsequently be refused.  Therefore,
apply that control mssage only on IPv6 sockets.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/dist/lib/isc/unix/socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/unix/socket.c
diff -u src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.23 src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.24
--- src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.23	Mon Aug 13 08:46:53 2018
+++ src/external/bsd/bind/dist/lib/isc/unix/socket.c	Thu Oct 18 14:30:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.c,v 1.23 2018/08/13 08:46:53 christos Exp $	*/
+/*	$NetBSD: socket.c,v 1.24 2018/10/18 14:30:54 he Exp $	*/
 
 /*
  * Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
@@ -1548,7 +1548,8 @@ build_msghdr_send(isc__socket_t *sock, i
 
 #if defined(IPV6_USE_MIN_MTU)
 	if ((sock->type == isc_sockettype_udp) &&
-	((dev->attributes & ISC_SOCKEVENTATTR_USEMINMTU) != 0))
+	((dev->attributes & ISC_SOCKEVENTATTR_USEMINMTU) != 0) &&
+	(sock->pf == AF_INET6))
 	{
 		int use_min_mtu = 1;	/* -1, 0, 1 */
 

CVS commit: src/external/bsd/bind/dist/lib/isc/unix

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Aug 13 08:46:53 UTC 2018

Modified Files:
src/external/bsd/bind/dist/lib/isc/unix: socket.c

Log Message:
make ENOBUFS a soft error (from roy@)


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/lib/isc/unix/socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/unix/socket.c
diff -u src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.22 src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.23
--- src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.22	Sat Apr  7 18:23:23 2018
+++ src/external/bsd/bind/dist/lib/isc/unix/socket.c	Mon Aug 13 04:46:53 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.c,v 1.22 2018/04/07 22:23:23 christos Exp $	*/
+/*	$NetBSD: socket.c,v 1.23 2018/08/13 08:46:53 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
@@ -258,6 +258,7 @@ typedef enum { poll_idle, poll_active, p
 #define SOFT_ERROR(e)	((e) == EAGAIN || \
 			 (e) == EWOULDBLOCK || \
 			 (e) == EINTR || \
+			 (e) == ENOBUFS || \
 			 (e) == 0)
 
 #define DLVL(x) ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(x)
@@ -1920,7 +1921,7 @@ doio_recv(isc__socket_t *sock, isc_socke
 		SOFT_OR_HARD(EHOSTDOWN, ISC_R_HOSTDOWN);
 		/* HPUX 11.11 can return EADDRNOTAVAIL. */
 		SOFT_OR_HARD(EADDRNOTAVAIL, ISC_R_ADDRNOTAVAIL);
-		ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
+		SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES);
 		/* Should never get this one but it was seen. */
 #ifdef ENOPROTOOPT
 		SOFT_OR_HARD(ENOPROTOOPT, ISC_R_HOSTUNREACH);
@@ -2116,7 +2117,7 @@ doio_send(isc__socket_t *sock, isc_socke
 		ALWAYS_HARD(EHOSTDOWN, ISC_R_HOSTUNREACH);
 #endif
 		ALWAYS_HARD(ENETUNREACH, ISC_R_NETUNREACH);
-		ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
+		SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES);
 		ALWAYS_HARD(EPERM, ISC_R_HOSTUNREACH);
 		ALWAYS_HARD(EPIPE, ISC_R_NOTCONNECTED);
 		ALWAYS_HARD(ECONNRESET, ISC_R_CONNECTIONRESET);

CVS commit: src/external/bsd/bind/dist/lib/isc/include/isc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Feb 18 23:51:20 UTC 2018

Modified Files:
src/external/bsd/bind/dist/lib/isc/include/isc: util.h

Log Message:
llvm detects infinite recursion, so don't infinitely recurse.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/bsd/bind/dist/lib/isc/include/isc/util.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/include/isc/util.h
diff -u src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.12 src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.13
--- src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.12	Thu May 26 12:50:00 2016
+++ src/external/bsd/bind/dist/lib/isc/include/isc/util.h	Sun Feb 18 18:51:20 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.h,v 1.12 2016/05/26 16:50:00 christos Exp $	*/
+/*	$NetBSD: util.h,v 1.13 2018/02/18 23:51:20 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2010-2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
@@ -79,7 +79,7 @@
  * Use this in translation units that would otherwise be empty, to
  * suppress compiler warnings.
  */
-#define EMPTY_TRANSLATION_UNIT static void __used isc__empty(void) { isc__empty(); }
+#define EMPTY_TRANSLATION_UNIT static void __used isc__empty(int level) { if (level++ < 100) isc__empty(level); }
 
 /*%
  * We use macros instead of calling the routines directly because

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Jun 30 11:32:34 UTC 2017

Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api dnssec.c message.c rootns.c
tsig.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.25 -r1.26 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.15 -r1.16 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/bind/dist/lib/dns/dnssec.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/lib/dns/rootns.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/bind/dist/lib/dns/tsig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.27 src/external/bsd/bind/dist/CHANGES:1.28
--- src/external/bsd/bind/dist/CHANGES:1.27	Thu Jun 15 11:59:35 2017
+++ src/external/bsd/bind/dist/CHANGES	Fri Jun 30 07:32:33 2017
@@ -1,3 +1,11 @@
+	--- 9.10.5-P2 released ---
+
+4643.	[security]	An error in TSIG handling could permit unauthorized
+			zone transfers or zone updates. (CVE-2017-3142)
+			(CVE-2017-3143) [RT #45383]
+
+4633.	[maint]		Updated  (2001:500:200::b) for B.ROOT-SERVERS.NET.
+
 	--- 9.10.5-P1 released ---
 
 4632.	[security]	The BIND installer on Windows used an unquoted

Index: src/external/bsd/bind/dist/README
diff -u src/external/bsd/bind/dist/README:1.15 src/external/bsd/bind/dist/README:1.16
--- src/external/bsd/bind/dist/README:1.15	Thu Jun 15 11:59:36 2017
+++ src/external/bsd/bind/dist/README	Fri Jun 30 07:32:33 2017
@@ -51,6 +51,11 @@ BIND 9
 	For 

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 13 19:11:20 UTC 2017

Modified Files:
src/external/bsd/bind/dist: CHANGES README configure srcid version
src/external/bsd/bind/dist/bin/named: query.c
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api rdataset.c resolver.c
src/external/bsd/bind/dist/lib/isc: lex.c
src/external/bsd/bind/dist/lib/isc/include/isc: lex.h

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/configure
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/dist/bin/named/query.c
cvs rdiff -u -r1.13 -r1.14 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/dns/rdataset.c
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/lib/isc/lex.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/isc/include/isc/lex.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.25 src/external/bsd/bind/dist/CHANGES:1.26
--- src/external/bsd/bind/dist/CHANGES:1.25	Wed Feb  8 19:23:26 2017
+++ src/external/bsd/bind/dist/CHANGES	Thu Apr 13 15:11:19 2017
@@ -1,7 +1,27 @@
+	--- 9.10.4-P8 released ---
+
+4582.	[security]	'rndc ""' could trigger a assertion failure in named.
+			(CVE-2017-3138) [RT #44924]
+
+4580.	[bug]		4578 introduced a regression when handling CNAME to
+			referral below the current domain. [RT #44850]
+
+	--- 9.10.4-P7 released ---
+
+4578.	[security]	Some chaining (CNAME or DNAME) responses to upstream

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Feb  9 00:23:27 UTC 2017

Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/bin/named: query.c
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api message.c rdataset.c resolver.c

Log Message:
Merge 9.10.4-P6
4558.   [bug]   Synthesised CNAME before matching DNAME was still
being cached when it should have been.  [RT #44318]

4557.   [security]  Combining dns64 and rpz can result in dereferencing
a NULL pointer (read).  (CVE-2017-3135) [RT#44434]


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/bin/named/query.c
cvs rdiff -u -r1.12 -r1.13 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/rdataset.c
cvs rdiff -u -r1.28 -r1.29 src/external/bsd/bind/dist/lib/dns/resolver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.24 src/external/bsd/bind/dist/CHANGES:1.25
--- src/external/bsd/bind/dist/CHANGES:1.24	Thu Jan 12 03:21:32 2017
+++ src/external/bsd/bind/dist/CHANGES	Wed Feb  8 19:23:26 2017
@@ -1,3 +1,11 @@
+	--- 9.10.4-P6 released ---
+
+4558.	[bug]		Synthesised CNAME before matching DNAME was still
+			being cached when it should have been.  [RT #44318]
+
+4557.	[security]	Combining dns64 and rpz can result in dereferencing
+			a NULL pointer (read).  (CVE-2017-3135) [RT#44434]
+
 	--- 9.10.4-P5 released 

CVS commit: src/external/bsd/bind/dist/bin/named

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Thu Jan 12 08:38:31 UTC 2017

Added Files:
src/external/bsd/bind/dist/bin/named: pfilter.c pfilter.h

Log Message:
don't "clean up" the blacklistd integration


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.4 src/external/bsd/bind/dist/bin/named/pfilter.c
cvs rdiff -u -r0 -r1.3 src/external/bsd/bind/dist/bin/named/pfilter.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/bind/dist/bin/named/pfilter.c
diff -u /dev/null src/external/bsd/bind/dist/bin/named/pfilter.c:1.4
--- /dev/null	Thu Jan 12 08:38:31 2017
+++ src/external/bsd/bind/dist/bin/named/pfilter.c	Thu Jan 12 08:38:31 2017
@@ -0,0 +1,47 @@
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include "pfilter.h"
+
+static struct blacklist *blstate;
+
+void
+pfilter_open(void)
+{
+	if (blstate == NULL)
+		blstate = blacklist_open();
+}
+
+#define TCP_CLIENT(c)  (((c)->attributes & NS_CLIENTATTR_TCP) != 0)
+
+void
+pfilter_notify(isc_result_t res, ns_client_t *client, const char *msg)
+{
+	isc_socket_t *socket;
+
+	pfilter_open();
+
+	if (TCP_CLIENT(client))
+		socket = client->tcpsocket;
+	else {
+		socket = client->udpsocket;
+		if (!client->peeraddr_valid)
+			return;
+	}
+
+	if (socket == NULL)
+		return;
+
+	if (blstate == NULL)
+		return;
+
+	blacklist_sa_r(blstate, 
+	res != ISC_R_SUCCESS, isc_socket_getfd(socket),
+	>peeraddr.type.sa, client->peeraddr.length, msg);
+}

Index: src/external/bsd/bind/dist/bin/named/pfilter.h
diff -u /dev/null src/external/bsd/bind/dist/bin/named/pfilter.h:1.3
--- /dev/null	Thu Jan 12 08:38:31 2017
+++ src/external/bsd/bind/dist/bin/named/pfilter.h	Thu Jan 12 08:38:31 2017
@@ -0,0 +1,2 @@
+void pfilter_open(void);
+void pfilter_notify(isc_result_t, ns_client_t *, const char *);

CVS commit: src/external/bsd/bind/dist

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Thu Jan 12 08:21:33 UTC 2017

Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
man.arpaname.html man.ddns-confgen.html man.delv.html man.dig.html
man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api message.c resolver.c
src/external/bsd/bind/dist/lib/isc/unix: socket.c
src/external/bsd/bind/dist/lib/isc/win32: socket.c
Removed Files:
src/external/bsd/bind/dist/bin/named: pfilter.c pfilter.h
src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat: zkt-ls
zkt-signer
src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/hierarchical:
zkt-ls zkt-signer

Log Message:
merge bind-9.10.4-P5


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.2 -r0 src/external/bsd/bind/dist/bin/named/pfilter.c
cvs rdiff -u -r1.1 -r0 src/external/bsd/bind/dist/bin/named/pfilter.h
cvs rdiff -u -r1.1 -r0 \
src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat/zkt-ls \
src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat/zkt-signer
cvs rdiff -u -r1.1 -r0 \
src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/hierarchical/zkt-ls \

src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/hierarchical/zkt-signer
cvs rdiff -u -r1.11 -r1.12 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/lib/isc/unix/socket.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/bind/dist/lib/isc/win32/socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.23 

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Nov  1 21:55:53 UTC 2016

Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api resolver.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/bind/dist/lib/dns/resolver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.22 src/external/bsd/bind/dist/CHANGES:1.23
--- src/external/bsd/bind/dist/CHANGES:1.22	Tue Oct  4 19:46:00 2016
+++ src/external/bsd/bind/dist/CHANGES	Tue Nov  1 17:55:51 2016
@@ -1,3 +1,8 @@
+	--- 9.10.4-P4 released ---
+
+4489.	[security]	It was possible to trigger assertions when processing
+			a response. (CVE-2016-8864) [RT #43465]
+
 	--- 9.10.4-P3 released ---
 
 4468.	[bug]		Address ECS option handling issues. [RT #43191]

Index: src/external/bsd/bind/dist/README
diff -u src/external/bsd/bind/dist/README:1.10 src/external/bsd/bind/dist/README:1.11
--- src/external/bsd/bind/dist/README:1.10	Tue Oct  4 19:46:00 2016
+++ src/external/bsd/bind/dist/README	Tue Nov  1 17:55:51 2016
@@ -51,6 +51,10 @@ BIND 9
 	For up-to-date release notes and errata, see
 	http://www.isc.org/software/bind9/releasenotes
 
+BIND 9.10.4-P4
+
+	This version contains a fix for CVE-2016-8864.
+
 BIND 9.10.4-P3
 
 	This version contains a fix for CVE-2016-2776 and addresses

Index: src/external/bsd/bind/dist/srcid
diff -u src/external/bsd/bind/dist/srcid:1.16 

CVS commit: src/external/bsd/bind/dist/bin/named

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Oct  9 14:53:54 UTC 2016

Modified Files:
src/external/bsd/bind/dist/bin/named: xfrout.c

Log Message:
PR/51542: Henning Petersen: replace , with ;


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/bind/dist/bin/named/xfrout.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/xfrout.c
diff -u src/external/bsd/bind/dist/bin/named/xfrout.c:1.11 src/external/bsd/bind/dist/bin/named/xfrout.c:1.12
--- src/external/bsd/bind/dist/bin/named/xfrout.c:1.11	Thu May 26 12:49:56 2016
+++ src/external/bsd/bind/dist/bin/named/xfrout.c	Sun Oct  9 10:53:54 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: xfrout.c,v 1.11 2016/05/26 16:49:56 christos Exp $	*/
+/*	$NetBSD: xfrout.c,v 1.12 2016/10/09 14:53:54 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
@@ -1186,7 +1186,7 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_cl
 	xfr->txmem = NULL;
 	xfr->txmemlen = 0;
 	xfr->nmsg = 0;
-	xfr->many_answers = many_answers,
+	xfr->many_answers = many_answers;
 	xfr->sends = 0;
 	xfr->shuttingdown = ISC_FALSE;
 	xfr->mnemonic = NULL;

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 23:46:01 UTC 2016

Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/bin/named: lwdgrbn.c
src/external/bsd/bind/dist/bin/pkcs11: pkcs11-destroy.8 pkcs11-keygen.8
pkcs11-list.8
src/external/bsd/bind/dist/bin/tests/system/lwresd: lwtest.c
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api message.c nsec3.c rbtdb.c
src/external/bsd/bind/dist/lib/dns/rdata/generic: opt_41.c
src/external/bsd/bind/dist/lib/dns/tests: rdata_test.c

Log Message:
Merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/named/lwdgrbn.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/bin/pkcs11/pkcs11-destroy.8 \
src/external/bsd/bind/dist/bin/pkcs11/pkcs11-keygen.8
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/bin/pkcs11/pkcs11-list.8
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/bind/dist/bin/tests/system/lwresd/lwtest.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/lib/dns/nsec3.c
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/lib/dns/rbtdb.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/bind/dist/lib/dns/rdata/generic/opt_41.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/lib/dns/tests/rdata_test.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.21 

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Mar 23 21:39:42 UTC 2016

Modified Files:
src/external/bsd/bind/dist/lib/dns: spnego.c

Log Message:
XXX: vax gcc


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/dns/spnego.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/spnego.c
diff -u src/external/bsd/bind/dist/lib/dns/spnego.c:1.9 src/external/bsd/bind/dist/lib/dns/spnego.c:1.10
--- src/external/bsd/bind/dist/lib/dns/spnego.c:1.9	Wed Dec 16 23:00:43 2015
+++ src/external/bsd/bind/dist/lib/dns/spnego.c	Wed Mar 23 17:39:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: spnego.c,v 1.9 2015/12/17 04:00:43 christos Exp $	*/
+/*	$NetBSD: spnego.c,v 1.10 2016/03/23 21:39:42 christos Exp $	*/
 
 /*
  * Copyright (C) 2006-2015  Internet Systems Consortium, Inc. ("ISC")
@@ -1516,7 +1516,7 @@ spnego_initial(OM_uint32 *minor_status,
 	gss_buffer_desc	krb5_output_token = GSS_C_EMPTY_BUFFER;
 	unsigned char *buf = NULL;
 	size_t buf_size;
-	size_t len;
+	size_t len = 0;	/* XXX: gcc */
 	int ret;
 
 	(void)mech_type;

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Dec 17 04:00:46 UTC 2015

Modified Files:
src/external/bsd/bind/dist: CHANGES README config.h.in configure
configure.in srcid version
src/external/bsd/bind/dist/bin/check: check-tool.c named-checkconf.c
named-checkzone.c
src/external/bsd/bind/dist/bin/confgen: keygen.c util.c
src/external/bsd/bind/dist/bin/dig: dig.1 dig.c dighost.c nslookup.c
src/external/bsd/bind/dist/bin/dig/include/dig: dig.h
src/external/bsd/bind/dist/bin/dnssec: dnssec-dsfromkey.8
dnssec-dsfromkey.c dnssec-keygen.c dnssec-revoke.c dnssec-settime.c
dnssec-signzone.c
src/external/bsd/bind/dist/bin/named: client.c config.c control.c
interfacemgr.c logconf.c lwdclient.c lwresd.c main.c named.8
query.c server.c statschannel.c update.c xfrout.c
src/external/bsd/bind/dist/bin/named/include/named: lwdclient.h main.h
server.h
src/external/bsd/bind/dist/bin/named/win32: ntservice.c os.c
src/external/bsd/bind/dist/bin/nsupdate: nsupdate.1 nsupdate.c
src/external/bsd/bind/dist/bin/pkcs11: pkcs11-destroy.c pkcs11-keygen.c
pkcs11-list.c
src/external/bsd/bind/dist/bin/rndc: rndc.8 rndc.c util.c
src/external/bsd/bind/dist/bin/tests: adb_test.c backtrace_test.c
byaddr_test.c byname_test.c cfg_test.c compress_test.c db_test.c
entropy2_test.c entropy_test.c fsaccess_test.c gxba_test.c
gxbn_test.c hash_test.c inter_test.c keyboard_test.c lex_test.c
lfsr_test.c log_test.c lwres_test.c lwresconf_test.c makejournal.c
master_test.c name_test.c ratelimiter_test.c rbt_test.c
rdata_test.c serial_test.c sig0_test.c sock_test.c sym_test.c
task_test.c timer_test.c wire_test.c zone_test.c
src/external/bsd/bind/dist/bin/tests/db: t_db.c
src/external/bsd/bind/dist/bin/tests/dst: dst_test.c
src/external/bsd/bind/dist/bin/tests/names: t_names.c
src/external/bsd/bind/dist/bin/tests/net: driver.c netaddr_multicast.c
src/external/bsd/bind/dist/bin/tests/rbt: t_rbt.c
src/external/bsd/bind/dist/bin/tests/system/dlzexternal: driver.c
src/external/bsd/bind/dist/bin/tests/system/lwresd: lwtest.c
src/external/bsd/bind/dist/bin/tests/system/rsabigexponent: bigkey.c
src/external/bsd/bind/dist/bin/tests/system/tkey: keycreate.c
keydelete.c
src/external/bsd/bind/dist/bin/tests/tasks: t_tasks.c
src/external/bsd/bind/dist/bin/tools: arpaname.c isc-hmac-fixup.c
named-journalprint.c
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/bind9: check.c
src/external/bsd/bind/dist/lib/dns: adb.c api cache.c callbacks.c
client.c diff.c dispatch.c dlz.c dnssec.c dst_api.c dst_openssl.h
dst_parse.c gssapi_link.c gssapictx.c hmac_link.c journal.c
keytable.c log.c master.c message.c name.c ncache.c nsec.c nsec3.c
openssl_link.c openssldh_link.c openssldsa_link.c
opensslecdsa_link.c opensslgost_link.c opensslrsa_link.c order.c
private.c rbt.c rbtdb.c rcode.c rdata.c request.c resolver.c
result.c rootns.c rpz.c rrl.c sdb.c sdlz.c spnego.c tcpmsg.c tkey.c
tsig.c update.c view.c xfrin.c zone.c
src/external/bsd/bind/dist/lib/dns/include/dns: adb.h log.h message.h
name.h resolver.h result.h rrl.h stats.h types.h zone.h
src/external/bsd/bind/dist/lib/dns/include/dst: dst.h
src/external/bsd/bind/dist/lib/dns/rdata/any_255: tsig_250.c
src/external/bsd/bind/dist/lib/dns/rdata/ch_3: a_1.c
src/external/bsd/bind/dist/lib/dns/rdata/generic: afsdb_18.c cert_37.c
cname_5.c dlv_32769.c dname_39.c dnskey_48.c ds_43.c gpos_27.c
hinfo_13.c hip_55.c ipseckey_45.c isdn_20.c key_25.c
keydata_65533.c loc_29.c mb_7.c md_3.c mf_4.c mg_8.c minfo_14.c
mr_9.c mx_15.c ns_2.c nsec3_50.c nsec3param_51.c nsec_47.c

CVS commit: src/external/bsd/bind/dist/lib/isc/unix/include/isc

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sat Sep 12 19:03:11 UTC 2015

Modified Files:
src/external/bsd/bind/dist/lib/isc/unix/include/isc: offset.h

Log Message:
Replace arithmetic using undefined behavior with exhaustive list of type
size limits.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.h
diff -u src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.h:1.4 src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.h:1.5
--- src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.h:1.4	Wed Dec 10 04:38:01 2014
+++ src/external/bsd/bind/dist/lib/isc/unix/include/isc/offset.h	Sat Sep 12 19:03:11 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: offset.h,v 1.4 2014/12/10 04:38:01 christos Exp $	*/
+/*	$NetBSD: offset.h,v 1.5 2015/09/12 19:03:11 joerg Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -32,17 +32,12 @@
 
 typedef off_t isc_offset_t;
 
-/*%
- * POSIX says "Additionally, blkcnt_t and off_t are extended signed integral
- * types", so the maximum value is all 1s except for the high bit.
- * This definition is more complex than it really needs to be because it was
- * crafted to keep both the SunOS 5.6 and the HP/UX 11 compilers quiet about
- * integer overflow.  For example, though this is equivalent to just left
- * shifting 1 to the high bit and then inverting the bits, the SunOS compiler
- * is unhappy about shifting a positive "1" to negative in a signed integer.
- */
 #define ISC_OFFSET_MAXIMUM \
-	(~(((off_t)-1 >> (sizeof(off_t) * CHAR_BIT - 1)) \
-		  << (sizeof(off_t) * CHAR_BIT - 1)))
+(sizeof(off_t) == sizeof(char) ? INT_MAX : \
+ (sizeof(off_t) == sizeof(short) ? SHRT_MAX : \
+  (sizeof(off_t) == sizeof(int) ? INT_MAX : \
+   (sizeof(off_t) == sizeof(long) ? LONG_MAX : \
+(sizeof(off_t) == sizeof(long long) ? LLONG_MAX : INTMAX_MAX)
+
 
 #endif /* ISC_OFFSET_H */

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jul 28 18:55:16 UTC 2015

Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api tkey.c

Log Message:
merge conflicts for bind-9.10.2-P3 to address CVE-2015-5477.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/tkey.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffs are larger than 1MB and have been omitted

CVS commit: src/external/bsd/bind/dist/bin/named

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Mar  6 00:44:04 UTC 2015

Modified Files:
src/external/bsd/bind/dist/bin/named: main.c

Log Message:
Print syslog errors in one line, like we do for stderr so that the
duplicate line detection of syslogd can merge them.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/bin/named/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/main.c
diff -u src/external/bsd/bind/dist/bin/named/main.c:1.16 src/external/bsd/bind/dist/bin/named/main.c:1.17
--- src/external/bsd/bind/dist/bin/named/main.c:1.16	Sun Jan 25 10:51:53 2015
+++ src/external/bsd/bind/dist/bin/named/main.c	Thu Mar  5 19:44:04 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.16 2015/01/25 15:51:53 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.17 2015/03/06 00:44:04 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. (ISC)
@@ -283,12 +283,12 @@ library_unexpected_error(const char *fil
 	 */
 
 	if (ns_g_lctx != NULL) {
-		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
-			  NS_LOGMODULE_MAIN, ISC_LOG_ERROR,
-			  %s:%d: unexpected error:, file, line);
+		char fmt[2048];
+		snprintf(fmt, sizeof(fmt),
+		%s:%d: unexpected error: %s, file, line, format);
 		isc_log_vwrite(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 			   NS_LOGMODULE_MAIN, ISC_LOG_ERROR,
-			   format, args);
+			   fmt, args);
 	} else {
 		fprintf(stderr, %s:%d: fatal error: , file, line);
 		vfprintf(stderr, format, args);

CVS commit: src/external/bsd/bind/dist/bin/named

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 25 15:52:12 UTC 2015

Added Files:
src/external/bsd/bind/dist/bin/named: pfilter.c pfilter.h

Log Message:
blacklist new files


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/bind/dist/bin/named/pfilter.c \
src/external/bsd/bind/dist/bin/named/pfilter.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/bind/dist/bin/named/pfilter.c
diff -u /dev/null src/external/bsd/bind/dist/bin/named/pfilter.c:1.1
--- /dev/null	Sun Jan 25 10:52:12 2015
+++ src/external/bsd/bind/dist/bin/named/pfilter.c	Sun Jan 25 10:52:12 2015
@@ -0,0 +1,53 @@
+#include config.h
+
+#include isc/platform.h
+#include isc/util.h
+#include named/types.h
+#include named/client.h
+
+#include blacklist.h
+
+#include pfilter.h
+
+static struct blacklist *blstate;
+
+void
+pfilter_open(void)
+{
+	if (blstate == NULL)
+		blstate = blacklist_open();
+}
+
+#define TCP_CLIENT(c)  (((c)-attributes  NS_CLIENTATTR_TCP) != 0)
+
+void
+pfilter_notify(isc_result_t res, ns_client_t *client, const char *msg)
+{
+	int rv;
+	isc_socket_t *socket;
+
+	pfilter_open();
+
+	if (TCP_CLIENT(client))
+		socket = client-tcpsocket;
+	else {
+		socket = client-udpsocket;
+		if (!client-peeraddr_valid) {
+			syslog(LOG_ERR, no peer res=%d\n, res);
+			return;
+		}
+	}
+	if (socket == NULL) {
+		syslog(LOG_ERR, null socket res=%d\n, res);
+		return;
+	}
+	if (blstate == NULL) {
+		syslog(LOG_ERR, null blstate res=%d\n, res);
+		return;
+	}
+	rv = blacklist_sa_r(blstate, 
+	res != ISC_R_SUCCESS, isc_socket_getfd(socket),
+	client-peeraddr.type.sa, client-peeraddr.length, msg);
+	if (rv || res != ISC_R_SUCCESS)
+		syslog(LOG_ERR, blacklist rv=%d res=%d\n, rv, res);
+}
Index: src/external/bsd/bind/dist/bin/named/pfilter.h
diff -u /dev/null src/external/bsd/bind/dist/bin/named/pfilter.h:1.1
--- /dev/null	Sun Jan 25 10:52:12 2015
+++ src/external/bsd/bind/dist/bin/named/pfilter.h	Sun Jan 25 10:52:12 2015
@@ -0,0 +1,2 @@
+void pfilter_open(void);
+void pfilter_notify(isc_result_t, ns_client_t *, const char *);

CVS commit: src/external/bsd/bind/dist/bin/named

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 25 16:17:20 UTC 2015

Modified Files:
src/external/bsd/bind/dist/bin/named: pfilter.c

Log Message:
remove debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/dist/bin/named/pfilter.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/pfilter.c
diff -u src/external/bsd/bind/dist/bin/named/pfilter.c:1.1 src/external/bsd/bind/dist/bin/named/pfilter.c:1.2
--- src/external/bsd/bind/dist/bin/named/pfilter.c:1.1	Sun Jan 25 10:52:12 2015
+++ src/external/bsd/bind/dist/bin/named/pfilter.c	Sun Jan 25 11:17:20 2015
@@ -23,7 +23,6 @@ pfilter_open(void)
 void
 pfilter_notify(isc_result_t res, ns_client_t *client, const char *msg)
 {
-	int rv;
 	isc_socket_t *socket;
 
 	pfilter_open();
@@ -32,22 +31,17 @@ pfilter_notify(isc_result_t res, ns_clie
 		socket = client-tcpsocket;
 	else {
 		socket = client-udpsocket;
-		if (!client-peeraddr_valid) {
-			syslog(LOG_ERR, no peer res=%d\n, res);
+		if (!client-peeraddr_valid)
 			return;
-		}
 	}
-	if (socket == NULL) {
-		syslog(LOG_ERR, null socket res=%d\n, res);
+
+	if (socket == NULL)
 		return;
-	}
-	if (blstate == NULL) {
-		syslog(LOG_ERR, null blstate res=%d\n, res);
+
+	if (blstate == NULL)
 		return;
-	}
-	rv = blacklist_sa_r(blstate, 
+
+	blacklist_sa_r(blstate, 
 	res != ISC_R_SUCCESS, isc_socket_getfd(socket),
 	client-peeraddr.type.sa, client-peeraddr.length, msg);
-	if (rv || res != ISC_R_SUCCESS)
-		syslog(LOG_ERR, blacklist rv=%d res=%d\n, rv, res);
 }

CVS commit: src/external/bsd/bind/dist/lib/lwres/include/lwres

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jul 22 00:11:22 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/lwres/include/lwres: lwres.h

Log Message:
fix lint build


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h
diff -u src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h:1.5 src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h:1.6
--- src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h:1.5	Tue Jul  8 01:43:40 2014
+++ src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h	Mon Jul 21 20:11:22 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: lwres.h,v 1.5 2014/07/08 05:43:40 spz Exp $	*/
+/*	$NetBSD: lwres.h,v 1.6 2014/07/22 00:11:22 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. (ISC)
@@ -215,8 +215,8 @@ typedef struct {
  * resolv.conf data
  */
 
-#define LWRES_CONFMAXNAMESERVERS 3	/*% max 3 nameserver entries */
-#define LWRES_CONFMAXLWSERVERS 1	/*% max 1 lwserver entry */
+#define LWRES_CONFMAXNAMESERVERS 3	/*% max 3 nameserver entries */
+#define LWRES_CONFMAXLWSERVERS 1	/*% max 1 lwserver entry */
 #define LWRES_CONFMAXSEARCH 8		/*% max 8 domains in search entry */
 #define LWRES_CONFMAXLINELEN 256	/*% max size of a line */
 #define LWRES_CONFMAXSORTLIST 10	/*% max 10 */

CVS commit: src/external/bsd/bind/dist/lib/lwres/include/lwres

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jul 22 01:03:22 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/lwres/include/lwres: lwres.h

Log Message:
one more quoted comment


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h
diff -u src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h:1.6 src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h:1.7
--- src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h:1.6	Mon Jul 21 20:11:22 2014
+++ src/external/bsd/bind/dist/lib/lwres/include/lwres/lwres.h	Mon Jul 21 21:03:22 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: lwres.h,v 1.6 2014/07/22 00:11:22 christos Exp $	*/
+/*	$NetBSD: lwres.h,v 1.7 2014/07/22 01:03:22 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. (ISC)
@@ -217,7 +217,7 @@ typedef struct {
 
 #define LWRES_CONFMAXNAMESERVERS 3	/*% max 3 nameserver entries */
 #define LWRES_CONFMAXLWSERVERS 1	/*% max 1 lwserver entry */
-#define LWRES_CONFMAXSEARCH 8		/*% max 8 domains in search entry */
+#define LWRES_CONFMAXSEARCH 8		/*% max 8 domains in search entry */
 #define LWRES_CONFMAXLINELEN 256	/*% max size of a line */
 #define LWRES_CONFMAXSORTLIST 10	/*% max 10 */
 

CVS commit: src/external/bsd/bind/dist/lib/dns

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jul  8 09:08:05 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/dns: rbt.c

Log Message:
Make it compilable: avoid void* arithmetic


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/lib/dns/rbt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/rbt.c
diff -u src/external/bsd/bind/dist/lib/dns/rbt.c:1.7 src/external/bsd/bind/dist/lib/dns/rbt.c:1.8
--- src/external/bsd/bind/dist/lib/dns/rbt.c:1.7	Tue Jul  8 05:43:39 2014
+++ src/external/bsd/bind/dist/lib/dns/rbt.c	Tue Jul  8 09:08:05 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbt.c,v 1.7 2014/07/08 05:43:39 spz Exp $	*/
+/*	$NetBSD: rbt.c,v 1.8 2014/07/08 09:08:05 martin Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007-2009, 2011-2014  Internet Systems Consortium, Inc. (ISC)
@@ -307,12 +307,13 @@ Name(dns_rbtnode_t *node) {
 static void printnodename(dns_rbtnode_t *node);
 
 static void
-hexdump(const char *desc, void *data, size_t size) {
+hexdump(const char *desc, void *blob, size_t size) {
 	char hexdump[BUFSIZ * 2 + 1];
 	isc_buffer_t b;
 	isc_region_t r;
 	isc_result_t result;
 	size_t bytes;
+	isc_uint8_t *data = blob;
 
 	fprintf(stderr, %s: , desc);
 	do {

CVS commit: src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Tue Jul  8 05:47:36 UTC 2014

Added Files:
src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat: zkt-ls
zkt-signer

Log Message:
two merge escapees


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat/zkt-ls \
src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat/zkt-signer

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat/zkt-ls
diff -u /dev/null src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat/zkt-ls:1.1
--- /dev/null	Tue Jul  8 05:47:36 2014
+++ src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat/zkt-ls	Tue Jul  8 05:47:36 2014
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+#	Shell script to start the zkt-ls command
+#	out of the example directory
+#
+
+if test ! -f dnssec.conf
+then
+	echo Please start this skript out of the flat or hierarchical sub directory
+	exit 1
+fi
+ZKT_CONFFILE=`pwd`/dnssec.conf ../../zkt-ls $@
Index: src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat/zkt-signer
diff -u /dev/null src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat/zkt-signer:1.1
--- /dev/null	Tue Jul  8 05:47:36 2014
+++ src/external/bsd/bind/dist/contrib/zkt-1.1.2/examples/flat/zkt-signer	Tue Jul  8 05:47:36 2014
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+#	Shell script to start the zkt-signer
+#	command out of the example directory
+#
+
+if test ! -f dnssec.conf
+then
+	echo Please start this skript out of the flat or hierarchical sub directory
+	exit 1
+fi
+ZKT_CONFFILE=`pwd`/dnssec.conf ../../zkt-signer $@

CVS commit: src/external/bsd/bind/dist/lib/isc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar 29 19:34:23 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/isc: task_p.h

Log Message:
add missing #else Takahiro Hayashi


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/lib/isc/task_p.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/task_p.h
diff -u src/external/bsd/bind/dist/lib/isc/task_p.h:1.5 src/external/bsd/bind/dist/lib/isc/task_p.h:1.6
--- src/external/bsd/bind/dist/lib/isc/task_p.h:1.5	Fri Feb 28 22:24:39 2014
+++ src/external/bsd/bind/dist/lib/isc/task_p.h	Sat Mar 29 15:34:23 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: task_p.h,v 1.5 2014/03/01 03:24:39 christos Exp $	*/
+/*	$NetBSD: task_p.h,v 1.6 2014/03/29 19:34:23 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013  Internet Systems Consortium, Inc. (ISC)
@@ -27,7 +27,7 @@
 #if defined(ISC_PLATFORM_USETHREADS)
 void
 isc__taskmgr_pause(isc_taskmgr_t *taskmgr);
-
+#else
 void
 isc__taskmgr_resume(isc_taskmgr_t *taskmgr);
 isc_boolean_t

CVS commit: src/external/bsd/bind/dist/lib/isc

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sat Mar 29 22:44:20 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/isc: task_p.h

Log Message:
Match #if change in task.c.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/task_p.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/task_p.h
diff -u src/external/bsd/bind/dist/lib/isc/task_p.h:1.6 src/external/bsd/bind/dist/lib/isc/task_p.h:1.7
--- src/external/bsd/bind/dist/lib/isc/task_p.h:1.6	Sat Mar 29 19:34:23 2014
+++ src/external/bsd/bind/dist/lib/isc/task_p.h	Sat Mar 29 22:44:20 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: task_p.h,v 1.6 2014/03/29 19:34:23 christos Exp $	*/
+/*	$NetBSD: task_p.h,v 1.7 2014/03/29 22:44:20 joerg Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013  Internet Systems Consortium, Inc. (ISC)
@@ -27,9 +27,9 @@
 #if defined(ISC_PLATFORM_USETHREADS)
 void
 isc__taskmgr_pause(isc_taskmgr_t *taskmgr);
-#else
 void
 isc__taskmgr_resume(isc_taskmgr_t *taskmgr);
+#else
 isc_boolean_t
 isc__taskmgr_ready(isc_taskmgr_t *taskmgr);
 

CVS commit: src/external/bsd/bind/dist/lib/isc/unix

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar 15 18:28:23 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/isc/unix: app.c

Log Message:
Since the sigwait stuff is conditional to isc_bind9, we cannot block
SIGHUP,SIGINT,SIGTERM on startup, so make those also conditional to isc_bind9.
The net effect of this was that dhclient blocked the 3 signals for both
itself and its progeny so /etc/rc.d/dhclient restart would not work.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/isc/unix/app.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/unix/app.c
diff -u src/external/bsd/bind/dist/lib/isc/unix/app.c:1.9 src/external/bsd/bind/dist/lib/isc/unix/app.c:1.10
--- src/external/bsd/bind/dist/lib/isc/unix/app.c:1.9	Fri Feb 28 22:24:39 2014
+++ src/external/bsd/bind/dist/lib/isc/unix/app.c	Sat Mar 15 14:28:22 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: app.c,v 1.9 2014/03/01 03:24:39 christos Exp $	*/
+/*	$NetBSD: app.c,v 1.10 2014/03/15 18:28:22 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007-2009, 2013, 2014  Internet Systems Consortium, Inc. (ISC)
@@ -317,6 +317,7 @@ isc__app_ctxstart(isc_appctx_t *ctx0) {
 #endif
 
 #ifdef ISC_PLATFORM_USETHREADS
+	if (isc_bind9) {
 	/*
 	 * Block SIGHUP, SIGINT, SIGTERM.
 	 *
@@ -345,6 +346,7 @@ isc__app_ctxstart(isc_appctx_t *ctx0) {
 		result = ISC_R_UNEXPECTED;
 		goto cleanup;
 	}
+	}
 #else /* ISC_PLATFORM_USETHREADS */
 	/*
 	 * Unblock SIGHUP, SIGINT, SIGTERM.

CVS commit: src/external/bsd/bind/dist/lib/dns/include/dns

[David Laight]

Module Name:src
Committed By:   dsl
Date:   Sat Mar  1 12:12:57 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/dns/include/dns: rbt.h

Log Message:
Add missing #endif


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h
diff -u src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h:1.8 src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h:1.9
--- src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h:1.8	Sat Mar  1 03:24:37 2014
+++ src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h	Sat Mar  1 12:12:57 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbt.h,v 1.8 2014/03/01 03:24:37 christos Exp $	*/
+/*	$NetBSD: rbt.h,v 1.9 2014/03/01 12:12:57 dsl Exp $	*/
 
 /*
  * Copyright (C) 2004-2009, 2012-2014  Internet Systems Consortium, Inc. (ISC)
@@ -1035,6 +1035,7 @@ dns_rbtnode_refdecrement(dns_rbtnode_t *
 		if ((refs) != NULL) \
 			(*refs) = (node)-references;   \
 	} while (/*CONSTCOND*/0)
+#endif
 #endif /* DNS_RBT_USEISCREFCOUNT */
 
 ISC_LANG_ENDDECLS

CVS commit: src/external/bsd/bind/dist/bin/nsupdate

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:41:50 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/nsupdate: nsupdate.c

Log Message:
remove local init stuff


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c
diff -u src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c:1.9 src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c:1.10
--- src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c:1.9	Fri Feb 28 22:24:33 2014
+++ src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c	Sat Mar  1 17:41:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: nsupdate.c,v 1.9 2014/03/01 03:24:33 christos Exp $	*/
+/*	$NetBSD: nsupdate.c,v 1.10 2014/03/01 22:41:50 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. (ISC)
@@ -3038,10 +3038,6 @@ main(int argc, char **argv) {
 
 	interactive = ISC_TF(isatty(0));
 
-	isc__mem_register();
-	isc__task_register();
-	isc__timer_register();
-	isc__socket_register();
 	isc_app_start();
 
 	pre_parse_args(argc, argv);

CVS commit: src/external/bsd/bind/dist/bin/tests

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:42:46 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/tests: adb_test.c

Log Message:
put back init that got accidentally removed.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/bin/tests/adb_test.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/tests/adb_test.c
diff -u src/external/bsd/bind/dist/bin/tests/adb_test.c:1.6 src/external/bsd/bind/dist/bin/tests/adb_test.c:1.7
--- src/external/bsd/bind/dist/bin/tests/adb_test.c:1.6	Fri Feb 28 22:24:33 2014
+++ src/external/bsd/bind/dist/bin/tests/adb_test.c	Sat Mar  1 17:42:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb_test.c,v 1.6 2014/03/01 03:24:33 christos Exp $	*/
+/*	$NetBSD: adb_test.c,v 1.7 2014/03/01 22:42:46 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013  Internet Systems Consortium, Inc. (ISC)
@@ -293,6 +293,7 @@ main(int argc, char **argv) {
 	UNUSED(argc);
 	UNUSED(argv);
 
+	dns_result_register();
 	result = isc_app_start();
 	check_result(result, isc_app_start());
 

CVS commit: src/external/bsd/bind/dist/bin/tools

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:43:35 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/tools: named-journalprint.c

Log Message:
remove local init


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/bind/dist/bin/tools/named-journalprint.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/tools/named-journalprint.c
diff -u src/external/bsd/bind/dist/bin/tools/named-journalprint.c:1.4 src/external/bsd/bind/dist/bin/tools/named-journalprint.c:1.5
--- src/external/bsd/bind/dist/bin/tools/named-journalprint.c:1.4	Sun Mar 24 14:44:43 2013
+++ src/external/bsd/bind/dist/bin/tools/named-journalprint.c	Sat Mar  1 17:43:35 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: named-journalprint.c,v 1.4 2013/03/24 18:44:43 christos Exp $	*/
+/*	$NetBSD: named-journalprint.c,v 1.5 2014/03/01 22:43:35 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. (ISC)
@@ -76,7 +76,6 @@ main(int argc, char **argv) {
 
 	file = argv[1];
 
-	isc__mem_register();
 	RUNTIME_CHECK(isc_mem_create(0, 0, mctx) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(setup_logging(mctx, stderr, lctx) == ISC_R_SUCCESS);
 

CVS commit: src/external/bsd/bind/dist/lib/bind9

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:45:32 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/bind9: check.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/bind9/check.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/bind9/check.c
diff -u src/external/bsd/bind/dist/lib/bind9/check.c:1.8 src/external/bsd/bind/dist/lib/bind9/check.c:1.9
--- src/external/bsd/bind/dist/lib/bind9/check.c:1.8	Fri Feb 28 22:24:36 2014
+++ src/external/bsd/bind/dist/lib/bind9/check.c	Sat Mar  1 17:45:32 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: check.c,v 1.8 2014/03/01 03:24:36 christos Exp $	*/
+/*	$NetBSD: check.c,v 1.9 2014/03/01 22:45:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. (ISC)
@@ -2703,7 +2703,7 @@ check_viewconf(const cfg_obj_t *config, 
 	if (symtab != NULL)
 		isc_symtab_destroy(symtab);
 	if (actx != NULL)
-	cfg_aclconfctx_detach(actx);
+		cfg_aclconfctx_detach(actx);
 
 	return (result);
 }

CVS commit: src/external/bsd/bind/dist/bin/dnssec

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:49:08 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/dnssec: dnssec-signzone.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c
diff -u src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c:1.11 src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c:1.12
--- src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c:1.11	Fri Feb 28 22:24:32 2014
+++ src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c	Sat Mar  1 17:49:08 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: dnssec-signzone.c,v 1.11 2014/03/01 03:24:32 christos Exp $	*/
+/*	$NetBSD: dnssec-signzone.c,v 1.12 2014/03/01 22:49:08 christos Exp $	*/
 
 /*
  * Portions Copyright (C) 2004-2014  Internet Systems Consortium, Inc. (ISC)
@@ -3659,11 +3659,11 @@ main(int argc, char *argv[]) {
 	cleanup_zone();
 
 	if (!nonsecify) {
-	if (IS_NSEC3)
-		nsec3ify(dns_hash_sha1, nsec3iter, salt, salt_length,
-			 hashlist);
-	else
-		nsecify();
+		if (IS_NSEC3)
+			nsec3ify(dns_hash_sha1, nsec3iter, salt, salt_length,
+ hashlist);
+		else
+			nsecify();
 	}
 
 	if (!nokeys) {
@@ -3689,7 +3689,7 @@ main(int argc, char *argv[]) {
 		check_result(result, isc_file_mktemplate);
 
 		if (outputformat == dns_masterformat_text)
-		result = isc_file_openunique(tempfile, fp);
+			result = isc_file_openunique(tempfile, fp);
 		else
 			result = isc_file_bopenunique(tempfile, fp);
 		if (result != ISC_R_SUCCESS)

CVS commit: src/external/bsd/bind/dist/bin/named

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:49:49 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/named: controlconf.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/named/controlconf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/controlconf.c
diff -u src/external/bsd/bind/dist/bin/named/controlconf.c:1.7 src/external/bsd/bind/dist/bin/named/controlconf.c:1.8
--- src/external/bsd/bind/dist/bin/named/controlconf.c:1.7	Fri Feb 28 22:24:32 2014
+++ src/external/bsd/bind/dist/bin/named/controlconf.c	Sat Mar  1 17:49:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: controlconf.c,v 1.7 2014/03/01 03:24:32 christos Exp $	*/
+/*	$NetBSD: controlconf.c,v 1.8 2014/03/01 22:49:49 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2008, 2011-2014  Internet Systems Consortium, Inc. (ISC)
@@ -381,9 +381,9 @@ control_recvmessage(isc_task_t *task, is
 			break;
 		isc_mem_put(listener-mctx, secret.rstart, REGION_SIZE(secret));
 		if (result != ISCCC_R_BADAUTH) {
-		log_invalid(conn-ccmsg, result);
-		goto cleanup;
-	}
+			log_invalid(conn-ccmsg, result);
+			goto cleanup;
+		}
 	}
 
 	if (key == NULL) {

CVS commit: src/external/bsd/bind/dist/bin/named

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:50:34 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/named: query.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/dist/bin/named/query.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.14 src/external/bsd/bind/dist/bin/named/query.c:1.15
--- src/external/bsd/bind/dist/bin/named/query.c:1.14	Fri Feb 28 22:24:32 2014
+++ src/external/bsd/bind/dist/bin/named/query.c	Sat Mar  1 17:50:34 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: query.c,v 1.14 2014/03/01 03:24:32 christos Exp $	*/
+/*	$NetBSD: query.c,v 1.15 2014/03/01 22:50:34 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. (ISC)
@@ -6608,7 +6608,7 @@ query_find(ns_client_t *client, dns_fetc
 	 * and set the TTL then.
 	 */
 	if (dns_rdataset_isassociated(rdataset))
-	dns_rdataset_disassociate(rdataset);
+		dns_rdataset_disassociate(rdataset);
 } else {
 	/*
 	 * We will add this rdataset.

CVS commit: src/external/bsd/bind/dist/bin/named

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:51:25 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/named: server.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/bin/named/server.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/server.c
diff -u src/external/bsd/bind/dist/bin/named/server.c:1.15 src/external/bsd/bind/dist/bin/named/server.c:1.16
--- src/external/bsd/bind/dist/bin/named/server.c:1.15	Fri Feb 28 22:24:32 2014
+++ src/external/bsd/bind/dist/bin/named/server.c	Sat Mar  1 17:51:24 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: server.c,v 1.15 2014/03/01 03:24:32 christos Exp $	*/
+/*	$NetBSD: server.c,v 1.16 2014/03/01 22:51:24 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. (ISC)
@@ -9341,10 +9341,10 @@ ns_server_signing(ns_server_t *server, c
 			if (strcmp(ptr, -) != 0) {
 isc_buffer_t buf;
 
-			isc_buffer_init(buf, salt, sizeof(salt));
-			CHECK(isc_hex_decodestring(ptr, buf));
-			saltlen = isc_buffer_usedlength(buf);
-		}
+isc_buffer_init(buf, salt, sizeof(salt));
+CHECK(isc_hex_decodestring(ptr, buf));
+saltlen = isc_buffer_usedlength(buf);
+			}
 		}
 	} else
 		CHECK(DNS_R_SYNTAX);

CVS commit: src/external/bsd/bind/dist/bin/tests

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:52:19 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/tests: fsaccess_test.c

Log Message:
remove blank line


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/bin/tests/fsaccess_test.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/tests/fsaccess_test.c
diff -u src/external/bsd/bind/dist/bin/tests/fsaccess_test.c:1.6 src/external/bsd/bind/dist/bin/tests/fsaccess_test.c:1.7
--- src/external/bsd/bind/dist/bin/tests/fsaccess_test.c:1.6	Fri Feb 28 22:24:33 2014
+++ src/external/bsd/bind/dist/bin/tests/fsaccess_test.c	Sat Mar  1 17:52:19 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: fsaccess_test.c,v 1.6 2014/03/01 03:24:33 christos Exp $	*/
+/*	$NetBSD: fsaccess_test.c,v 1.7 2014/03/01 22:52:19 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2012  Internet Systems Consortium, Inc. (ISC)
@@ -42,7 +42,6 @@ main(void) {
 	FILE *fp;
 	int n;
 
-
 	n = remove(PATH);
 	if (n != 0  errno != ENOENT) {
 		fprintf(stderr, unable to remove(%s)\n, PATH);

CVS commit: src/external/bsd/bind/dist/bin/tests/dst

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:53:12 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/tests/dst: t_dst.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/bin/tests/dst/t_dst.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/tests/dst/t_dst.c
diff -u src/external/bsd/bind/dist/bin/tests/dst/t_dst.c:1.8 src/external/bsd/bind/dist/bin/tests/dst/t_dst.c:1.9
--- src/external/bsd/bind/dist/bin/tests/dst/t_dst.c:1.8	Fri Feb 28 22:24:33 2014
+++ src/external/bsd/bind/dist/bin/tests/dst/t_dst.c	Sat Mar  1 17:53:11 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_dst.c,v 1.8 2014/03/01 03:24:33 christos Exp $	*/
+/*	$NetBSD: t_dst.c,v 1.9 2014/03/01 22:53:11 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007-2009, 2011-2014  Internet Systems Consortium, Inc. (ISC)
@@ -277,9 +277,9 @@ dh(dns_name_t *name1, int id1, dns_name_
 
  cleanup:
 	if (key1 != NULL)
-	dst_key_free(key1);
+		dst_key_free(key1);
 	if (key2 != NULL)
-	dst_key_free(key2);
+		dst_key_free(key2);
 }
 
 static void
@@ -412,7 +412,7 @@ generate(int alg, isc_mem_t *mctx, int s
 		use(key, mctx, ISC_R_SUCCESS, nfails);
  cleanup:
 	if (key != NULL)
-	dst_key_free(key);
+		dst_key_free(key);
 }
 
 #define	DBUFSIZ	25

CVS commit: src/external/bsd/bind/dist/bin/tests/system/rpz

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:54:03 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/tests/system/rpz: rpz.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c
diff -u src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c:1.5 src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c:1.6
--- src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c:1.5	Sat Jul 27 15:23:11 2013
+++ src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c	Sat Mar  1 17:54:02 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpz.c,v 1.5 2013/07/27 19:23:11 christos Exp $	*/
+/*	$NetBSD: rpz.c,v 1.6 2014/03/01 22:54:02 christos Exp $	*/
 
 /*
  * Copyright (C) 2011-2013  Internet Systems Consortium, Inc. (ISC)
@@ -42,7 +42,7 @@ main(int argc, char **argv)
 #else
 		return (1);
 #endif
-	}
+	}
 
 	if (!strcasecmp(argv[1], nsdname)) {
 #ifdef ENABLE_RPZ_NSDNAME
@@ -50,8 +50,8 @@ main(int argc, char **argv)
 #else
 		return (1);
 #endif
-	}
+	}
 
-	fputs(USAGE, stderr);
-	return (1);
+	fputs(USAGE, stderr);
+	return (1);
 }

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:57:23 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/dns: adb.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/lib/dns/adb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/adb.c
diff -u src/external/bsd/bind/dist/lib/dns/adb.c:1.7 src/external/bsd/bind/dist/lib/dns/adb.c:1.8
--- src/external/bsd/bind/dist/lib/dns/adb.c:1.7	Fri Feb 28 22:24:36 2014
+++ src/external/bsd/bind/dist/lib/dns/adb.c	Sat Mar  1 17:57:23 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb.c,v 1.7 2014/03/01 03:24:36 christos Exp $	*/
+/*	$NetBSD: adb.c,v 1.8 2014/03/01 22:57:23 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. (ISC)
@@ -4026,8 +4026,8 @@ dns_adb_adjustsrtt(dns_adb_t *adb, dns_a
 	addr-srtt = (unsigned int) new_srtt;
 
 	if (addr-entry-expires == 0) {
-	isc_stdtime_get(now);
-	addr-entry-expires = now + ADB_ENTRY_WINDOW;
+		isc_stdtime_get(now);
+		addr-entry-expires = now + ADB_ENTRY_WINDOW;
 	}
 
 	UNLOCK(adb-entrylocks[bucket]);
@@ -4392,7 +4392,7 @@ dns_adb_freeaddrinfo(dns_adb_t *adb, dns
 
 	if (entry-expires == 0) {
 		isc_stdtime_get(now);
-	entry-expires = now + ADB_ENTRY_WINDOW;
+		entry-expires = now + ADB_ENTRY_WINDOW;
 	}
 
 	want_check_exit = dec_entry_refcnt(adb, overmem, entry, ISC_FALSE);

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 22:59:10 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/dns: dnssec.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/dnssec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/dnssec.c
diff -u src/external/bsd/bind/dist/lib/dns/dnssec.c:1.8 src/external/bsd/bind/dist/lib/dns/dnssec.c:1.9
--- src/external/bsd/bind/dist/lib/dns/dnssec.c:1.8	Fri Feb 28 22:24:36 2014
+++ src/external/bsd/bind/dist/lib/dns/dnssec.c	Sat Mar  1 17:59:10 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: dnssec.c,v 1.8 2014/03/01 03:24:36 christos Exp $	*/
+/*	$NetBSD: dnssec.c,v 1.9 2014/03/01 22:59:10 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. (ISC)
@@ -179,12 +179,12 @@ digest_sig(dst_context_t *ctx, isc_boole
 	if (ret != ISC_R_SUCCESS)
 		return (ret);
 	if (downcase) {
-	dns_fixedname_init(fname);
+		dns_fixedname_init(fname);
 
 		RUNTIME_CHECK(dns_name_downcase(rrsig-signer,
 		dns_fixedname_name(fname),
 		NULL) == ISC_R_SUCCESS);
-	dns_name_toregion(dns_fixedname_name(fname), r);
+		dns_name_toregion(dns_fixedname_name(fname), r);
 	} else
 		dns_name_toregion(rrsig-signer, r);
 
@@ -429,7 +429,7 @@ dns_dnssec_verify3(dns_name_t *name, dns
 		} else if (isc_serial_lt(sig.timeexpire, (isc_uint32_t)now)) {
 			inc_stat(dns_dnssecstats_fail);
 			return (DNS_R_SIGEXPIRED);
-	}
+		}
 	}
 
 	/*

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 23:02:14 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/dns: masterdump.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/masterdump.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/masterdump.c
diff -u src/external/bsd/bind/dist/lib/dns/masterdump.c:1.8 src/external/bsd/bind/dist/lib/dns/masterdump.c:1.9
--- src/external/bsd/bind/dist/lib/dns/masterdump.c:1.8	Fri Feb 28 22:24:36 2014
+++ src/external/bsd/bind/dist/lib/dns/masterdump.c	Sat Mar  1 18:02:14 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: masterdump.c,v 1.8 2014/03/01 03:24:36 christos Exp $	*/
+/*	$NetBSD: masterdump.c,v 1.9 2014/03/01 23:02:14 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2009, 2011-2014  Internet Systems Consortium, Inc. (ISC)
@@ -1736,7 +1736,7 @@ opentmp(isc_mem_t *mctx, dns_masterforma
 		goto cleanup;
 
 	if (format == dns_masterformat_text)
-	result = isc_file_openunique(tempname, f);
+		result = isc_file_openunique(tempname, f);
 	else
 		result = isc_file_bopenunique(tempname, f);
 	if (result != ISC_R_SUCCESS) {

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 23:03:58 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/dns: rbtdb.c

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/lib/dns/rbtdb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/rbtdb.c
diff -u src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.16 src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.17
--- src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.16	Fri Feb 28 22:24:37 2014
+++ src/external/bsd/bind/dist/lib/dns/rbtdb.c	Sat Mar  1 18:03:58 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbtdb.c,v 1.16 2014/03/01 03:24:37 christos Exp $	*/
+/*	$NetBSD: rbtdb.c,v 1.17 2014/03/01 23:03:58 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. (ISC)
@@ -5950,7 +5950,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *r
 	topheader-type ==
 	RBTDB_RDATATYPE_VALUE(0, covers))) {
 	break;
-			}
+}
 			}
 			if (topheader != NULL  EXISTS(topheader) 
 			topheader-rdh_ttl = now) {

CVS commit: src/external/bsd/bind/dist/lib/isc/include/isc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Mar  1 23:07:24 UTC 2014

Modified Files:
src/external/bsd/bind/dist/lib/isc/include/isc: queue.h

Log Message:
fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/lib/isc/include/isc/queue.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/include/isc/queue.h
diff -u src/external/bsd/bind/dist/lib/isc/include/isc/queue.h:1.5 src/external/bsd/bind/dist/lib/isc/include/isc/queue.h:1.6
--- src/external/bsd/bind/dist/lib/isc/include/isc/queue.h:1.5	Sat Jul 27 15:23:13 2013
+++ src/external/bsd/bind/dist/lib/isc/include/isc/queue.h	Sat Mar  1 18:07:24 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: queue.h,v 1.5 2013/07/27 19:23:13 christos Exp $	*/
+/*	$NetBSD: queue.h,v 1.6 2014/03/01 23:07:24 christos Exp $	*/
 
 /*
  * Copyright (C) 2011-2013  Internet Systems Consortium, Inc. (ISC)
@@ -134,9 +134,9 @@
 	(queue).head = (queue).tail = NULL; \
 	UNLOCK((queue).taillock); \
 	break; \
+} \
+UNLOCK((queue).taillock); \
 			} \
-			UNLOCK((queue).taillock); \
-		} \
 			(queue).head = ret-link.next; \
 			(queue).head-link.prev = NULL; \
 			break; \

CVS commit: src/external/bsd/bind/dist

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Tue Jan 14 08:03:07 UTC 2014

Modified Files:
src/external/bsd/bind/dist: version
src/external/bsd/bind/dist/bin/named: query.c

Log Message:
a fix by ISC for CVE-2014-0591:
3693.  [security]  memcpy was incorrectly called with overlapping
   ranges resulting in malformed names being generated
   on some platforms.  This could cause INSIST failures
   when serving NSEC3 signed zones.  [RT #35120]


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/bin/named/query.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/version
diff -u src/external/bsd/bind/dist/version:1.7 src/external/bsd/bind/dist/version:1.8
--- src/external/bsd/bind/dist/version:1.7	Tue Dec 31 20:24:38 2013
+++ src/external/bsd/bind/dist/version	Tue Jan 14 08:03:07 2014
@@ -4,10 +4,10 @@
 # configure.
 #
 PRODUCT=BIND
-DESCRIPTION=(Extended Support Version)
+DESCRIPTION=(Development release)
 MAJORVER=9
 MINORVER=9
 PATCHVER=5
 RELEASETYPE=b
 RELEASEVER=1
-EXTENSIONS=
+EXTENSIONS=nb1

Index: src/external/bsd/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.12 src/external/bsd/bind/dist/bin/named/query.c:1.13
--- src/external/bsd/bind/dist/bin/named/query.c:1.12	Tue Dec 31 20:24:39 2013
+++ src/external/bsd/bind/dist/bin/named/query.c	Tue Jan 14 08:03:07 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: query.c,v 1.12 2013/12/31 20:24:39 christos Exp $	*/
+/*	$NetBSD: query.c,v 1.13 2014/01/14 08:03:07 spz Exp $	*/
 
 /*
  * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. (ISC)
@@ -5263,8 +5263,7 @@ query_findclosestnsec3(dns_name_t *qname
 	dns_fixedname_t fixed;
 	dns_hash_t hash;
 	dns_name_t name;
-	int order;
-	unsigned int count;
+	unsigned int skip = 0, labels;
 	dns_rdata_nsec3_t nsec3;
 	dns_rdata_t rdata = DNS_RDATA_INIT;
 	isc_boolean_t optout;
@@ -5279,6 +5278,7 @@ query_findclosestnsec3(dns_name_t *qname
 
 	dns_name_init(name, NULL);
 	dns_name_clone(qname, name);
+	labels = dns_name_countlabels(name);
 	dns_clientinfomethods_init(cm, ns_client_sourceip);
 	dns_clientinfo_init(ci, client);
 
@@ -5312,13 +5312,14 @@ query_findclosestnsec3(dns_name_t *qname
 		dns_rdata_reset(rdata);
 		optout = ISC_TF((nsec3.flags  DNS_NSEC3FLAG_OPTOUT) != 0);
 		if (found != NULL  optout 
-		dns_name_fullcompare(name, dns_db_origin(db), order,
-	 count) == dns_namereln_subdomain) {
+		dns_name_issubdomain(name, dns_db_origin(db)))
+		{
 			dns_rdataset_disassociate(rdataset);
 			if (dns_rdataset_isassociated(sigrdataset))
 dns_rdataset_disassociate(sigrdataset);
-			count = dns_name_countlabels(name) - 1;
-			dns_name_getlabelsequence(name, 1, count, name);
+			skip++;
+			dns_name_getlabelsequence(qname, skip, labels - skip,
+			  name);
 			ns_client_log(client, DNS_LOGCATEGORY_DNSSEC,
   NS_LOGMODULE_QUERY, ISC_LOG_DEBUG(3),
   looking for closest provable encloser);
@@ -5336,7 +5337,11 @@ query_findclosestnsec3(dns_name_t *qname
 		ns_client_log(client, DNS_LOGCATEGORY_DNSSEC,
 			  NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
 			  expected covering NSEC3, got an exact match);
-	if (found != NULL)
+	if (found == qname) {
+		if (skip != 0U)
+			dns_name_getlabelsequence(qname, skip, labels - skip,
+			  found);
+	} else if (found != NULL)
 		dns_name_copy(name, found, NULL);
 	return;
 }

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 31 20:24:44 UTC 2013

Modified Files:
src/external/bsd/bind/dist: CHANGES config.h.in srcid version
src/external/bsd/bind/dist/bin/check: named-checkconf.c
src/external/bsd/bind/dist/bin/dig: dig.1 dig.c dighost.c host.c
nslookup.1 nslookup.c
src/external/bsd/bind/dist/bin/dig/include/dig: dig.h
src/external/bsd/bind/dist/bin/dnssec: dnssec-importkey.8
dnssec-importkey.c dnssec-keygen.c dnssec-settime.c
dnssec-signzone.8 dnssec-signzone.c dnssectool.c
src/external/bsd/bind/dist/bin/named: builtin.c client.c config.c
control.c interfacemgr.c logconf.c lwdgrbn.c main.c named.conf.5
named.conf.docbook named.conf.html query.c server.c statschannel.c
update.c
src/external/bsd/bind/dist/bin/named/include/named: globals.h main.h
query.h server.h
src/external/bsd/bind/dist/bin/named/unix: os.c
src/external/bsd/bind/dist/bin/named/win32: ntservice.c os.c
src/external/bsd/bind/dist/bin/nsupdate: nsupdate.c
src/external/bsd/bind/dist/bin/rndc: rndc.8 rndc.c
src/external/bsd/bind/dist/bin/tests: backtrace_test.c rwlock_test.c
sock_test.c task_test.c timer_test.c
src/external/bsd/bind/dist/bin/tests/atomic: t_atomic.c
src/external/bsd/bind/dist/bin/tests/db: t_db.c
src/external/bsd/bind/dist/bin/tests/dst: gsstest.c t_dst.c
src/external/bsd/bind/dist/bin/tests/hashes: t_hashes.c
src/external/bsd/bind/dist/bin/tests/master: t_master.c
src/external/bsd/bind/dist/bin/tests/mem: t_mem.c
src/external/bsd/bind/dist/bin/tests/names: t_names.c
src/external/bsd/bind/dist/bin/tests/rbt: t_rbt.c
src/external/bsd/bind/dist/bin/tests/resolver: t_resolver.c
src/external/bsd/bind/dist/bin/tests/sockaddr: t_sockaddr.c
src/external/bsd/bind/dist/bin/tests/system/rrl: rrl.c
src/external/bsd/bind/dist/bin/tests/tasks: t_tasks.c
src/external/bsd/bind/dist/bin/tests/timers: t_timers.c
src/external/bsd/bind/dist/bin/win32/BINDInstall: StdAfx.h
src/external/bsd/bind/dist/doc/arm: Bv9ARM.pdf
src/external/bsd/bind/dist/doc/misc: options
src/external/bsd/bind/dist/lib/bind9: check.c
src/external/bsd/bind/dist/lib/dns: acache.c client.c diff.c dnssec.c
dst_api.c dst_internal.h dst_parse.c dst_result.c gen.c
gssapi_link.c gssapictx.c hmac_link.c journal.c log.c master.c
masterdump.c message.c name.c nsec.c nsec3.c openssldh_link.c
openssldsa_link.c opensslecdsa_link.c opensslgost_link.c
opensslrsa_link.c rbtdb.c rcode.c rdata.c rdataslab.c resolver.c
rootns.c rrl.c spnego.c spnego_asn1.c ssu_external.c ttl.c update.c
validator.c view.c xfrin.c zone.c
src/external/bsd/bind/dist/lib/dns/include/dns: client.h dnssec.h log.h
master.h masterdump.h message.h nsec3.h rdata.h rrl.h view.h zone.h
src/external/bsd/bind/dist/lib/dns/include/dst: dst.h gssapi.h
src/external/bsd/bind/dist/lib/dns/rdata/generic: dnskey_48.c hip_55.c
isdn_20.c key_25.c keydata_65533.c opt_41.c
src/external/bsd/bind/dist/lib/dns/rdata/in_1: wks_11.c
src/external/bsd/bind/dist/lib/dns/tests: rdata_test.c zonemgr_test.c
src/external/bsd/bind/dist/lib/dns/win32: version.c
src/external/bsd/bind/dist/lib/isc: app_api.c backtrace.c base32.c
base64.c hash.c heap.c hex.c hmacmd5.c hmacsha.c inet_aton.c
inet_pton.c lex.c log.c mem.c random.c safe.c socket_api.c
src/external/bsd/bind/dist/lib/isc/include/isc: app.h file.h hash.h
namespace.h safe.h socket.h stdio.h
src/external/bsd/bind/dist/lib/isc/nothreads/include/isc: thread.h
src/external/bsd/bind/dist/lib/isc/pthreads: thread.c
src/external/bsd/bind/dist/lib/isc/pthreads/include/isc: thread.h
src/external/bsd/bind/dist/lib/isc/tests: lex_test.c safe_test.c
src/external/bsd/bind/dist/lib/isc/unix: app.c file.c socket.c stdio.c
src/external/bsd/bind/dist/lib/isc/win32: entropy.c file.c
interfaceiter.c net.c netdb.h socket.c stdio.c stdtime.c
src/external/bsd/bind/dist/lib/isc/win32/include/isc: atomic.h net.h
thread.h
src/external/bsd/bind/dist/lib/isccc: base64.c cc.c
src/external/bsd/bind/dist/lib/isccfg: namedconf.c
src/external/bsd/bind/dist/lib/lwres: context.c gethost.c lwinetaton.c
lwinetpton.c lwres_gabn.c lwres_gnba.c lwres_grbn.c lwres_noop.c
src/external/bsd/bind/dist/lib/lwres/win32/include/lwres: net.h netdb.h
src/external/bsd/bind/dist/lib/tests: t_api.c
src/external/bsd/bind/dist/lib/tests/include/tests: t_api.h
src/external/bsd/bind/dist/lib/tests/win32: DLLMain.c

CVS commit: src/external/bsd/bind/dist/lib/isc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Dec 20 16:58:34 UTC 2013

Modified Files:
src/external/bsd/bind/dist/lib/isc: mem.c
src/external/bsd/bind/dist/lib/isc/unix: app.c

Log Message:
make the non-threaded case work again.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/mem.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/unix/app.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/mem.c
diff -u src/external/bsd/bind/dist/lib/isc/mem.c:1.6 src/external/bsd/bind/dist/lib/isc/mem.c:1.7
--- src/external/bsd/bind/dist/lib/isc/mem.c:1.6	Sat Jul 27 15:23:13 2013
+++ src/external/bsd/bind/dist/lib/isc/mem.c	Fri Dec 20 11:58:34 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.6 2013/07/27 19:23:13 christos Exp $	*/
+/*	$NetBSD: mem.c,v 1.7 2013/12/20 16:58:34 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2010, 2012  Internet Systems Consortium, Inc. (ISC)
@@ -310,8 +310,6 @@ ISC_MEMFUNC_SCOPE unsigned int
 isc__mempool_getfillcount(isc_mempool_t *mpctx);
 ISC_MEMFUNC_SCOPE void
 isc__mem_printactive(isc_mem_t *ctx0, FILE *file);
-ISC_MEMFUNC_SCOPE void
-isc__mem_printallactive(FILE *file);
 
 unsigned int
 isc__mem_references(isc_mem_t *ctx0);
@@ -351,7 +349,7 @@ static struct isc__memmethods {
 	(void *)isc__mem_getquota, (void *)isc__mem_setname,
 	(void *)isc__mem_getname, (void *)isc__mem_gettag,
 	(void *)isc__mem_printactive,
-	(void *)isc__mem_printallactive,
+	(void *)isc_mem_printallactive,
 
 };
 
@@ -2265,8 +2263,8 @@ isc__mem_printactive(isc_mem_t *ctx0, FI
 #endif
 }
 
-ISC_MEMFUNC_SCOPE void
-isc__mem_printallactive(FILE *file) {
+void
+isc_mem_printallactive(FILE *file) {
 #if !ISC_MEM_TRACKLINES
 	UNUSED(file);
 #else

Index: src/external/bsd/bind/dist/lib/isc/unix/app.c
diff -u src/external/bsd/bind/dist/lib/isc/unix/app.c:1.6 src/external/bsd/bind/dist/lib/isc/unix/app.c:1.7
--- src/external/bsd/bind/dist/lib/isc/unix/app.c:1.6	Sun Mar 24 14:42:01 2013
+++ src/external/bsd/bind/dist/lib/isc/unix/app.c	Fri Dec 20 11:58:34 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: app.c,v 1.6 2013/03/24 18:42:01 christos Exp $	*/
+/*	$NetBSD: app.c,v 1.7 2013/12/20 16:58:34 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. (ISC)
@@ -534,11 +534,6 @@ isc__app_ctxrun(isc_appctx_t *ctx0) {
 	int result;
 	isc_event_t *event, *next_event;
 	isc_task_t *task;
-	sigset_t sset;
-	char strbuf[ISC_STRERRORSIZE];
-#ifdef HAVE_SIGWAIT
-	int sig;
-#endif
 
 	REQUIRE(VALID_APPCTX(ctx));
 
@@ -582,10 +577,16 @@ isc__app_ctxrun(isc_appctx_t *ctx0) {
 	}
 #endif
 
+#ifdef ISC_PLATFORM_USETHREADS
 	/*
 	 * When we are using multiple contexts, we don't rely on signals.
 	 */
 	if (ctx == isc_g_appctx) {
+	sigset_t sset;
+	char strbuf[ISC_STRERRORSIZE];
+#ifdef HAVE_SIGWAIT
+	int sig;
+#endif
 
 	/*
 	 * There is no danger if isc_app_shutdown() is called before we wait
@@ -649,7 +650,9 @@ isc__app_ctxrun(isc_appctx_t *ctx0) {
 		if (ctx-want_shutdown  ctx-blocked)
 			exit(1);
 	}
-	} else {
+	} else
+#endif
+	{
 
 	(void)isc__taskmgr_dispatch(ctx-taskmgr);
 #ifndef ISC_PLATFORM_USETHREADS

CVS commit: src/external/bsd/bind/dist/lib/dns/include/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Nov  2 17:11:39 UTC 2013

Modified Files:
src/external/bsd/bind/dist/lib/dns/include/dns: rbt.h

Log Message:
these can never be null.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h
diff -u src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h:1.6 src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h:1.7
--- src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h:1.6	Mon Jun  4 20:41:51 2012
+++ src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h	Sat Nov  2 13:11:39 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbt.h,v 1.6 2012/06/05 00:41:51 christos Exp $	*/
+/*	$NetBSD: rbt.h,v 1.7 2013/11/02 17:11:39 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. (ISC)
@@ -927,15 +927,13 @@ dns_rbtnodechain_nextflat(dns_rbtnodecha
 	do {\
 		REQUIRE((node)-references  0);\
 		(node)-references++;   \
-		if ((refs) != NULL) \
-			(*refs) = (node)-references;   \
+		(*refs) = (node)-references;   	\
 	} while (/*CONSTCOND*/0)
 #define dns_rbtnode_refdecrement(node, refs)\
 	do {\
 		REQUIRE((node)-references  0);\
 		(node)-references--;   \
-		if ((refs) != NULL) \
-			(*refs) = (node)-references;   \
+		(*refs) = (node)-references;   	\
 	} while (/*CONSTCOND*/0)
 #endif /* DNS_RBT_USEISCREFCOUNT */
 

CVS commit: src/external/bsd/bind/dist/lib/isc/include/isc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Nov  2 17:12:23 UTC 2013

Modified Files:
src/external/bsd/bind/dist/lib/isc/include/isc: util.h

Log Message:
mark unused function as used.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/bind/dist/lib/isc/include/isc/util.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/include/isc/util.h
diff -u src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.7 src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.8
--- src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.7	Mon Jun  4 20:42:41 2012
+++ src/external/bsd/bind/dist/lib/isc/include/isc/util.h	Sat Nov  2 13:12:23 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.h,v 1.7 2012/06/05 00:42:41 christos Exp $	*/
+/*	$NetBSD: util.h,v 1.8 2013/11/02 17:12:23 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2010-2012  Internet Systems Consortium, Inc. (ISC)
@@ -77,7 +77,7 @@
  * Use this in translation units that would otherwise be empty, to
  * suppress compiler warnings.
  */
-#define EMPTY_TRANSLATION_UNIT static void isc__empty(void) { isc__empty(); }
+#define EMPTY_TRANSLATION_UNIT static void __used isc__empty(void) { isc__empty(); }
 
 /*%
  * We use macros instead of calling the routines directly because

CVS commit: src/external/bsd/bind/dist/bin/dnssec

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Jul  1 21:59:20 UTC 2013

Modified Files:
src/external/bsd/bind/dist/bin/dnssec: dnssec-verify.c

Log Message:
Fix option parsing on unsigned char platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/bind/dist/bin/dnssec/dnssec-verify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/dnssec/dnssec-verify.c
diff -u src/external/bsd/bind/dist/bin/dnssec/dnssec-verify.c:1.3 src/external/bsd/bind/dist/bin/dnssec/dnssec-verify.c:1.4
--- src/external/bsd/bind/dist/bin/dnssec/dnssec-verify.c:1.3	Sun Mar 24 18:44:38 2013
+++ src/external/bsd/bind/dist/bin/dnssec/dnssec-verify.c	Mon Jul  1 21:59:20 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: dnssec-verify.c,v 1.3 2013/03/24 18:44:38 christos Exp $	*/
+/*	$NetBSD: dnssec-verify.c,v 1.4 2013/07/01 21:59:20 joerg Exp $	*/
 
 /*
  * Copyright (C) 2012  Internet Systems Consortium, Inc. (ISC)
@@ -164,7 +164,8 @@ main(int argc, char *argv[]) {
 #endif
 	char *classname = NULL;
 	dns_rdataclass_t rdclass;
-	char ch, *endp;
+	int ch;
+	char *endp;
 
 	isc__mem_register();
 #define CMDLINE_FLAGS \

CVS commit: src/external/bsd/bind/dist/lib/isc/unix

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Apr 14 13:18:23 UTC 2013

Modified Files:
src/external/bsd/bind/dist/lib/isc/unix: socket.c

Log Message:
The common fields of the socket should be initialized in one place since
we are the socket provider. Fixes crash with rndc status, where accepted
sockets did not have their method fields initialized!


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/bind/dist/lib/isc/unix/socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/unix/socket.c
diff -u src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.10 src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.11
--- src/external/bsd/bind/dist/lib/isc/unix/socket.c:1.10	Sun Mar 24 14:42:01 2013
+++ src/external/bsd/bind/dist/lib/isc/unix/socket.c	Sun Apr 14 09:18:23 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.c,v 1.10 2013/03/24 18:42:01 christos Exp $	*/
+/*	$NetBSD: socket.c,v 1.11 2013/04/14 13:18:23 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. (ISC)
@@ -2149,6 +2149,7 @@ allocate_socket(isc__socketmgr_t *manage
 
 	sock-common.magic = ISCAPI_SOCKET_MAGIC;
 	sock-common.impmagic = SOCKET_MAGIC;
+	sock-common.methods = (isc_socketmethods_t *)socketmethods;
 	*socketp = sock;
 
 	return (ISC_R_SUCCESS);
@@ -2600,7 +2601,6 @@ socket_create(isc_socketmgr_t *manager0,
 		return (result);
 	}
 
-	sock-common.methods = (isc_socketmethods_t *)socketmethods;
 	sock-references = 1;
 	*socketp = (isc_socket_t *)sock;
 
@@ -2736,7 +2736,6 @@ isc__socket_fdwatchcreate(isc_socketmgr_
 	sock-fdwatchtask = task;
 	sock-statsindex = fdwatchstatsindex;
 
-	sock-common.methods = (isc_socketmethods_t *)socketmethods;
 	sock-references = 1;
 	*socketp = (isc_socket_t *)sock;
 

CVS commit: src/external/bsd/bind/dist/lib/isc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 24 18:42:01 UTC 2013

Modified Files:
src/external/bsd/bind/dist/lib/isc: hash.c lib.c mem.c mem_api.c
socket_api.c task.c task_api.c task_p.h timer.c timer_api.c
src/external/bsd/bind/dist/lib/isc/include/isc: app.h bind9.h mem.h
namespace.h socket.h task.h timer.h
src/external/bsd/bind/dist/lib/isc/unix: app.c socket.c

Log Message:
Export all the necessary functions via the registry API instead of playing
namespace games with cpp. Remove the BIND9 ifdef. Now the bind programs
don't need a special build of libisc.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/isc/hash.c \
src/external/bsd/bind/dist/lib/isc/lib.c \
src/external/bsd/bind/dist/lib/isc/mem_api.c \
src/external/bsd/bind/dist/lib/isc/task_p.h \
src/external/bsd/bind/dist/lib/isc/timer_api.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/isc/mem.c \
src/external/bsd/bind/dist/lib/isc/socket_api.c \
src/external/bsd/bind/dist/lib/isc/task_api.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/task.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/lib/isc/timer.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/isc/include/isc/app.h \
src/external/bsd/bind/dist/lib/isc/include/isc/bind9.h \
src/external/bsd/bind/dist/lib/isc/include/isc/timer.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/isc/include/isc/mem.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/lib/isc/include/isc/namespace.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/bind/dist/lib/isc/include/isc/socket.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/bind/dist/lib/isc/include/isc/task.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/lib/isc/unix/app.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/isc/unix/socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/hash.c
diff -u src/external/bsd/bind/dist/lib/isc/hash.c:1.3 src/external/bsd/bind/dist/lib/isc/hash.c:1.4
--- src/external/bsd/bind/dist/lib/isc/hash.c:1.3	Mon Jun  4 20:42:27 2012
+++ src/external/bsd/bind/dist/lib/isc/hash.c	Sun Mar 24 14:41:59 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash.c,v 1.3 2012/06/05 00:42:27 christos Exp $	*/
+/*	$NetBSD: hash.c,v 1.4 2013/03/24 18:41:59 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. (ISC)
@@ -196,12 +196,8 @@ isc_hash_ctxcreate(isc_mem_t *mctx, isc_
 	hctx-vectorlen = vlen;
 	hctx-rndvector = rv;
 
-#ifdef BIND9
 	if (entropy != NULL)
 		isc_entropy_attach(entropy, hctx-entropy);
-#else
-	UNUSED(entropy);
-#endif
 
 	*hctxp = hctx;
 	return (ISC_R_SUCCESS);
@@ -248,16 +244,12 @@ isc_hash_ctxinit(isc_hash_t *hctx) {
 		goto out;
 
 	if (hctx-entropy) {
-#ifdef BIND9
 		isc_result_t result;
 
 		result = isc_entropy_getdata(hctx-entropy,
 	 hctx-rndvector, hctx-vectorlen,
 	 NULL, 0);
 		INSIST(result == ISC_R_SUCCESS);
-#else
-		INSIST(0);
-#endif
 	} else {
 		isc_uint32_t pr;
 		unsigned int i, copylen;
@@ -314,10 +306,8 @@ destroy(isc_hash_t **hctxp) {
 	isc_refcount_destroy(hctx-refcnt);
 
 	mctx = hctx-mctx;
-#ifdef BIND9
 	if (hctx-entropy != NULL)
 		isc_entropy_detach(hctx-entropy);
-#endif
 	if (hctx-rndvector != NULL)
 		isc_mem_put(mctx, hctx-rndvector, hctx-vectorlen);
 
Index: src/external/bsd/bind/dist/lib/isc/lib.c
diff -u src/external/bsd/bind/dist/lib/isc/lib.c:1.3 src/external/bsd/bind/dist/lib/isc/lib.c:1.4
--- src/external/bsd/bind/dist/lib/isc/lib.c:1.3	Mon Jun  4 20:42:28 2012
+++ src/external/bsd/bind/dist/lib/isc/lib.c	Sun Mar 24 14:41:59 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: lib.c,v 1.3 2012/06/05 00:42:28 christos Exp $	*/
+/*	$NetBSD: lib.c,v 1.4 2013/03/24 18:41:59 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. (ISC)
@@ -85,7 +85,6 @@ isc_lib_initmsgcat(void) {
 	}
 }
 
-#ifndef BIND9
 static isc_once_t		register_once = ISC_ONCE_INIT;
 
 static void
@@ -102,4 +101,3 @@ isc_lib_register() {
 	RUNTIME_CHECK(isc_once_do(register_once, do_register)
 		  == ISC_R_SUCCESS);
 }
-#endif
Index: src/external/bsd/bind/dist/lib/isc/mem_api.c
diff -u src/external/bsd/bind/dist/lib/isc/mem_api.c:1.3 src/external/bsd/bind/dist/lib/isc/mem_api.c:1.4
--- src/external/bsd/bind/dist/lib/isc/mem_api.c:1.3	Mon Jun  4 20:42:29 2012
+++ src/external/bsd/bind/dist/lib/isc/mem_api.c	Sun Mar 24 14:42:00 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem_api.c,v 1.3 2012/06/05 00:42:29 christos Exp $	*/
+/*	$NetBSD: mem_api.c,v 1.4 2013/03/24 18:42:00 christos Exp $	*/
 
 /*
  * Copyright (C) 2009, 2010  Internet Systems Consortium, Inc. (ISC)
@@ -65,8 +65,9 @@ isc_mem_create(size_t init_max_size, siz
 	LOCK(createlock);
 
 	REQUIRE(mem_createfunc != NULL);
-	result = 

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 24 18:43:32 UTC 2013

Modified Files:
src/external/bsd/bind/dist/lib/dns: dst_api.c ecdb.c lib.c

Log Message:
- Relax some of the assertions to make things work outside bind.
- Remove #ifndef BIND9 exclusions
Now a libdns that is built with BIND9 can be used by other isc programs.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/lib/dns/dst_api.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/dns/ecdb.c \
src/external/bsd/bind/dist/lib/dns/lib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/dst_api.c
diff -u src/external/bsd/bind/dist/lib/dns/dst_api.c:1.5 src/external/bsd/bind/dist/lib/dns/dst_api.c:1.6
--- src/external/bsd/bind/dist/lib/dns/dst_api.c:1.5	Tue Dec  4 18:38:42 2012
+++ src/external/bsd/bind/dist/lib/dns/dst_api.c	Sun Mar 24 14:43:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: dst_api.c,v 1.5 2012/12/04 23:38:42 spz Exp $	*/
+/*	$NetBSD: dst_api.c,v 1.6 2013/03/24 18:43:32 christos Exp $	*/
 
 /*
  * Portions Copyright (C) 2004-2012  Internet Systems Consortium, Inc. (ISC)
@@ -164,11 +164,7 @@ dst_lib_init2(isc_mem_t *mctx, isc_entro
 	isc_result_t result;
 
 	REQUIRE(mctx != NULL);
-#ifdef BIND9
-	REQUIRE(ectx != NULL);
-#else
 	UNUSED(ectx);
-#endif
 	REQUIRE(dst_initialized == ISC_FALSE);
 
 #ifndef OPENSSL
@@ -199,7 +195,8 @@ dst_lib_init2(isc_mem_t *mctx, isc_entro
 	isc_mem_attach(mctx, dst__memory_pool);
 #endif
 #ifdef BIND9
-	isc_entropy_attach(ectx, dst_entropy_pool);
+	if (ectx)
+		isc_entropy_attach(ectx, dst_entropy_pool);
 #endif
 	dst_entropy_flags = eflags;
 

Index: src/external/bsd/bind/dist/lib/dns/ecdb.c
diff -u src/external/bsd/bind/dist/lib/dns/ecdb.c:1.3 src/external/bsd/bind/dist/lib/dns/ecdb.c:1.4
--- src/external/bsd/bind/dist/lib/dns/ecdb.c:1.3	Mon Jun  4 20:41:31 2012
+++ src/external/bsd/bind/dist/lib/dns/ecdb.c	Sun Mar 24 14:43:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ecdb.c,v 1.3 2012/06/05 00:41:31 christos Exp $	*/
+/*	$NetBSD: ecdb.c,v 1.4 2013/03/24 18:43:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2009-2011  Internet Systems Consortium, Inc. (ISC)
@@ -767,19 +767,23 @@ rdataset_settrust(dns_rdataset_t *rdatas
 
 static void
 rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) {
-	ecdb_rdatasetiter_t *ecdbiterator;
+	union {
+		dns_rdatasetiter_t *rdatasetiterator;
+		ecdb_rdatasetiter_t *ecdbiterator;
+	} u;
 	isc_mem_t *mctx;
 
 	REQUIRE(iteratorp != NULL);
-	ecdbiterator = (ecdb_rdatasetiter_t *)*iteratorp;
-	REQUIRE(DNS_RDATASETITER_VALID(ecdbiterator-common));
+	u.rdatasetiterator = *iteratorp;
+//	REQUIRE(DNS_RDATASETITER_VALID((u.ecdbiterator-common)));
 
-	mctx = ecdbiterator-common.db-mctx;
+	mctx = u.ecdbiterator-common.db-mctx;
 
-	ecdbiterator-common.magic = 0;
+	u.ecdbiterator-common.magic = 0;
 
-	dns_db_detachnode(ecdbiterator-common.db, ecdbiterator-common.node);
-	isc_mem_put(mctx, ecdbiterator, sizeof(ecdb_rdatasetiter_t));
+	dns_db_detachnode(u.ecdbiterator-common.db,
+	u.ecdbiterator-common.node);
+	isc_mem_put(mctx, u.ecdbiterator, sizeof(ecdb_rdatasetiter_t));
 
 	*iteratorp = NULL;
 }
Index: src/external/bsd/bind/dist/lib/dns/lib.c
diff -u src/external/bsd/bind/dist/lib/dns/lib.c:1.3 src/external/bsd/bind/dist/lib/dns/lib.c:1.4
--- src/external/bsd/bind/dist/lib/dns/lib.c:1.3	Mon Jun  4 20:41:33 2012
+++ src/external/bsd/bind/dist/lib/dns/lib.c	Sun Mar 24 14:43:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: lib.c,v 1.3 2012/06/05 00:41:33 christos Exp $	*/
+/*	$NetBSD: lib.c,v 1.4 2013/03/24 18:43:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. (ISC)
@@ -77,9 +77,7 @@ dns_lib_initmsgcat(void) {
 
 static isc_once_t init_once = ISC_ONCE_INIT;
 static isc_mem_t *dns_g_mctx = NULL;
-#ifndef BIND9
 static dns_dbimplementation_t *dbimp = NULL;
-#endif
 static isc_boolean_t initialize_done = ISC_FALSE;
 static isc_mutex_t reflock;
 static unsigned int references = 0;
@@ -94,11 +92,9 @@ initialize(void) {
 	if (result != ISC_R_SUCCESS)
 		return;
 	dns_result_register();
-#ifndef BIND9
 	result = dns_ecdb_register(dns_g_mctx, dbimp);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_mctx;
-#endif
 	result = isc_hash_create(dns_g_mctx, NULL, DNS_NAME_MAXWIRE);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_db;
@@ -119,10 +115,8 @@ initialize(void) {
   cleanup_hash:
 	isc_hash_destroy();
   cleanup_db:
-#ifndef BIND9
 	dns_ecdb_unregister(dbimp);
   cleanup_mctx:
-#endif
 	isc_mem_detach(dns_g_mctx);
 }
 
@@ -163,8 +157,6 @@ dns_lib_shutdown(void) {
 
 	dst_lib_destroy();
 	isc_hash_destroy();
-#ifndef BIND9
 	dns_ecdb_unregister(dbimp);
-#endif
 	isc_mem_detach(dns_g_mctx);
 }

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Oct  9 22:55:40 UTC 2012

Modified Files:
src/external/bsd/bind/dist: CHANGES version
src/external/bsd/bind/dist/bin/named: query.c

Log Message:
Apply P4:

3383.  [security]  A certain combination of records in the RBT could
   cause named to hang while populating the additional
   section of a response. [RT #31090]


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/bin/named/query.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.6 src/external/bsd/bind/dist/CHANGES:1.7
--- src/external/bsd/bind/dist/CHANGES:1.6	Thu Sep 13 01:32:07 2012
+++ src/external/bsd/bind/dist/CHANGES	Tue Oct  9 18:55:39 2012
@@ -1,3 +1,9 @@
+	--- 9.9.1-P4 released ---
+
+3383.	[security]	A certain combination of records in the RBT could
+cause named to hang while populating the additional
+section of a response. [RT #31090]
+
 	--- 9.9.1-P3 released ---
 
 3364.	[security]	Named could die on specially crafted record.

Index: src/external/bsd/bind/dist/version
diff -u src/external/bsd/bind/dist/version:1.3 src/external/bsd/bind/dist/version:1.4
--- src/external/bsd/bind/dist/version:1.3	Thu Sep 13 01:32:07 2012
+++ src/external/bsd/bind/dist/version	Tue Oct  9 18:55:39 2012
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=9
 PATCHVER=1
 RELEASETYPE=-P
-RELEASEVER=3
+RELEASEVER=4

Index: src/external/bsd/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.8 src/external/bsd/bind/dist/bin/named/query.c:1.9
--- src/external/bsd/bind/dist/bin/named/query.c:1.8	Mon Jun  4 20:39:03 2012
+++ src/external/bsd/bind/dist/bin/named/query.c	Tue Oct  9 18:55:40 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: query.c,v 1.8 2012/06/05 00:39:03 christos Exp $	*/
+/*	$NetBSD: query.c,v 1.9 2012/10/09 22:55:40 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. (ISC)
@@ -1121,13 +1121,6 @@ query_isduplicate(ns_client_t *client, d
 		mname = NULL;
 	}
 
-	/*
-	 * If the dns_name_t we're looking up is already in the message,
-	 * we don't want to trigger the caller's name replacement logic.
-	 */
-	if (name == mname)
-		mname = NULL;
-
 	if (mnamep != NULL)
 		*mnamep = mname;
 
@@ -1332,6 +1325,7 @@ query_addadditional(void *arg, dns_name_
 	if (dns_rdataset_isassociated(rdataset) 
 	!query_isduplicate(client, fname, type, mname)) {
 		if (mname != NULL) {
+			INSIST(mname != fname);
 			query_releasename(client, fname);
 			fname = mname;
 		} else
@@ -1401,11 +1395,13 @@ query_addadditional(void *arg, dns_name_
 #endif
 			if (!query_isduplicate(client, fname,
 	   dns_rdatatype_a, mname)) {
-if (mname != NULL) {
-	query_releasename(client, fname);
-	fname = mname;
-} else
-	need_addname = ISC_TRUE;
+if (mname != fname) {
+	if (mname != NULL) {
+		query_releasename(client, fname);
+		fname = mname;
+	} else
+		need_addname = ISC_TRUE;
+}
 ISC_LIST_APPEND(fname-list, rdataset, link);
 added_something = ISC_TRUE;
 if (sigrdataset != NULL 
@@ -1458,11 +1454,13 @@ query_addadditional(void *arg, dns_name_
 #endif
 			if (!query_isduplicate(client, fname,
 	   dns_rdatatype_, mname)) {
-if (mname != NULL) {
-	query_releasename(client, fname);
-	fname = mname;
-} else
-	need_addname = ISC_TRUE;
+if (mname != fname) {
+	if (mname != NULL) {
+		query_releasename(client, fname);
+		fname = mname;
+	} else
+		need_addname = ISC_TRUE;
+}
 ISC_LIST_APPEND(fname-list, rdataset, link);
 added_something = ISC_TRUE;
 if (sigrdataset != NULL 
@@ -1993,22 +1991,24 @@ query_addadditional2(void *arg, dns_name
 		crdataset-type == dns_rdatatype_) {
 			if (!query_isduplicate(client, fname, crdataset-type,
 	   mname)) {
-if (mname != NULL) {
-	/*
-	 * A different type of this name is
-	 * already stored in the additional
-	 * section.  We'll reuse the name.
-	 * Note that this should happen at most
-	 * once.  Otherwise, fname-link could
-	 * leak below.
-	 */
-	INSIST(mname0 == NULL);
-
-	query_releasename(client, fname);
-	fname = mname;
-	mname0 = mname;
-} else
-	need_addname = ISC_TRUE;
+if (mname != fname) {
+	if (mname != NULL) {
+		/*
+		 * A different type of this name is
+		 * already stored in the additional
+		 * section.  We'll reuse the name.
+		 * Note that this should happen at most
+		 * once.  Otherwise, fname-link could
+		 * leak below.
+		 */
+		INSIST(mname0 

CVS commit: src/external/bsd/bind/dist

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Tue Jul 24 18:06:29 UTC 2012

Modified Files:
src/external/bsd/bind/dist: CHANGES version
src/external/bsd/bind/dist/bin/tests/system/stub: tests.sh
src/external/bsd/bind/dist/lib/dns: resolver.c zone.c
src/external/bsd/bind/dist/lib/isc/include/isc: queue.h

Log Message:
Fixes for CVE-2012-3817 and CVE-2012-3868 from ISC:

--- 9.9.1-P2 released ---

3346.   [security]  Bad-cache data could be used before it was
initialized, causing an assert. [RT #30025]

3345.   [bug]   Addressed race condition when removing the last item
or inserting the first item in an ISC_QUEUE.
[RT #29539]

3342.   [bug]   Change #3314 broke saving of stub zones to disk
resulting in excessive cpu usage in some cases.
[RT #29952]


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/bind/dist/bin/tests/system/stub/tests.sh
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/lib/dns/zone.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/bind/dist/lib/isc/include/isc/queue.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.3 src/external/bsd/bind/dist/CHANGES:1.4
--- src/external/bsd/bind/dist/CHANGES:1.3	Tue Jun  5 00:38:46 2012
+++ src/external/bsd/bind/dist/CHANGES	Tue Jul 24 18:06:28 2012
@@ -1,3 +1,16 @@
+	--- 9.9.1-P2 released ---
+
+3346.	[security]	Bad-cache data could be used before it was
+			initialized, causing an assert. [RT #30025]
+
+3345.	[bug]		Addressed race condition when removing the last item
+			or inserting the first item in an ISC_QUEUE.
+			[RT #29539]
+
+3342.	[bug]		Change #3314 broke saving of stub zones to disk
+			resulting in excessive cpu usage in some cases.
+			[RT #29952]
+
 	--- 9.9.1-P1 released ---
 
 3331.	[security]	dns_rdataslab_fromrdataset could produce bad

Index: src/external/bsd/bind/dist/version
diff -u src/external/bsd/bind/dist/version:1.1.1.11 src/external/bsd/bind/dist/version:1.2
--- src/external/bsd/bind/dist/version:1.1.1.11	Mon Jun  4 17:53:25 2012
+++ src/external/bsd/bind/dist/version	Tue Jul 24 18:06:28 2012
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=9
 PATCHVER=1
 RELEASETYPE=-P
-RELEASEVER=1
+RELEASEVER=2

Index: src/external/bsd/bind/dist/bin/tests/system/stub/tests.sh
diff -u src/external/bsd/bind/dist/bin/tests/system/stub/tests.sh:1.1.1.3 src/external/bsd/bind/dist/bin/tests/system/stub/tests.sh:1.2
--- src/external/bsd/bind/dist/bin/tests/system/stub/tests.sh:1.1.1.3	Mon Jun  4 17:54:37 2012
+++ src/external/bsd/bind/dist/bin/tests/system/stub/tests.sh	Tue Jul 24 18:06:28 2012
@@ -21,14 +21,24 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 status=0
+echo I:check that the stub zone has been saved to disk
+for i in 1 2 3 4 5 6 7 8 9 20
+do
+	[ -f ns3/child.example.st ]  break
+	sleep 1
+done
+[ -f ns3/child.example.st ] || { status=1;  echo I:failed; }
+
+for pass in 1 2
+do
 
-echo I:trying an axfr that should be denied (NOTAUTH)
+echo I:trying an axfr that should be denied (NOTAUTH) (pass=$pass)
 ret=0
-$DIG +tcp data.child.example. @10.53.0.3 axfr -p 5300  dig.out.ns3 || ret=1
+$DIG +tcp child.example. @10.53.0.3 axfr -p 5300  dig.out.ns3 || ret=1
 grep ; Transfer failed. dig.out.ns3  /dev/null || ret=1
 [ $ret = 0 ] || { status=1;  echo I:failed; }
 
-echo I:look for stub zone data without recursion (should not be found)
+echo I:look for stub zone data without recursion (should not be found) (pass=$pass)
 for i in 1 2 3 4 5 6 7 8 9
 do
 	ret=0
@@ -41,11 +51,20 @@ done
 $PERL ../digcomp.pl knowngood.dig.out.norec dig.out.ns3 || ret=1
 [ $ret = 0 ] || { status=1;  echo I:failed; }
 
-echo I:look for stub zone data with recursion (should be found)
+echo I:look for stub zone data with recursion (should be found) (pass=$pass)
 ret=0
 $DIG +tcp data.child.example. @10.53.0.3 txt -p 5300  dig.out.ns3 || ret=1
 $PERL ../digcomp.pl knowngood.dig.out.rec dig.out.ns3 || ret=1
 [ $ret = 0 ] || { status=1;  echo I:failed; }
 
+[ $pass = 1 ]  {
+	echo I:stopping stub server
+	$PERL $SYSTEMTESTTOP/stop.pl . ns3
+
+	echo I:re-starting stub server
+	$PERL $SYSTEMTESTTOP/start.pl --noclean --restart . ns3
+}
+done
+
 echo I:exit status: $status
 exit $status

Index: src/external/bsd/bind/dist/lib/dns/resolver.c
diff -u src/external/bsd/bind/dist/lib/dns/resolver.c:1.12 src/external/bsd/bind/dist/lib/dns/resolver.c:1.13
--- src/external/bsd/bind/dist/lib/dns/resolver.c:1.12	Tue Jun  5 00:41:39 2012
+++ src/external/bsd/bind/dist/lib/dns/resolver.c	Tue Jul 24 

CVS commit: src/external/bsd/bind/dist

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Tue Jul 24 20:00:45 UTC 2012

Modified Files:
src/external/bsd/bind/dist: CHANGES
src/external/bsd/bind/dist/lib/dns: resolver.c
src/external/bsd/bind/dist/lib/isc/include/isc: queue.h

Log Message:
the patch for CVE-2012-3868 was incomplete


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/bind/dist/lib/isc/include/isc/queue.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.4 src/external/bsd/bind/dist/CHANGES:1.5
--- src/external/bsd/bind/dist/CHANGES:1.4	Tue Jul 24 18:06:28 2012
+++ src/external/bsd/bind/dist/CHANGES	Tue Jul 24 20:00:44 2012
@@ -1,5 +1,7 @@
 	--- 9.9.1-P2 released ---
 
+3349.	[bug]		Change #3345 was incomplete. [RT #30233]
+
 3346.	[security]	Bad-cache data could be used before it was
 			initialized, causing an assert. [RT #30025]
 

Index: src/external/bsd/bind/dist/lib/dns/resolver.c
diff -u src/external/bsd/bind/dist/lib/dns/resolver.c:1.13 src/external/bsd/bind/dist/lib/dns/resolver.c:1.14
--- src/external/bsd/bind/dist/lib/dns/resolver.c:1.13	Tue Jul 24 18:06:28 2012
+++ src/external/bsd/bind/dist/lib/dns/resolver.c	Tue Jul 24 20:00:45 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: resolver.c,v 1.13 2012/07/24 18:06:28 spz Exp $	*/
+/*	$NetBSD: resolver.c,v 1.14 2012/07/24 20:00:45 spz Exp $	*/
 
 /*
  * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. (ISC)
@@ -8465,7 +8465,7 @@ dns_resolver_addbadcache(dns_resolver_t 
 		resolver-badhash  DNS_BADCACHE_SIZE)
 			resizehash(resolver, now, ISC_FALSE);
 	} else
-	bad-expire = *expire;
+		bad-expire = *expire;
  cleanup:
 	UNLOCK(resolver-lock);
 }

Index: src/external/bsd/bind/dist/lib/isc/include/isc/queue.h
diff -u src/external/bsd/bind/dist/lib/isc/include/isc/queue.h:1.2 src/external/bsd/bind/dist/lib/isc/include/isc/queue.h:1.3
--- src/external/bsd/bind/dist/lib/isc/include/isc/queue.h:1.2	Tue Jul 24 18:06:29 2012
+++ src/external/bsd/bind/dist/lib/isc/include/isc/queue.h	Tue Jul 24 20:00:45 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: queue.h,v 1.2 2012/07/24 18:06:29 spz Exp $	*/
+/*	$NetBSD: queue.h,v 1.3 2012/07/24 20:00:45 spz Exp $	*/
 
 /*
  * Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. (ISC)
@@ -103,15 +103,15 @@
 		} \
 		LOCK((queue).taillock); \
 		if ((queue).tail == NULL  !headlocked) { \
-		UNLOCK((queue).taillock); \
+			UNLOCK((queue).taillock); \
 			LOCK((queue).headlock); \
 			LOCK((queue).taillock); \
 			headlocked = ISC_TRUE; \
 		} \
-		if ((queue).tail != NULL) \
-			(queue).tail-link.next = (elt); \
 		(elt)-link.prev = (queue).tail; \
 		(elt)-link.next = NULL; \
+		if ((queue).tail != NULL) \
+			(queue).tail-link.next = (elt); \
 		(queue).tail = (elt); \
 		UNLOCK((queue).taillock); \
 		if (headlocked) { \
@@ -130,10 +130,10 @@
 LOCK((queue).taillock); \
 if (ret-link.next == NULL) { \
 	(queue).head = (queue).tail = NULL; \
-UNLOCK((queue).taillock); \
+	UNLOCK((queue).taillock); \
 	break; \
 			} \
-UNLOCK((queue).taillock); \
+			UNLOCK((queue).taillock); \
 		} \
 			(queue).head = ret-link.next; \
 			(queue).head-link.prev = NULL; \

CVS commit: src/external/bsd/bind/dist/lib/lwres

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Fri Jun 15 19:54:21 UTC 2012

Modified Files:
src/external/bsd/bind/dist/lib/lwres: getnameinfo.c

Log Message:
Simplify ERR, so that it doesn't mess up Clang's
-Wsometimes-uninitialized scan on the function. This is tracked in LLVM
as http://llvm.org/bugs/show_bug.cgi?id=13093.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/lwres/getnameinfo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/lwres/getnameinfo.c
diff -u src/external/bsd/bind/dist/lib/lwres/getnameinfo.c:1.3 src/external/bsd/bind/dist/lib/lwres/getnameinfo.c:1.4
--- src/external/bsd/bind/dist/lib/lwres/getnameinfo.c:1.3	Tue Jun  5 00:43:04 2012
+++ src/external/bsd/bind/dist/lib/lwres/getnameinfo.c	Fri Jun 15 19:54:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: getnameinfo.c,v 1.3 2012/06/05 00:43:04 christos Exp $	*/
+/*	$NetBSD: getnameinfo.c,v 1.4 2012/06/15 19:54:21 joerg Exp $	*/
 
 /*
  * Portions Copyright (C) 2004, 2005, 2007, 2011, 2012  Internet Systems Consortium, Inc. (ISC)
@@ -149,13 +149,9 @@ static struct afd {
 #define ENI_SALEN	6
 #define ENI_NOSOCKET 	7
 
-/*!
- * The test against 0 is there to keep the Solaris compiler
- * from complaining about end-of-loop code not reached.
- */
 #define ERR(code) \
 	do { result = (code);			\
-		if (result != 0) goto cleanup;	\
+		goto cleanup;			\
 	} while (/*CONSTCOND*/0)
 
 /*% lightweight resolver socket address structure to hostname and service name */

CVS commit: src/external/bsd/bind/dist

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Sat Mar 17 11:10:33 UTC 2012

Modified Files:
src/external/bsd/bind/dist: bind2netbsd

Log Message:
Make a quick note about adding a short summary of changes to the cvs import
message.

Currently you can't prepare that in advance and then use cvs import -F
file to supply the log message in a file. Will file a PR on cvs for this.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/bind2netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bind2netbsd
diff -u src/external/bsd/bind/dist/bind2netbsd:1.5 src/external/bsd/bind/dist/bind2netbsd:1.6
--- src/external/bsd/bind/dist/bind2netbsd:1.5	Sat Oct  8 19:28:38 2011
+++ src/external/bsd/bind/dist/bind2netbsd	Sat Mar 17 11:10:33 2012
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#	$NetBSD: bind2netbsd,v 1.5 2011/10/08 19:28:38 christos Exp $
+#	$NetBSD: bind2netbsd,v 1.6 2012/03/17 11:10:33 dholland Exp $
 #
 # Copyright (c) 2000 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -44,6 +44,10 @@
 #	  /usr/src/external/bsd/bind/include
 #	- check makefiles to see if any extra sources have been added.
 #	- update distrib/sets if necessary.
+#
+# Note that properly the import message should include a short summary
+# of changes since the previous import rather than just Import bind 9.x.y.
+#
 
 if [ $# -ne 2 ]; then echo bind2netbsd src dest; exit 1; fi
 

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 16 17:28:10 UTC 2011

Modified Files:
src/external/bsd/bind/dist/bin/named: query.c
src/external/bsd/bind/dist/lib/dns: rbtdb.c

Log Message:
patch for: https://www.isc.org/software/bind/advisories/cve-2011-tbd


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/bin/named/query.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/bind/dist/lib/dns/rbtdb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.6 src/external/bsd/bind/dist/bin/named/query.c:1.7
--- src/external/bsd/bind/dist/bin/named/query.c:1.6	Sun Sep 11 14:55:27 2011
+++ src/external/bsd/bind/dist/bin/named/query.c	Wed Nov 16 12:28:10 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: query.c,v 1.6 2011/09/11 18:55:27 christos Exp $	*/
+/*	$NetBSD: query.c,v 1.7 2011/11/16 17:28:10 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. (ISC)
@@ -1395,11 +1395,9 @@ query_addadditional(void *arg, dns_name_
 			goto addname;
 		if (result == DNS_R_NCACHENXRRSET) {
 			dns_rdataset_disassociate(rdataset);
-			/*
-			 * Negative cache entries don't have sigrdatasets.
-			 */
-			INSIST(sigrdataset == NULL ||
-			   ! dns_rdataset_isassociated(sigrdataset));
+			if (sigrdataset != NULL 
+			dns_rdataset_isassociated(sigrdataset))
+dns_rdataset_disassociate(sigrdataset);
 		}
 		if (result == ISC_R_SUCCESS) {
 			mname = NULL;
@@ -1440,8 +1438,9 @@ query_addadditional(void *arg, dns_name_
 			goto addname;
 		if (result == DNS_R_NCACHENXRRSET) {
 			dns_rdataset_disassociate(rdataset);
-			INSIST(sigrdataset == NULL ||
-			   ! dns_rdataset_isassociated(sigrdataset));
+			if (sigrdataset != NULL 
+			dns_rdataset_isassociated(sigrdataset))
+dns_rdataset_disassociate(sigrdataset);
 		}
 		if (result == ISC_R_SUCCESS) {
 			mname = NULL;
@@ -1891,10 +1890,8 @@ query_addadditional2(void *arg, dns_name
 		goto setcache;
 	if (result == DNS_R_NCACHENXRRSET) {
 		dns_rdataset_disassociate(rdataset);
-		/*
-		 * Negative cache entries don't have sigrdatasets.
-		 */
-		INSIST(! dns_rdataset_isassociated(sigrdataset));
+		if (dns_rdataset_isassociated(sigrdataset))
+			dns_rdataset_disassociate(sigrdataset);
 	}
 	if (result == ISC_R_SUCCESS) {
 		/* Remember the result as a cache */

Index: src/external/bsd/bind/dist/lib/dns/rbtdb.c
diff -u src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.10 src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.11
--- src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.10	Sun Sep 11 14:55:36 2011
+++ src/external/bsd/bind/dist/lib/dns/rbtdb.c	Wed Nov 16 12:28:10 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbtdb.c,v 1.10 2011/09/11 18:55:36 christos Exp $	*/
+/*	$NetBSD: rbtdb.c,v 1.11 2011/11/16 17:28:10 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. (ISC)
@@ -5055,7 +5055,7 @@ cache_find(dns_db_t *db, dns_name_t *nam
 			  rdataset);
 		if (need_headerupdate(found, search.now))
 			update = found;
-		if (foundsig != NULL) {
+		if (!NEGATIVE(found)  foundsig != NULL) {
 			bind_rdataset(search.rbtdb, node, foundsig, search.now,
   sigrdataset);
 			if (need_headerupdate(foundsig, search.now))
@@ -5687,7 +5687,7 @@ cache_findrdataset(dns_db_t *db, dns_dbn
 	}
 	if (found != NULL) {
 		bind_rdataset(rbtdb, rbtnode, found, now, rdataset);
-		if (foundsig != NULL)
+		if (!NEGATIVE(found)  foundsig != NULL)
 			bind_rdataset(rbtdb, rbtnode, foundsig, now,
   sigrdataset);
 	}

CVS commit: src/external/bsd/bind/dist

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Nov 16 22:07:21 UTC 2011

Modified Files:
src/external/bsd/bind/dist: CHANGES

Log Message:
+ 3218. [security]  Cache lookup could return RRSIG data associated with
+   nonexistent records, leading to an assertion
+   failure. [RT #26590]

so that someone looking can tell more easily we've applied it.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/bind/dist/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.1.1.10 src/external/bsd/bind/dist/CHANGES:1.2
--- src/external/bsd/bind/dist/CHANGES:1.1.1.10	Sun Sep 11 17:11:09 2011
+++ src/external/bsd/bind/dist/CHANGES	Wed Nov 16 22:07:21 2011
@@ -1,3 +1,7 @@
+3218.	[security]	Cache lookup could return RRSIG data associated with
+			nonexistent records, leading to an assertion
+			failure. [RT #26590]
+
 	--- 9.9.0a1 released ---
 
 3146.   [test]		Fixed gcc4.6.0 errors in ATF. [RT #25598]

CVS commit: src/external/bsd/bind/dist/lib/isc/include/isc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Sep 13 19:07:44 UTC 2011

Modified Files:
src/external/bsd/bind/dist/lib/isc/include/isc: util.h

Log Message:
Some versions of linux have probably marked fwrite(3) as
__attribute__((__warn_unused_result__)) and the __builtin_expect()
use here is an attempt to silence the warning. This does not work
if the second argument of __builtin_expect() is not a constant,
but we are not linux, so instead of going through the
__builtin_constant_p() dance to correct this, just disable it for
non linux OS's.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/lib/isc/include/isc/util.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/include/isc/util.h
diff -u src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.5 src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.6
--- src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.5	Sun Sep 11 14:55:42 2011
+++ src/external/bsd/bind/dist/lib/isc/include/isc/util.h	Tue Sep 13 15:07:44 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.h,v 1.5 2011/09/11 18:55:42 christos Exp $	*/
+/*	$NetBSD: util.h,v 1.6 2011/09/13 19:07:44 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2010, 2011  Internet Systems Consortium, Inc. (ISC)
@@ -240,7 +240,7 @@
 /*%
  * Prevent Linux spurious warnings
  */
-#if defined(__GNUC__)  (__GNUC__  3)
+#if defined(__linux__)  defined(__GNUC__)  (__GNUC__  3)
 #define isc_util_fwrite(a, b, c, d)	\
 	__builtin_expect(fwrite((a), (b), (c), (d)), (c))
 #else

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Sep 13 19:35:12 UTC 2011

Modified Files:
src/external/bsd/bind/dist/lib/dns: sdlz.c

Log Message:
avoid type punning


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/dns/sdlz.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/sdlz.c
diff -u src/external/bsd/bind/dist/lib/dns/sdlz.c:1.3 src/external/bsd/bind/dist/lib/dns/sdlz.c:1.4
--- src/external/bsd/bind/dist/lib/dns/sdlz.c:1.3	Sun Sep 11 14:55:37 2011
+++ src/external/bsd/bind/dist/lib/dns/sdlz.c	Tue Sep 13 15:35:12 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdlz.c,v 1.3 2011/09/11 18:55:37 christos Exp $	*/
+/*	$NetBSD: sdlz.c,v 1.4 2011/09/13 19:35:12 christos Exp $	*/
 
 /*
  * Portions Copyright (C) 2005-2011  Internet Systems Consortium, Inc. (ISC)
@@ -472,13 +472,16 @@
 createnode(dns_sdlz_db_t *sdlz, dns_sdlznode_t **nodep) {
 	dns_sdlznode_t *node;
 	isc_result_t result;
+	void *sdlzv, *tdlzv;
 
 	node = isc_mem_get(sdlz-common.mctx, sizeof(dns_sdlznode_t));
 	if (node == NULL)
 		return (ISC_R_NOMEMORY);
 
 	node-sdlz = NULL;
-	attach((dns_db_t *)sdlz, (dns_db_t **)node-sdlz);
+	sdlzv = sdlz;
+	tdlzv = node-sdlz;
+	attach(sdlzv, tdlzv);
 	ISC_LIST_INIT(node-lists);
 	ISC_LIST_INIT(node-buffers);
 	ISC_LINK_INIT(node, link);

CVS commit: src/external/bsd/bind/dist

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Tue Jul  5 21:59:19 UTC 2011

Modified Files:
src/external/bsd/bind/dist/bin/dnssec: dnssec-keyfromlabel.8
src/external/bsd/bind/dist/bin/named: bind9.xsl.h config.c query.c
update.c
src/external/bsd/bind/dist/bin/rndc: rndc.c
src/external/bsd/bind/dist/bin/tests/resolver: t_resolver.c
src/external/bsd/bind/dist/lib/dns: dispatch.c masterdump.c message.c
ncache.c nsec3.c rbtdb.c rdataset.c rdataslab.c resolver.c
validator.c xfrin.c
src/external/bsd/bind/dist/lib/dns/include/dns: masterdump.h rdataset.h
resolver.h
src/external/bsd/bind/dist/lib/isc: task.c timer.c
src/external/bsd/bind/dist/lib/isc/include/isc: task.h
src/external/bsd/bind/dist/lib/isc/unix: socket.c
src/external/bsd/bind/dist/lib/isc/win32/include/isc: ipv6.h

Log Message:
merge import of bind-9.8.0-P4


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/bin/named/bind9.xsl.h \
src/external/bsd/bind/dist/bin/named/config.c \
src/external/bsd/bind/dist/bin/named/update.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/bin/named/query.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/bin/rndc/rndc.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/bind/dist/bin/tests/resolver/t_resolver.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/lib/dns/dispatch.c \
src/external/bsd/bind/dist/lib/dns/masterdump.c \
src/external/bsd/bind/dist/lib/dns/nsec3.c \
src/external/bsd/bind/dist/lib/dns/rdataset.c \
src/external/bsd/bind/dist/lib/dns/rdataslab.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/dns/ncache.c \
src/external/bsd/bind/dist/lib/dns/xfrin.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/rbtdb.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/dns/validator.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/bind/dist/lib/dns/include/dns/masterdump.h \
src/external/bsd/bind/dist/lib/dns/include/dns/rdataset.h \
src/external/bsd/bind/dist/lib/dns/include/dns/resolver.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/lib/isc/task.c \
src/external/bsd/bind/dist/lib/isc/timer.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/bind/dist/lib/isc/include/isc/task.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/unix/socket.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/bind/dist/lib/isc/win32/include/isc/ipv6.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8
diff -u src/external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8:1.2 src/external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8:1.3
--- src/external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8:1.2	Wed Feb 16 03:46:45 2011
+++ src/external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8	Tue Jul  5 21:59:18 2011
@@ -1,6 +1,6 @@
-.\	$NetBSD: dnssec-keyfromlabel.8,v 1.2 2011/02/16 03:46:45 christos Exp $
+.\	$NetBSD: dnssec-keyfromlabel.8,v 1.3 2011/07/05 21:59:18 spz Exp $
 .\
-.\ Copyright (C) 2008-2010 Internet Systems Consortium, Inc. (ISC)
+.\ Copyright (C) 2008-2011 Internet Systems Consortium, Inc. (ISC)
 .\ 
 .\ Permission to use, copy, modify, and/or distribute this software for any
 .\ purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 .\ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\ PERFORMANCE OF THIS SOFTWARE.
 .\
-.\ Id: dnssec-keyfromlabel.8,v 1.18.14.1 2011-02-03 12:29:12 tbox Exp
+.\ Id: dnssec-keyfromlabel.8,v 1.18.14.1.2.1 2011-06-09 03:41:05 tbox Exp
 .\
 .hy 0
 .ad l
@@ -217,5 +217,5 @@
 .PP
 Internet Systems Consortium
 .SH COPYRIGHT
-Copyright \(co 2008\-2010 Internet Systems Consortium, Inc. (ISC)
+Copyright \(co 2008\-2011 Internet Systems Consortium, Inc. (ISC)
 .br

Index: src/external/bsd/bind/dist/bin/named/bind9.xsl.h
diff -u src/external/bsd/bind/dist/bin/named/bind9.xsl.h:1.2 src/external/bsd/bind/dist/bin/named/bind9.xsl.h:1.3
--- src/external/bsd/bind/dist/bin/named/bind9.xsl.h:1.2	Wed Feb 16 03:46:46 2011
+++ src/external/bsd/bind/dist/bin/named/bind9.xsl.h	Tue Jul  5 21:59:18 2011
@@ -1,8 +1,8 @@
-/*	$NetBSD: bind9.xsl.h,v 1.2 2011/02/16 03:46:46 christos Exp $	*/
+/*	$NetBSD: bind9.xsl.h,v 1.3 2011/07/05 21:59:18 spz Exp $	*/
 
 /*
- * Generated by convertxsl.pl 1.14 2008/07/17 23:43:26 jinmei Exp  
- * From bind9.xsl 1.21 2009/01/27 23:47:54 tbox Exp 
+ * Generated by convertxsl.pl 1.14 2008-07-17 23:43:26 jinmei Exp  
+ * From bind9.xsl 1.21 2009-01-27 23:47:54 tbox Exp 
  */
 static char 

CVS commit: src/external/bsd/bind/dist/lib/isc

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Fri Jul  1 02:24:14 UTC 2011

Modified Files:
src/external/bsd/bind/dist/lib/isc: hmacsha.c sha2.c

Log Message:
Fix memset usage. XXX audit the rest where hard coded sizes are used


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/lib/isc/hmacsha.c \
src/external/bsd/bind/dist/lib/isc/sha2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/hmacsha.c
diff -u src/external/bsd/bind/dist/lib/isc/hmacsha.c:1.2 src/external/bsd/bind/dist/lib/isc/hmacsha.c:1.3
--- src/external/bsd/bind/dist/lib/isc/hmacsha.c:1.2	Wed Feb 16 03:47:11 2011
+++ src/external/bsd/bind/dist/lib/isc/hmacsha.c	Fri Jul  1 02:24:14 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: hmacsha.c,v 1.2 2011/02/16 03:47:11 christos Exp $	*/
+/*	$NetBSD: hmacsha.c,v 1.3 2011/07/01 02:24:14 joerg Exp $	*/
 
 /*
  * Copyright (C) 2005-2007, 2009  Internet Systems Consortium, Inc. (ISC)
@@ -227,7 +227,7 @@
 isc_hmacsha1_invalidate(isc_hmacsha1_t *ctx) {
 	isc_sha1_invalidate(ctx-sha1ctx);
 	memset(ctx-key, 0, sizeof(ctx-key));
-	memset(ctx, 0, sizeof(ctx));
+	memset(ctx, 0, sizeof(*ctx));
 }
 
 /*
@@ -295,7 +295,7 @@
 void
 isc_hmacsha224_invalidate(isc_hmacsha224_t *ctx) {
 	memset(ctx-key, 0, sizeof(ctx-key));
-	memset(ctx, 0, sizeof(ctx));
+	memset(ctx, 0, sizeof(*ctx));
 }
 
 /*
@@ -362,7 +362,7 @@
 void
 isc_hmacsha256_invalidate(isc_hmacsha256_t *ctx) {
 	memset(ctx-key, 0, sizeof(ctx-key));
-	memset(ctx, 0, sizeof(ctx));
+	memset(ctx, 0, sizeof(*ctx));
 }
 
 /*
@@ -429,7 +429,7 @@
 void
 isc_hmacsha384_invalidate(isc_hmacsha384_t *ctx) {
 	memset(ctx-key, 0, sizeof(ctx-key));
-	memset(ctx, 0, sizeof(ctx));
+	memset(ctx, 0, sizeof(*ctx));
 }
 
 /*
@@ -496,7 +496,7 @@
 void
 isc_hmacsha512_invalidate(isc_hmacsha512_t *ctx) {
 	memset(ctx-key, 0, sizeof(ctx-key));
-	memset(ctx, 0, sizeof(ctx));
+	memset(ctx, 0, sizeof(*ctx));
 }
 
 /*
Index: src/external/bsd/bind/dist/lib/isc/sha2.c
diff -u src/external/bsd/bind/dist/lib/isc/sha2.c:1.2 src/external/bsd/bind/dist/lib/isc/sha2.c:1.3
--- src/external/bsd/bind/dist/lib/isc/sha2.c:1.2	Wed Feb 16 03:47:11 2011
+++ src/external/bsd/bind/dist/lib/isc/sha2.c	Fri Jul  1 02:24:14 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: sha2.c,v 1.2 2011/02/16 03:47:11 christos Exp $	*/
+/*	$NetBSD: sha2.c,v 1.3 2011/07/01 02:24:14 joerg Exp $	*/
 
 /*
  * Copyright (C) 2005-2007, 2009  Internet Systems Consortium, Inc. (ISC)
@@ -897,7 +897,7 @@
 	}
 
 	/* Clean up state data: */
-	memset(context, 0, sizeof(context));
+	memset(context, 0, sizeof(*context));
 	usedspace = 0;
 }
 
@@ -1210,7 +1210,7 @@
 	}
 
 	/* Zero out state data */
-	memset(context, 0, sizeof(context));
+	memset(context, 0, sizeof(*context));
 }
 
 
@@ -1263,7 +1263,7 @@
 	}
 
 	/* Zero out state data */
-	memset(context, 0, sizeof(context));
+	memset(context, 0, sizeof(*context));
 }
 #endif /* !ISC_PLATFORM_OPENSSLHASH */
 
@@ -1294,7 +1294,7 @@
 #ifdef ISC_PLATFORM_OPENSSLHASH
 		EVP_MD_CTX_cleanup(context);
 #else
-		memset(context, 0, sizeof(context));
+		memset(context, 0, sizeof(*context));
 #endif
 	}
 	memset(digest, 0, ISC_SHA224_DIGESTLENGTH);
@@ -1333,7 +1333,7 @@
 #ifdef ISC_PLATFORM_OPENSSLHASH
 		EVP_MD_CTX_cleanup(context);
 #else
-		memset(context, 0, sizeof(context));
+		memset(context, 0, sizeof(*context));
 #endif
 	}
 	memset(digest, 0, ISC_SHA256_DIGESTLENGTH);
@@ -1372,7 +1372,7 @@
 #ifdef ISC_PLATFORM_OPENSSLHASH
 		EVP_MD_CTX_cleanup(context);
 #else
-		memset(context, 0, sizeof(context));
+		memset(context, 0, sizeof(*context));
 #endif
 	}
 	memset(digest, 0, ISC_SHA512_DIGESTLENGTH);
@@ -1411,7 +1411,7 @@
 #ifdef ISC_PLATFORM_OPENSSLHASH
 		EVP_MD_CTX_cleanup(context);
 #else
-		memset(context, 0, sizeof(context));
+		memset(context, 0, sizeof(*context));
 #endif
 	}
 	memset(digest, 0, ISC_SHA384_DIGESTLENGTH);

CVS commit: src/external/bsd/bind/dist/lib/dns

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Mon Jun  6 05:40:34 UTC 2011

Modified Files:
src/external/bsd/bind/dist/lib/dns: openssl_link.c

Log Message:
fix up OPENSSL_VERSION_NUMBER check for entropy_add so it deals with the
current situation. Compile-checked by dholland, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/dns/openssl_link.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/openssl_link.c
diff -u src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.4 src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.5
--- src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.4	Wed Feb 16 03:47:04 2011
+++ src/external/bsd/bind/dist/lib/dns/openssl_link.c	Mon Jun  6 05:40:34 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: openssl_link.c,v 1.4 2011/02/16 03:47:04 christos Exp $	*/
+/*	$NetBSD: openssl_link.c,v 1.5 2011/06/06 05:40:34 spz Exp $	*/
 
 /*
  * Portions Copyright (C) 2004-2010  Internet Systems Consortium, Inc. (ISC)
@@ -98,7 +98,7 @@
 	return (result == ISC_R_SUCCESS ? 1 : -1);
 }
 
-#if OPENSSL_VERSION_NUMBER  0x1000L
+#if OPENSSL_VERSION_NUMBER  0x1010L
 static void
 #else
 static int
@@ -110,7 +110,7 @@
 	UNUSED(buf);
 	UNUSED(num);
 	UNUSED(entropy);
-#if OPENSSL_VERSION_NUMBER = 0x1000L
+#if OPENSSL_VERSION_NUMBER = 0x1010L
 	return 0;
 #endif
 }

CVS commit: src/external/bsd/bind/dist/bin/named

[Takahiro Kambe]

Module Name:src
Committed By:   taca
Date:   Fri May  6 15:28:20 UTC 2011

Modified Files:
src/external/bsd/bind/dist/bin/named: query.c

Log Message:
Apply fix by BIND 9.8.0-P1: https://www.isc.org/CVE-2011-1907.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/bin/named/query.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.2 src/external/bsd/bind/dist/bin/named/query.c:1.3
--- src/external/bsd/bind/dist/bin/named/query.c:1.2	Wed Feb 16 03:46:46 2011
+++ src/external/bsd/bind/dist/bin/named/query.c	Fri May  6 15:28:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: query.c,v 1.2 2011/02/16 03:46:46 christos Exp $	*/
+/*	$NetBSD: query.c,v 1.3 2011/05/06 15:28:19 taca Exp $	*/
 
 /*
  * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. (ISC)
@@ -4089,9 +4089,15 @@
 			if (dns_rdataset_isassociated(*rdatasetp))
 dns_rdataset_disassociate(*rdatasetp);
 			dns_db_detachnode(*dbp, nodep);
-			result = dns_db_find(*dbp, qnamef, version, qtype, 0,
-	 client-now, nodep, found,
-	 *rdatasetp, NULL);
+
+			if (qtype == dns_rdatatype_rrsig ||
+			qtype == dns_rdatatype_sig)
+result = DNS_R_NXRRSET;
+			else 
+result = dns_db_find(*dbp, qnamef, version,
+		 qtype, 0, client-now,
+		 nodep, found, *rdatasetp,
+		 NULL);
 		}
 	}
 	switch (result) {

CVS commit: src/external/bsd/bind/dist/lib/isc/noatomic/include/isc

[Wolfgang Solfrank]

Module Name:src
Committed By:   ws
Date:   Sun Feb 20 19:05:32 UTC 2011

Modified Files:
src/external/bsd/bind/dist/lib/isc/noatomic/include/isc: atomic.h

Log Message:
Fix return values.
OK christos.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h
diff -u src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h:1.3 src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h:1.4
--- src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h:1.3	Wed Feb 16 03:47:13 2011
+++ src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h	Sun Feb 20 19:05:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic.h,v 1.3 2011/02/16 03:47:13 christos Exp $	*/
+/*	$NetBSD: atomic.h,v 1.4 2011/02/20 19:05:32 ws Exp $	*/
 
 /*
  * Copyright (C) 2005, 2007  Internet Systems Consortium, Inc. (ISC)
@@ -31,7 +31,7 @@
  */
 static __inline isc_int32_t
 isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) {
-	isc_int32_t prev = val;
+	isc_int32_t prev = *p;
 
 	*p += val;
 
@@ -53,11 +53,12 @@
  */
 static __inline isc_int32_t
 isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) {
+	isc_int32_t prev = *p;
 
 	if (*p == cmpval)
 		*p = val;
 
-	return cmpval;
+	return prev;
 }
 
 #endif /* ISC_ATOMIC_H */

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec 25 18:23:39 UTC 2010

Modified Files:
src/external/bsd/bind/dist/bin/named: client.c
src/external/bsd/bind/dist/lib/dns: byaddr.c lookup.c request.c sdb.c
validator.c

Log Message:
fix type-punned warnings on gcc-3.3.3


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/bind/dist/bin/named/client.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/bind/dist/lib/dns/byaddr.c \
src/external/bsd/bind/dist/lib/dns/request.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/bind/dist/lib/dns/lookup.c
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/bind/dist/lib/dns/sdb.c
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/bind/dist/lib/dns/validator.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/client.c
diff -u src/external/bsd/bind/dist/bin/named/client.c:1.1.1.4 src/external/bsd/bind/dist/bin/named/client.c:1.2
--- src/external/bsd/bind/dist/bin/named/client.c:1.1.1.4	Thu Dec  2 09:22:26 2010
+++ src/external/bsd/bind/dist/bin/named/client.c	Sat Dec 25 13:23:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: client.c,v 1.1.1.4 2010/12/02 14:22:26 christos Exp $	*/
+/*	$NetBSD: client.c,v 1.2 2010/12/25 18:23:39 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. (ISC)
@@ -490,8 +490,8 @@
 
 		ns_query_free(client);
 		isc_mem_put(client-mctx, client-recvbuf, RECV_BUFFER_SIZE);
-		isc_event_free((isc_event_t **)client-sendevent);
-		isc_event_free((isc_event_t **)client-recvevent);
+		isc_event_free((isc_event_t **)(void *)client-sendevent);
+		isc_event_free((isc_event_t **)(void *)client-recvevent);
 		isc_timer_detach(client-timer);
 
 		if (client-tcpbuf != NULL)
@@ -2139,13 +2139,13 @@
 	ns_query_free(client);
 
  cleanup_recvevent:
-	isc_event_free((isc_event_t **)client-recvevent);
+	isc_event_free((isc_event_t **)(void *)client-recvevent);
 
  cleanup_recvbuf:
 	isc_mem_put(client-mctx, client-recvbuf, RECV_BUFFER_SIZE);
 
  cleanup_sendevent:
-	isc_event_free((isc_event_t **)client-sendevent);
+	isc_event_free((isc_event_t **)(void *)client-sendevent);
 
 	client-magic = 0;
 

Index: src/external/bsd/bind/dist/lib/dns/byaddr.c
diff -u src/external/bsd/bind/dist/lib/dns/byaddr.c:1.1.1.2 src/external/bsd/bind/dist/lib/dns/byaddr.c:1.2
--- src/external/bsd/bind/dist/lib/dns/byaddr.c:1.1.1.2	Sat Oct 24 20:02:27 2009
+++ src/external/bsd/bind/dist/lib/dns/byaddr.c	Sat Dec 25 13:23:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: byaddr.c,v 1.1.1.2 2009/10/25 00:02:27 christos Exp $	*/
+/*	$NetBSD: byaddr.c,v 1.2 2010/12/25 18:23:39 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. (ISC)
@@ -190,7 +190,7 @@
 	} else
 		byaddr-event-result = levent-result;
 	isc_event_free(event);
-	isc_task_sendanddetach(byaddr-task, (isc_event_t **)byaddr-event);
+	isc_task_sendanddetach(byaddr-task, (isc_event_t **)(void *)byaddr-event);
 }
 
 static void
Index: src/external/bsd/bind/dist/lib/dns/request.c
diff -u src/external/bsd/bind/dist/lib/dns/request.c:1.1.1.2 src/external/bsd/bind/dist/lib/dns/request.c:1.2
--- src/external/bsd/bind/dist/lib/dns/request.c:1.1.1.2	Sat Oct 24 20:02:33 2009
+++ src/external/bsd/bind/dist/lib/dns/request.c	Sat Dec 25 13:23:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: request.c,v 1.1.1.2 2009/10/25 00:02:33 christos Exp $	*/
+/*	$NetBSD: request.c,v 1.2 2010/12/25 18:23:39 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. (ISC)
@@ -1415,7 +1415,7 @@
 	task = request-event-ev_sender;
 	request-event-ev_sender = request;
 	request-event-result = result;
-	isc_task_sendanddetach(task, (isc_event_t **)request-event);
+	isc_task_sendanddetach(task, (isc_event_t **)(void *)request-event);
 }
 
 static void
@@ -1432,7 +1432,7 @@
 	if (request-answer != NULL)
 		isc_buffer_free(request-answer);
 	if (request-event != NULL)
-		isc_event_free((isc_event_t **)request-event);
+		isc_event_free((isc_event_t **)(void *)request-event);
 	if (request-dispentry != NULL)
 		dns_dispatch_removeresponse(request-dispentry, NULL);
 	if (request-dispatch != NULL)

Index: src/external/bsd/bind/dist/lib/dns/lookup.c
diff -u src/external/bsd/bind/dist/lib/dns/lookup.c:1.1.1.1 src/external/bsd/bind/dist/lib/dns/lookup.c:1.2
--- src/external/bsd/bind/dist/lib/dns/lookup.c:1.1.1.1	Sun Mar 22 11:01:07 2009
+++ src/external/bsd/bind/dist/lib/dns/lookup.c	Sat Dec 25 13:23:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: lookup.c,v 1.1.1.1 2009/03/22 15:01:07 christos Exp $	*/
+/*	$NetBSD: lookup.c,v 1.2 2010/12/25 18:23:39 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. (ISC)
@@ -347,7 +347,7 @@
 		lookup-event-result = result;
 		lookup-event-ev_sender = lookup;
 		isc_task_sendanddetach(lookup-task,
-   (isc_event_t **)lookup-event);
+   

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 14 23:16:39 UTC 2010

Modified Files:
src/external/bsd/bind/dist/lib/dns: openssl_link.c

Log Message:
handle openssl versions less  1.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/lib/dns/openssl_link.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/openssl_link.c
diff -u src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.2 src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.3
--- src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.2	Sun Dec 27 12:27:29 2009
+++ src/external/bsd/bind/dist/lib/dns/openssl_link.c	Tue Dec 14 18:16:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: openssl_link.c,v 1.2 2009/12/27 17:27:29 christos Exp $	*/
+/*	$NetBSD: openssl_link.c,v 1.3 2010/12/14 23:16:39 christos Exp $	*/
 
 /*
  * Portions Copyright (C) 2004-2009  Internet Systems Consortium, Inc. (ISC)
@@ -98,7 +98,11 @@
 	return (result == ISC_R_SUCCESS ? num : -1);
 }
 
+#if OPENSSL_VERSION_NUMBER  0x1000L
+static void
+#else
 static int
+#endif
 entropy_add(const void *buf, int num, double entropy) {
 	/*
 	 * Do nothing.  The only call to this provides no useful data anyway.
@@ -106,7 +110,9 @@
 	UNUSED(buf);
 	UNUSED(num);
 	UNUSED(entropy);
+#if OPENSSL_VERSION_NUMBER = 0x1000L
 	return 0;
+#endif
 }
 
 static void

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 14 23:43:32 UTC 2010

Modified Files:
src/external/bsd/bind/dist/lib/dns: name.c

Log Message:
Wrong rfc mentioned


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/bind/dist/lib/dns/name.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/name.c
diff -u src/external/bsd/bind/dist/lib/dns/name.c:1.1.1.3 src/external/bsd/bind/dist/lib/dns/name.c:1.2
--- src/external/bsd/bind/dist/lib/dns/name.c:1.1.1.3	Thu Aug  5 16:12:13 2010
+++ src/external/bsd/bind/dist/lib/dns/name.c	Tue Dec 14 18:43:32 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: name.c,v 1.1.1.3 2010/08/05 20:12:13 christos Exp $	*/
+/*	$NetBSD: name.c,v 1.2 2010/12/14 23:43:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. (ISC)
@@ -320,7 +320,7 @@
 		return (ISC_FALSE);
 
 	/*
-	 * RFC292/RFC1123 hostname.
+	 * RFC952/RFC1123 hostname.
 	 */
 	while (ndata  (name-ndata + name-length)) {
 		n = *ndata++;

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec 27 17:27:29 UTC 2009

Modified Files:
src/external/bsd/bind/dist/lib/dns: openssl_link.c

Log Message:
adjust entropy_add signature. (From Kurt Schreiner)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/bind/dist/lib/dns/openssl_link.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/openssl_link.c
diff -u src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.1.1.2 src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.2
--- src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.1.1.2	Sat Oct 24 20:02:31 2009
+++ src/external/bsd/bind/dist/lib/dns/openssl_link.c	Sun Dec 27 12:27:29 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: openssl_link.c,v 1.1.1.2 2009/10/25 00:02:31 christos Exp $	*/
+/*	$NetBSD: openssl_link.c,v 1.2 2009/12/27 17:27:29 christos Exp $	*/
 
 /*
  * Portions Copyright (C) 2004-2009  Internet Systems Consortium, Inc. (ISC)
@@ -98,7 +98,7 @@
 	return (result == ISC_R_SUCCESS ? num : -1);
 }
 
-static void
+static int
 entropy_add(const void *buf, int num, double entropy) {
 	/*
 	 * Do nothing.  The only call to this provides no useful data anyway.
@@ -106,6 +106,7 @@
 	UNUSED(buf);
 	UNUSED(num);
 	UNUSED(entropy);
+	return 0;
 }
 
 static void

CVS commit: src/external/bsd/bind/dist/bin/named

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Oct 22 14:29:06 UTC 2009

Modified Files:
src/external/bsd/bind/dist/bin/named: named.conf.docbook
named.conf.html

Log Message:
fix typo on server-id; from Anon Ymous


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/bind/dist/bin/named/named.conf.docbook \
src/external/bsd/bind/dist/bin/named/named.conf.html

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/named.conf.docbook
diff -u src/external/bsd/bind/dist/bin/named/named.conf.docbook:1.1.1.1 src/external/bsd/bind/dist/bin/named/named.conf.docbook:1.2
--- src/external/bsd/bind/dist/bin/named/named.conf.docbook:1.1.1.1	Sun Mar 22 10:55:55 2009
+++ src/external/bsd/bind/dist/bin/named/named.conf.docbook	Thu Oct 22 10:29:06 2009
@@ -206,7 +206,7 @@
 	random-device replaceablequoted_string/replaceable;
 	recursive-clients replaceableinteger/replaceable;
 	serial-query-rate replaceableinteger/replaceable;
-	server-id ( replaceablequoted_string/replaceable | none |;
+	server-id ( replaceablequoted_string/replaceable | none );
 	stacksize replaceablesize/replaceable;
 	statistics-file replaceablequoted_string/replaceable;
 	statistics-interval replaceableinteger/replaceable; // not yet implemented
Index: src/external/bsd/bind/dist/bin/named/named.conf.html
diff -u src/external/bsd/bind/dist/bin/named/named.conf.html:1.1.1.1 src/external/bsd/bind/dist/bin/named/named.conf.html:1.2
--- src/external/bsd/bind/dist/bin/named/named.conf.html:1.1.1.1	Sun Mar 22 10:56:03 2009
+++ src/external/bsd/bind/dist/bin/named/named.conf.html	Thu Oct 22 10:29:06 2009
@@ -176,7 +176,7 @@
 	random-device em class=replaceablecodequoted_string/code/em;br
 	recursive-clients em class=replaceablecodeinteger/code/em;br
 	serial-query-rate em class=replaceablecodeinteger/code/em;br
-	server-id ( em class=replaceablecodequoted_string/code/em | none |;br
+	server-id ( em class=replaceablecodequoted_string/code/em | none );br
 	stacksize em class=replaceablecodesize/code/em;br
 	statistics-file em class=replaceablecodequoted_string/code/em;br
 	statistics-interval em class=replaceablecodeinteger/code/em; // not yet implementedbr

CVS commit: src/external/bsd/bind/dist/bin/named

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Oct 22 14:30:05 UTC 2009

Modified Files:
src/external/bsd/bind/dist/bin/named: named.conf.5

Log Message:
one more paren from Anon Ymous


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/bind/dist/bin/named/named.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/named.conf.5
diff -u src/external/bsd/bind/dist/bin/named/named.conf.5:1.1.1.1 src/external/bsd/bind/dist/bin/named/named.conf.5:1.2
--- src/external/bsd/bind/dist/bin/named/named.conf.5:1.1.1.1	Sun Mar 22 10:56:02 2009
+++ src/external/bsd/bind/dist/bin/named/named.conf.5	Thu Oct 22 10:30:05 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: named.conf.5,v 1.1.1.1 2009/03/22 14:56:02 christos Exp $
+.\	$NetBSD: named.conf.5,v 1.2 2009/10/22 14:30:05 christos Exp $
 .\
 .\ Copyright (C) 2004-2008 Internet Systems Consortium, Inc. (ISC)
 .\ 
@@ -180,7 +180,7 @@
 	random\-device \fIquoted_string\fR;
 	recursive\-clients \fIinteger\fR;
 	serial\-query\-rate \fIinteger\fR;
-	server\-id ( \fIquoted_string\fR | none |;
+	server\-id ( \fIquoted_string\fR | none );
 	stacksize \fIsize\fR;
 	statistics\-file \fIquoted_string\fR;
 	statistics\-interval \fIinteger\fR; // not yet implemented

CVS commit: src/external/bsd/bind/dist/lib/dns

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jul 28 21:51:30 UTC 2009

Modified Files:
src/external/bsd/bind/dist/lib/dns: rbtdb.c

Log Message:
elide type punned warning


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/bind/dist/lib/dns/rbtdb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/rbtdb.c
diff -u src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.1.1.2 src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.2
--- src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.1.1.2	Tue Jul 28 17:11:10 2009
+++ src/external/bsd/bind/dist/lib/dns/rbtdb.c	Tue Jul 28 17:51:30 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbtdb.c,v 1.1.1.2 2009/07/28 21:11:10 christos Exp $	*/
+/*	$NetBSD: rbtdb.c,v 1.2 2009/07/28 21:51:30 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. (ISC)
@@ -1878,7 +1878,7 @@
 	NODE_UNLOCK(rbtdb-node_locks[locknum].lock, isc_rwlocktype_write);
 	RWUNLOCK(rbtdb-tree_lock, isc_rwlocktype_write);
 
-	detach((dns_db_t **)rbtdb);
+	detach((dns_db_t **)(void *)rbtdb);
 }
 
 static inline void

CVS commit: src/external/bsd/bind/dist/bin/named

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 22 18:25:24 UTC 2009

Modified Files:
src/external/bsd/bind/dist/bin/named: server.c

Log Message:
Don't log if . is not writable. In the chrooted environment this is
/var/chroot/named, and there is no reason whatsoever for this to be
writable!


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/bind/dist/bin/named/server.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/server.c
diff -u src/external/bsd/bind/dist/bin/named/server.c:1.1.1.1 src/external/bsd/bind/dist/bin/named/server.c:1.2
--- src/external/bsd/bind/dist/bin/named/server.c:1.1.1.1	Sun Mar 22 10:56:08 2009
+++ src/external/bsd/bind/dist/bin/named/server.c	Wed Apr 22 14:25:24 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: server.c,v 1.1.1.1 2009/03/22 14:56:08 christos Exp $	*/
+/*	$NetBSD: server.c,v 1.2 2009/04/22 18:25:24 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. (ISC)
@@ -3451,6 +3451,7 @@
 	if (first_time)
 		ns_os_changeuser();
 
+#ifdef notdef
 	/*
 	 * Check that the working directory is writable.
 	 */
@@ -3459,6 +3460,7 @@
 			  NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
 			  the working directory is not writable);
 	}
+#endif
 
 	/*
 	 * Configure the logging system.

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Apr 12 15:05:59 UTC 2009

Modified Files:
src/external/bsd/bind/dist: binclude4netbsd bind2netbsd

Log Message:
reflect new reality.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/dist/binclude4netbsd \
src/external/bsd/bind/dist/bind2netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/binclude4netbsd
diff -u src/external/bsd/bind/dist/binclude4netbsd:1.1 src/external/bsd/bind/dist/binclude4netbsd:1.2
--- src/external/bsd/bind/dist/binclude4netbsd:1.1	Sat Apr 11 23:46:06 2009
+++ src/external/bsd/bind/dist/binclude4netbsd	Sun Apr 12 11:05:59 2009
@@ -4,10 +4,11 @@
 # after you've imported and built the latest bind code. After you run this,
 # cvs import the resulting directory
 #
-# $ cd /usr/src/external/bind/dist
+# $ cd /usr/src/external/bsd/bind/dist
 # $ configure
 # $ make
 # $ ./binclude4netbsd . /tmp/include
+# Fix manually the config.h file to disable things controlled by the Makefiles
 # $ cd /tmp/include
 # $ cvs -d cvs.netbsd.org:/cvsroot import src/usr.sbin/bind/include \
 #	ISC bind-X-Y-Z
Index: src/external/bsd/bind/dist/bind2netbsd
diff -u src/external/bsd/bind/dist/bind2netbsd:1.1 src/external/bsd/bind/dist/bind2netbsd:1.2
--- src/external/bsd/bind/dist/bind2netbsd:1.1	Sat Apr 11 23:46:06 2009
+++ src/external/bsd/bind/dist/bind2netbsd	Sun Apr 12 11:05:59 2009
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#	$NetBSD: bind2netbsd,v 1.1 2009/04/12 03:46:06 christos Exp $
+#	$NetBSD: bind2netbsd,v 1.2 2009/04/12 15:05:59 christos Exp $
 #
 # Copyright (c) 2000 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -42,11 +42,8 @@
 #	$ run make
 #	- use the binclude4netbsd to create and import the new headers in
 #	  /usr/src/usr.sbin/bind/include
-#	- use the include4netbsd to create and import the new headers in
-#	  /usr/src/include
 #	- check makefiles to see if any extra sources have been added.
 #	- update distrib/sets if necessary.
-#	- to update the libc resolver code use libc4netbsd
 
 if [ $# -ne 2 ]; then echo bind2netbsd src dest; exit 1; fi
 

CVS commit: src/external/bsd/bind/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Apr 12 15:23:22 UTC 2009

Modified Files:
src/external/bsd/bind/dist: bind2netbsd

Log Message:
more description fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/bind2netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bind2netbsd
diff -u src/external/bsd/bind/dist/bind2netbsd:1.2 src/external/bsd/bind/dist/bind2netbsd:1.3
--- src/external/bsd/bind/dist/bind2netbsd:1.2	Sun Apr 12 11:05:59 2009
+++ src/external/bsd/bind/dist/bind2netbsd	Sun Apr 12 11:23:22 2009
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#	$NetBSD: bind2netbsd,v 1.2 2009/04/12 15:05:59 christos Exp $
+#	$NetBSD: bind2netbsd,v 1.3 2009/04/12 15:23:22 christos Exp $
 #
 # Copyright (c) 2000 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -26,18 +26,18 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# bind2netbsd:  convert an bind bind tree into a
-# netbsd bind source tree, under src/dist,
+# bind2netbsd:  convert a bind tree into a
+# netbsd bind source tree, under src/external/bsd/bind/dist,
 # based on bind2netbsd by Bernd Ernesti and changes by Simon Burge
 #
 # Rough instructions for importing new bind release:
 #
 #	$ cd /some/where/temporary
 #	$ tar xpfz /new/bind/release/tar/file
-#	$ sh /usr/src/external/bsd/dist/bind/bind2netbsd bind-9.x.y `pwd`
+#	$ sh /usr/src/external/bsd/bind/dist/bind2netbsd bind-9.x.y `pwd`
 #	$ cd src/external/bsd/bind/dist
 #	$ cvs import -m Import bind 9.x.y src/external/bsd/bind/dist ISC bind-9-x-y
-#	$ cd ../../../../../bind-9.0.3beta3
+#	$ cd ../../../../../bind-9.x.y
 #	$ run ./configure
 #	$ run make
 #	- use the binclude4netbsd to create and import the new headers in