Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflicts.

This commit is contained in:
christos 2017-04-13 19:11:19 +00:00
parent 757ea78699
commit e5b8b7b6d5
45 changed files with 462 additions and 595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
external/bsd/bind/dist/CHANGES vendored
View File

@ -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
queries could trigger assertion failures.
(CVE-2017-3137) [RT #44734]
4575. [security] DNS64 with "break-dnssec yes;" can result in an
assertion failure. (CVE-2017-3136) [RT #44653]
4564. [maint] Update the built in managed keys to include the
upcoming root KSK. [RT #44579]
--- 9.10.4-P6 released ---
4558. [bug] Synthesised CNAME before matching DNAME was still
being cached when it should have been. [RT #44318]
being cached when it should not have been. [RT #44318]
4557. [security] Combining dns64 and rpz can result in dereferencing
a NULL pointer (read). (CVE-2017-3135) [RT#44434]

5
external/bsd/bind/dist/README vendored
View File

@ -51,6 +51,11 @@ BIND 9
For up-to-date release notes and errata, see
http://www.isc.org/software/bind9/releasenotes
BIND 9.10.4-P7
This version contains fixes for CVE-2017-3136 and CVE-2017-3137,
and updates the built in trusted keys for the root zone.
BIND 9.10.4-P6
This version contains a fix for CVE-2017-3135, and a bug fix

5
external/bsd/bind/dist/bin/named/query.c vendored
View File

@ -1,7 +1,7 @@
/* $NetBSD: query.c,v 1.23 2017/02/09 00:23:26 christos Exp $ */
/* $NetBSD: query.c,v 1.24 2017/04/13 19:11:19 christos Exp $ */
/*
* Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2017 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@ -8221,6 +8221,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
result = query_dns64(client, &fname, rdataset,
sigrdataset, dbuf,
DNS_SECTION_ANSWER);
noqname = NULL;
dns_rdataset_disassociate(rdataset);
dns_message_puttemprdataset(client->message, &rdataset);
if (result == ISC_R_NOMORE) {

2
external/bsd/bind/dist/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004-2017 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1996-2003 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any

2
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html vendored
View File

@ -2326,6 +2326,6 @@ $ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa.
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html vendored
View File

@ -12845,6 +12845,6 @@ HOST-127.EXAMPLE. MX 0 .
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html vendored
View File

@ -248,6 +248,6 @@ zone "example.com" {
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html vendored
View File

@ -134,6 +134,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

55
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html vendored
View File

@ -44,10 +44,11 @@
<div class="toc">
<p><b>Table of Contents</b></p>
<dl class="toc">
<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P6</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P8</a></span></dt>
<dd><dl>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_intro">Introduction</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_download">Download</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#root_key">New DNSSEC Root Key</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_security">Security Fixes</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_features">New Features</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_changes">Feature Changes</a></span></dt>
@ -60,13 +61,18 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
<a name="id-1.10.2"></a>Release Notes for BIND Version 9.10.4-P6</h2></div></div></div>
<a name="id-1.10.2"></a>Release Notes for BIND Version 9.10.4-P8</h2></div></div></div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
<a name="relnotes_intro"></a>Introduction</h3></div></div></div>
<p>
This document summarizes changes since BIND 9.10.4:
</p>
<p>
BIND 9.10.4-P7 addresses the security issue described in
CVE-2017-3136, and updates the built in trusted keys for
the root zone.
</p>
<p>
BIND 9.10.4-P6 addresses the security issue described in
CVE-2017-3135, and fixes a regression introduced in a prior
@ -109,8 +115,51 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
<a name="root_key"></a>New DNSSEC Root Key</h3></div></div></div>
<p>
ICANN is in the process of introducing a new Key Signing Key (KSK) for
the global root zone. BIND has multiple methods for managing DNSSEC
trust anchors, with somewhat different behaviors. If the root
key is configured using the <span class="command"><strong>managed-keys</strong></span>
statement, or if the pre-configured root key is enabled by using
<span class="command"><strong>dnssec-validation auto</strong></span>, then BIND can keep
keys up to date automatically. Servers configured in this way
will roll seamlessly to the new key when it is published in
the root zone. However, keys configured using the
<span class="command"><strong>trusted-keys</strong></span> statement are not automatically
maintained. If your server is performing DNSSEC validation
and is configured using <span class="command"><strong>trusted-keys</strong></span>, you are
advised to change your configuration before the root zone begins
signing with the new KSK. This is currently scheduled for
October 11, 2017.
</p>
<p>
This release includes an updated version of the
<code class="filename">bind.keys</code> file containing the new root
key. This file can also be downloaded from
<a class="link" href="https://www.isc.org/bind-keys" target="_top">
https://www.isc.org/bind-keys
</a>.
</p>
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
<a name="relnotes_security"></a>Security Fixes</h3></div></div></div>
<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
<li class="listitem"><p>
'rndc ""' could trigger a assertion failure in named. This flaw
is disclosed in (CVE-2017-3138). [RT #44924]
</p></li>
<li class="listitem"><p>
Some chaining (i.e., type CNAME or DNAME) responses to upstream
queries could trigger assertion failures. This flaw is disclosed
in CVE-2017-3137. [RT #44734]
</p></li>
<li class="listitem"><p>
<span class="command"><strong>dns64</strong></span> with <span class="command"><strong>break-dnssec yes;</strong></span>
can result in an assertion failure. This flaw is disclosed in
CVE-2017-3136. [RT #44653]
</p></li>
<li class="listitem"><p>
If a server is configured with a response policy zone (RPZ)
that rewrites an answer with local data, and is also configured
@ -245,6 +294,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

7
external/bsd/bind/dist/doc/arm/Bv9ARM.html vendored
View File

@ -40,7 +40,7 @@
<div>
<div><h1 class="title">
<a name="id-1"></a>BIND 9 Administrator Reference Manual</h1></div>
<div><p class="releaseinfo">BIND Version 9.10.4-P6</p></div>
<div><p class="releaseinfo">BIND Version 9.10.4-P8</p></div>
<div><p class="copyright">Copyright © 2004-2015 Internet Systems Consortium, Inc. ("ISC")</p></div>
<div><p class="copyright">Copyright © 2000-2003 Internet Software Consortium.</p></div>
</div>
@ -239,10 +239,11 @@
</dl></dd>
<dt><span class="appendix"><a href="Bv9ARM.ch09.html">A. Release Notes</a></span></dt>
<dd><dl>
<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P6</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P8</a></span></dt>
<dd><dl>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_intro">Introduction</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_download">Download</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#root_key">New DNSSEC Root Key</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_security">Security Fixes</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_features">New Features</a></span></dt>
<dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_changes">Feature Changes</a></span></dt>
@ -385,6 +386,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

BIN
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf vendored
View File

Binary file not shown.

2
external/bsd/bind/dist/doc/arm/man.arpaname.html vendored
View File

@ -81,6 +81,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html vendored
View File

@ -185,6 +185,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.delv.html vendored
View File

@ -498,6 +498,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dig.html vendored
View File

@ -809,6 +809,6 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html vendored
View File

@ -112,6 +112,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html vendored
View File

@ -219,6 +219,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html vendored
View File

@ -213,6 +213,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html vendored
View File

@ -177,6 +177,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html vendored
View File

@ -381,6 +381,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html vendored
View File

@ -455,6 +455,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html vendored
View File

@ -134,6 +134,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dnssec-settime.html vendored
View File

@ -264,6 +264,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html vendored
View File

@ -564,6 +564,6 @@ db.example.com.signed
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.dnssec-verify.html vendored
View File

@ -164,6 +164,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.genrandom.html vendored
View File

@ -102,6 +102,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.host.html vendored
View File

@ -247,6 +247,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html vendored
View File

@ -112,6 +112,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.named-checkconf.html vendored
View File

@ -151,6 +151,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.named-checkzone.html vendored
View File

@ -338,6 +338,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.named-journalprint.html vendored
View File

@ -102,6 +102,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.named-rrchecker.html vendored
View File

@ -104,6 +104,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.named.html vendored
View File

@ -369,6 +369,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.nsec3hash.html vendored
View File

@ -103,6 +103,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.nsupdate.html vendored
View File

@ -663,6 +663,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.rndc-confgen.html vendored
View File

@ -223,6 +223,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.rndc.conf.html vendored
View File

@ -246,6 +246,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/doc/arm/man.rndc.html vendored
View File

@ -621,6 +621,6 @@
</tr>
</table>
</div>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P6</p>
<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P8</p>
</body>
</html>

2
external/bsd/bind/dist/lib/dns/api vendored
View File

@ -6,5 +6,5 @@
# 9.9-sub: 130-139, 150-159
# 9.10: 140-149, 160-169
LIBINTERFACE = 165
LIBREVISION = 5
LIBREVISION = 7
LIBAGE = 0

4
external/bsd/bind/dist/lib/dns/rdataset.c vendored
View File

@ -1,7 +1,7 @@
/* $NetBSD: rdataset.c,v 1.9 2017/02/09 00:23:27 christos Exp $ */
/* $NetBSD: rdataset.c,v 1.10 2017/04/13 19:11:20 christos Exp $ */
/*
* Copyright (C) 2004-2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2012, 2014, 2015, 2017 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

878
external/bsd/bind/dist/lib/dns/resolver.c vendored
View File

File diff suppressed because it is too large Load Diff

4
external/bsd/bind/dist/lib/isc/include/isc/lex.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: lex.h,v 1.4 2014/12/10 04:38:00 christos Exp $ */
/* $NetBSD: lex.h,v 1.5 2017/04/13 19:11:20 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
@ -154,8 +154,6 @@ isc_lex_create(isc_mem_t *mctx, size_t max_token, isc_lex_t **lexp);
* Requires:
*\li '*lexp' is a valid lexer.
*
*\li max_token > 0.
*
* Ensures:
*\li On success, *lexp is attached to the newly created lexer.
*

7
external/bsd/bind/dist/lib/isc/lex.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: lex.c,v 1.7 2015/12/17 04:00:45 christos Exp $ */
/* $NetBSD: lex.c,v 1.8 2017/04/13 19:11:20 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
@ -96,9 +96,10 @@ isc_lex_create(isc_mem_t *mctx, size_t max_token, isc_lex_t **lexp) {
/*
* Create a lexer.
*/
REQUIRE(lexp != NULL && *lexp == NULL);
REQUIRE(max_token > 0U);
if (max_token == 0U)
max_token = 1;
lex = isc_mem_get(mctx, sizeof(*lex));
if (lex == NULL)

2
external/bsd/bind/dist/srcid vendored
View File

@ -1 +1 @@
SRCID=a6837d0
SRCID=9f5232e

2
external/bsd/bind/dist/version vendored
View File

@ -7,5 +7,5 @@ MAJORVER=9
MINORVER=10
PATCHVER=4
RELEASETYPE=-P
RELEASEVER=6
RELEASEVER=8
EXTENSIONS=