CVS commit: src/external/bsd/bind/dist/bin/named
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/bin/named
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/bin/named
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
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
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/bin/named
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
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
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/named
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/bin/named
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
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/bin/named
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.