put A and AAAA in additional section when responding to type=ANAME queries

initial implementation of ANAME rrtype, using type code point 65532
- this is only the bare type represetation, with no special processing
2018-03-18 14:27:22 +00:00 · 2018-03-18 11:40:51 +00:00 · 2018-03-18 06:16:56 -04:00 · 2018-03-18 10:08:57 +00:00 · 2018-03-18 10:08:57 +00:00 · 2018-03-18 10:08:22 +00:00
822 changed files with 7151 additions and 103543 deletions
@@ -21,9 +21,10 @@ ans.run
 named.run
 named.memstats
 gen.dSYM/
-.libs/
+.ccache/
 .deps/
 .dirstamp
+.libs/
 unit/atf-src/atf-c++/atf-c++.pc
 unit/atf-src/atf-c/atf-c.pc
 unit/atf-src/atf-c/defs.h
@@ -3,8 +3,10 @@ variables:
  LC_ALL: C
  DOCKER_DRIVER: overlay2
  CI_REGISTRY_IMAGE: oerdnj/bind9
+  CCACHE_DIR: "/ccache"

 stages:
+  - precheck
  - build
  - test

@@ -83,25 +85,58 @@ stages:
 .build: &build_job
  stage: build
  before_script:
+    - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
    - ./autogen.sh
  script:
-    - ./configure --with-libtool --disable-static
-    - make -j6 -k all V=1
+    - ./configure --enable-developer --with-libtool --disable-static --with-atf=/usr/local --with-libidn2
+    - make -j${PARALLEL_JOBS_BUILD:-1} -k all V=1
  artifacts:
    expire_in: '1 hour'
    untracked: true

-.test: &test_job
+.system_test: &system_test_job
  stage: test
  before_script:
+    - rm -rf .ccache
    - bash -x bin/tests/system/ifconfig.sh up
  script:
-    - make -j8 -k check V=1
+    - cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1
  artifacts:
    untracked: true
    expire_in: '1 week'
    when: on_failure

+.unit_test: &unit_test_job
+  stage: test
+  before_script:
+    - export KYUA_RESULT="$CI_PROJECT_DIR/kyua.results"
+  script:
+    - make unit
+  after_script:
+    - kyua report-html --force --results-file kyua.results --results-filter "" --output kyua_html
+  artifacts:
+    paths:
+    - atf.out
+    - kyua.log
+    - kyua.results
+    - kyua_html/
+    expire_in: '1 week'
+    when: on_failure
+
+precheck:debian:sid:amd64:
+  <<: *debian_sid_amd64_image
+  stage: precheck
+  script:
+    - perl util/check-changes CHANGES
+    - perl -w util/merge_copyrights
+    - diff -urNap util/copyrights util/newcopyrights
+    - rm util/newcopyrights
+  artifacts:
+    paths:
+    - util/newcopyrights
+    expire_in: '1 week'
+    when: on_failure
+
 #build:debian:jessie:amd64:
 #  <<: *debian_jessie_amd64_image
 #  <<: *build_job
@@ -134,14 +169,26 @@ build:debian:sid:i386:
  <<: *debian_sid_i386_image
  <<: *build_job

-test:debian:sid:amd64:
+unittest:debian:sid:amd64:
  <<: *debian_sid_amd64_image
-  <<: *test_job
+  <<: *unit_test_job
  dependencies:
    - build:debian:sid:amd64
    
-test:debian:sid:i386:
+unittest:debian:sid:i386:
  <<: *debian_sid_i386_image
-  <<: *test_job
+  <<: *unit_test_job
+  dependencies:
+    - build:debian:sid:i386
+
+systemtest:debian:sid:amd64:
+  <<: *debian_sid_amd64_image
+  <<: *system_test_job
+  dependencies:
+    - build:debian:sid:amd64
+    
+systemtest:debian:sid:i386:
+  <<: *debian_sid_i386_image
+  <<: *system_test_job
  dependencies:
    - build:debian:sid:i386
@@ -0,0 +1,42 @@
+<!--
+If the bug you are reporting is potentially security-related - for example,
+if it involves an assertion failure or other crash in `named` that can be
+triggered repeatedly - then please do *NOT* report it here, but send an
+email to [security-officer@isc.org](security-officer@isc.org).
+-->
+
+### Summary
+
+(Summarize the bug encountered concisely.)
+
+### Steps to reproduce
+
+(How one can reproduce the issue - this is very important.)
+
+### What is the current *bug* behavior?
+
+(What actually happens.)
+
+### What is the expected *correct* behavior?
+
+(What you should see instead.)
+
+### Relevant configuration files
+
+(Paste any relevant configuration files - please use code blocks (```)
+to format console output. If submitting the contents of your
+configuration file in a non-confidential Issue, it is advisable to
+obscure key secrets: this can be done automatically by using
+`named-checkconf -px`.)
+
+### Relevant logs and/or screenshots
+
+(Paste any relevant logs - please use code blocks (```) to format console
+output, logs, and code, as it's very hard to read otherwise.)
+
+### Possible fixes
+
+(If you can, link to the line of code that might be responsible for the
+problem.)
+
+/label ~bug
@@ -0,0 +1,11 @@
+### Description
+
+(Describe the problem, use cases, benefits, and/or goals.)
+
+### Request
+
+(Describe the solution you'd like to see.)
+
+### Links / references
+
+/label ~"feature request"
@@ -1,8 +1,64 @@
+4917.	[func]		Support 64 RPZ policy zones by default. [GL #123]
+
+4916.	[func]		Remove IDNA2003 support and the bundled idnkit-1.0
+			library.
+
+4915.	[func]		Implement IDNA2008 support in dig by adding support
+			for libidn2.  New dig option +idnin has been added,
+			which allows to process invalid domain names much
+			like dig without IDN support.  libidn2 version 2.0
+			or higher is needed for +idnout enabled by default.
+
+4914.	[bug]		A bug in zone database reference counting could lead to
+			a crash when multiple versions of a slave zone were
+			transferred from a master in close succession.
+			[GL #134]
+
+4913.	[test]		Re-implemented older unit tests in bin/tests as ATF,
+			removed the lib/tests unit testing library. [GL #115]
+
+4912.	[test]		Improved the reliability of the 'cds' system test.
+			[GL #136]
+
+4911.	[test]		Improved the reliability of the 'mkeys' system test.
+			[GL #128]
+
+4910.	[func]		Update util/check-changes to work on release branches.
+			[GL #113]
+
+4909.	[bug]		named-checkconf did not detect in-view zone collisions.
+			[GL #125]
+
+4908.	[test]		Eliminated unnecessary waiting in the allow_query
+			system test. Also changed its name to allow-query.
+			[GL #81]
+
+4907.	[test]		Improved the reliability of the 'notify' system
+			test. [GL #59]
+
+4906.	[func]		Replace getquad() with inet_pton(), completing
+			change #4900. [GL #56]
+
+4905.	[bug]		irs_resconf_load() ignored resolv.conf syntax errors
+			when "domain" or "search" options were present in that
+			file. [GL #110]
+
+4904.	[bug]		Temporarily revert change #4859. [GL #124]
+
+4903.	[bug]		"check-mx fail;" did not prevent MX records containing
+			IP addresses from being added to a zone by a dynamic
+			update. [GL #112]
+
+4902.	[test]		Improved the reliability of the 'ixfr' system
+			test. [GL #66]
+
 4901.	[func]		"dig +nssearch" now lists the name servers
 			for a domain that time out, as well as the servers
 			that respond. [GL #64]

-4900.	[cleanup]	Remove all uses of inet_aton(). [GL #13]
+4900.	[func]		Remove all uses of inet_aton().  As a result of this
+			change, IPv4 addresses are now only accepted in
+			dotted-quad format. [GL #13]

 4899.	[test]		Convert most of the remaining system tests to be able
 			to run in parallel, continuing the work from change
@@ -0,0 +1,186 @@
+BIND Source Access and Contributor Guidelines
+
+Feb 22, 2018
+
+Contents
+
+ 1. Access to source code
+ 2. Reporting bugs
+ 3. Contributing code
+
+Introduction
+
+Thank you for using BIND!
+
+BIND is open source software that implements the Domain Name System (DNS)
+protocols for the Internet. It is a reference implementation of those
+protocols, but it is also production-grade software, suitable for use in
+high-volume and high-reliability applications. It is by far the most
+widely used DNS software, providing a robust and stable platform on top of
+which organizations can build distributed computing systems with the
+knowledge that those systems are fully compliant with published DNS
+standards.
+
+BIND is and will always remain free and openly available. It can be used
+and modified in any way by anyone.
+
+BIND is maintained by the Internet Systems Consortium, a public-benefit
+501(c)(3) nonprofit, using a "managed open source" approach: anyone can
+see the source, but only ISC employees have commit access. Until recently,
+the source could only be seen once ISC had published a release: read
+access to the source repository was restricted just as commit access was.
+That's now changing, with the opening of a public git mirror to the BIND
+source tree (see below).
+
+Access to source code
+
+Public BIND releases are always available from the ISC FTP site.
+
+A public-access GIT repository is also available at https://gitlab.isc.org
+. This repository is a mirror, updated several times per day, of the
+source repository maintained by ISC. It contains all the public release
+branches; upcoming releases can be viewed in their current state at any
+time. It does not contain development branches or unreviewed work in
+progress. Commits which address security vulnerablilities are withheld
+until after public disclosure.
+
+You can browse the source online via https://gitlab.isc.org/isc-projects/
+bind9
+
+To clone the repository, use:
+
+      $ git clone https://gitlab.isc.org/isc-projects/bind9.git
+
+Release branch names are of the form v9_X, where X represents the second
+number in the BIND 9 version number. So, to check out the BIND 9.12
+branch, use:
+
+      $ git checkout v9_12
+
+Whenever a branch is ready for publication, a tag will be placed of the
+form v9_X_Y. The 9.12.0 release, for instance, is tagged as v9_12_0.
+
+The branch in which the next major release is being developed is called
+master.
+
+Reporting bugs
+
+Reports of flaws in the BIND package, including software bugs, errors in
+the documentation, missing files in the tarball, suggested changes or
+requests for new features, etc, can be filed using https://gitlab.isc.org/
+isc-projects/bind9/issues.
+
+Due to a large ticket backlog, we are sometimes slow to respond,
+especially if a bug is cosmetic or if a feature request is vague or low in
+priority, but we will try at least to acknowledge legitimate bug reports
+within a week.
+
+ISC's ticketing system is publicly readable; however, you must have an
+account to file a new issue. You can either register locally or use
+credentials from an existing account at GitHub, GitLab, Google, Twitter,
+or Facebook.
+
+Reporting possible security issues
+
+If you think you may be seeing a potential security vulnerability in BIND
+(for example, a crash with REQUIRE, INSIST, or ASSERT failure), please
+report it immediately by emailing to security-officer@isc.org. Plain-text
+e-mail is not a secure choice for communications concerning undisclosed
+security issues so please encrypt your communications to us if possible,
+using the ISC Security Officer public key.
+
+Do not discuss undisclosed security vulnerabilites on any public mailing
+list. ISC has a long history of handling reported vulnerabilities promptly
+and effectively and we respect and acknowledge responsible reporters.
+
+ISC's Security Vulnerability Disclosure Policy is documented at https://
+kb.isc.org/article/AA-00861/0.
+
+If you have a crash, you may want to consult ?What to do if your BIND or
+DHCP server has crashed.?
+
+Contributing code
+
+BIND is licensed under the Mozilla Public License 2.0. Earier versions
+(BIND 9.10 and earlier) were licensed under the ISC License
+
+ISC does not require an explicit copyright assignment for patch
+contributions. However, by submitting a patch to ISC, you implicitly
+certify that you are the author of the code, that you intend to reliquish
+exclusive copyright, and that you grant permission to publish your work
+under the open source license used for the BIND version(s) to which your
+patch will be applied.
+
+BIND code
+
+Patches for BIND may be submitted directly via merge requests in ISC's
+Gitlab source repository for BIND.
+
+Patches can also be submitted as diffs against a specific version of BIND
+-- preferably the current top of the master branch. Diffs may be generated
+using either git format-patch or git diff.
+
+Those wanting to write code for BIND may be interested in the developer
+information page, which includes information about BIND design and coding
+practices, including discussion of internal APIs and overall system
+architecture. (This is a work in progress, and still quite preliminary.)
+
+Every patch submitted will be reviewed by ISC engineers following our code
+review process before it is merged.
+
+It may take considerable time to review patch submissions, especially if
+they don't meet ISC style and quality guidelines. If a patch is a good
+idea, we can and will do additional work to bring it up to par, but if
+we're busy with other work, it may take us a long time to get to it.
+
+To ensure your patch is acted on as promptly as possible, please:
+
+  * Try to adhere to the BIND 9 coding style.
+  * Run make check to ensure your change hasn't caused any functional
+    regressions.
+  * Document your work, both in the patch itself and in the accompanying
+    email.
+  * In patches that make non-trivial functional changes, include system
+    tests if possible; when introducing or substantially altering a
+    library API, include unit tests. See Testing for more information.
+
+Changes to configure
+
+If you need to make changes to configure, you should not edit it directly;
+instead, edit configure.in, then run autoconf. Similarly, instead of
+editing config.h.in directly, edit configure.in and run autoheader.
+
+When submitting a patch as a diff, it's fine to omit the configure diffs
+to save space. Just send the configure.in diffs and we'll generate the new
+configure during the review process.
+
+Documentation
+
+All functional changes should be documented. There are three types of
+documentation in the BIND source tree:
+
+  * Man pages are kept alongside the source code for the commands they
+    document, in files ending in .docbook; for example, the named man page
+    is bin/named/named.docbook.
+  * The BIND 9 Administrator Reference Manual is mostly in doc/arm/
+    Bv9ARM-book.xml, plus a few other XML files that are included in it.
+  * API documentation is in the header file describing the API, in
+    Doxygen-formatted comments.
+
+It is not necessary to edit any documentation files other than these; all
+PDF, HTML, and nroff-format man page files will be updated automatically
+from the docbook and XML files after merging.
+
+Patches to improve existing documentation are also very welcome!
+
+Tests
+
+BIND is a large and complex project. We rely heavily on continuous
+automated testing and cannot merge new code without adequate test
+coverage. Please see the 'Testing' section of doc/dev/dev.md for more
+information.
+
+Thanks
+
+Thank you for your interest in contributing to the ongoing development of
+BIND.
@@ -9,7 +9,7 @@
 - information regarding copyright ownership.
 -->
 ## BIND Source Access and Contributor Guidelines
-*Apr 14, 2017*
+*Feb 22, 2018*

 ### Contents

@@ -47,7 +47,7 @@ Public BIND releases are always available from the
 [ISC FTP site](ftp://ftp.isc.org/isc/bind9).

 A public-access GIT repository is also available at
-[https://bindmember.isc.org](https://bindmember.isc.org).
+[https://gitlab.isc.org](https://gitlab.isc.org).
 This repository is a mirror, updated several times per day, of the
 source repository maintained by ISC.  It contains all the public release
 branches; upcoming releases can be viewed in their current state at any
@@ -56,104 +56,105 @@ progress.  Commits which address security vulnerablilities are withheld
 until after public disclosure.

 You can browse the source online via
-[https://bindmember.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=summary](https://bindmember.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=summary)
+[https://gitlab.isc.org/isc-projects/bind9](https://gitlab.isc.org/isc-projects/bind9)

 To clone the repository, use:

->       $ git clone https://bindmember.isc.org/git/bind9.git
+>       $ git clone https://gitlab.isc.org/isc-projects/bind9.git

-Branch names are of the form `v9_X`, where X represents the second number in the BIND 9 version number.  So, to check out the BIND 9.10 branch, use:
+Release branch names are of the form `v9_X`, where X represents the second
+number in the BIND 9 version number.  So, to check out the BIND 9.12
+branch, use:

->       $ git checkout v9_10
+>       $ git checkout v9_12

 Whenever a branch is ready for publication, a tag will be placed of the
-form `v9_X_Y`.  The 9.9.5 release, for instance, is tagged as `v9_9_5`.
+form `v9_X_Y`.  The 9.12.0 release, for instance, is tagged as `v9_12_0`.

 The branch in which the next major release is being developed is called
 `master`.

 ### <a name="bugs"></a>Reporting bugs

-Reports of flaws in the BIND package, including software bugs, errors in
-the documentation, missing files in the tarball, etc, can be emailed to
-`bind9-bugs@isc.org`, or reported via the
-[bug submission form](http://www.isc.org/community/report-bug) at
-[http://www.isc.org/community/report-bug](http://www.isc.org/community/report-bug).
+Reports of flaws in the BIND package, including software bugs, errors
+in the documentation, missing files in the tarball, suggested changes
+or requests for new features, etc, can be filed using
+[https://gitlab.isc.org/isc-projects/bind9/issues](https://gitlab.isc.org/isc-projects/bind9/issues).

-Suggested changes or requests for new features can be emailed to
-`bind-suggest@isc.org`.  Both bugs and suggestions are stored in the
-ticketing system used by the software engineering team at ISC.
+Due to a large ticket backlog, we are sometimes slow to respond,
+especially if a bug is cosmetic or if a feature request is vague or
+low in priority, but we will try at least to acknowledge legitimate
+bug reports within a week.

-All submissions to the ticketing system receive an automatic response.  Any
-followup email sent to the ticketing system should use the same subject
-header, so that it will be routed to the same ticket.
+ISC's ticketing system is publicly readable; however, you must have
+an account to file a new issue. You can either register locally or
+use credentials from an existing account at GitHub, GitLab, Google,
+Twitter, or Facebook.

-Due to a large ticket backlog and an even larger quantity of incoming spam,
-we are sometimes slow to respond, especially if a bug is cosmetic or if a
-feature request is vague or low in priority, but we will try at least to
-acknowledge legitimate bug reports within a week.
+### Reporting possible security issues
+If you think you may be seeing a potential security vulnerability in BIND
+(for example, a crash with REQUIRE, INSIST, or ASSERT failure), please
+report it immediately by emailing to security-officer@isc.org. Plain-text
+e-mail is not a secure choice for communications concerning undisclosed
+security issues so please encrypt your communications to us if possible,
+using the [ISC Security Officer public key](https://www.isc.org/downloads/software-support-policy/openpgp-key/).

-Currently, ISC's ticketing system is not publicly readable. However, ISC
-may open it in the future. Please do not include information you consider
-to be confidential.
+Do not discuss undisclosed security vulnerabilites on any public mailing list.
+ISC has a long history of handling reported vulnerabilities promptly and
+effectively and we respect and acknowledge responsible reporters.
+
+ISC's Security Vulnerability Disclosure Policy is documented at [https://kb.isc.org/article/AA-00861/0](https://kb.isc.org/article/AA-00861/0).
+
+If you have a crash, you may want to consult
+[‘What to do if your BIND or DHCP server has crashed.’](https://kb.isc.org/article/AA-00340/89/What-to-do-if-your-BIND-or-DHCP-server-has-crashed.html)

 ### <a name="bugs"></a>Contributing code

-BIND's [open source
-license](http://www.isc.org/downloads/software-support-policy/isc-license/)
-not require changes to be contributed back to ISC, but this page
-includes some guidelines for those who would like to do so.
-
-We accept two different types of code contribution:  Code intended for
-inclusion in [BIND](#bind) itself, and code intended for the
-[`contrib`](#contrib) directory.
-
-#### <a name="bind"></a>BIND code
-
-Patches for BIND itself may be submitted using the same methods as bug
-reports or suggestions.  When submitting a patch, please prepend the
-subject header with "`[PATCH]`" so it will be easier for us to find.  If
-your patch introduces a new feature in BIND, please submit it to
-`bind-suggest@isc.org`; if it fixes a bug, please submit it to
-`bind9-bugs@isc.org`.
+BIND is licensed under the
+[Mozilla Public License 2.0](http://www.isc.org/downloads/software-support-policy/isc-license/).
+Earier versions (BIND 9.10 and earlier) were licensed under the [ISC License](http://www.isc.org/downloads/software-support-policy/isc-license/)

 ISC does not require an explicit copyright assignment for patch
 contributions.  However, by submitting a patch to ISC, you implicitly
 certify that you are the author of the code, that you intend to reliquish
 exclusive copyright, and that you grant permission to publish your work
-under the
-[Mozilla Public License 2.0](http://www.isc.org/downloads/software-support-policy/isc-license/)
-for BIND 9.11 and higher, and the
-[ISC License](http://www.isc.org/downloads/software-support-policy/isc-license/)
-for BIND 9.10 and earlier.
+under the open source license used for the BIND version(s) to which your
+patch will be applied.

-Patches should be submitted as diffs against a specific version of BIND --
-preferably the current top of the `master` branch.  Diffs may be
-generated using either `git format-patch` or `git diff`.
+#### <a name="bind"></a>BIND code

-Those wanting to write code for BIND may be interested in the [developer
-information](dev.md) page, which includes information about BIND design and
-coding practices, including discussion of internal APIs and overall system
-architecture.  (This is a work in progress, and still quite preliminary.)
+Patches for BIND may be submitted directly via merge requests in
+[ISC's Gitlab](https://gitlab.isc.org/isc-projects/bind9/) source
+repository for BIND.

-Every patch submitted will be reviewed by ISC engineers following our [code
-review process](dev.md#reviews) before it is merged.
+Patches can also be submitted as diffs against a specific version of
+BIND -- preferably the current top of the `master` branch.  Diffs may
+be generated using either `git format-patch` or `git diff`.
+
+Those wanting to write code for BIND may be interested in the
+[developer information](doc/dev/dev.md) page, which includes information
+about BIND design and coding practices, including discussion of internal
+APIs and overall system architecture.  (This is a work in progress, and
+still quite preliminary.)
+
+Every patch submitted will be reviewed by ISC engineers following our
+[code review process](doc/dev/dev.md#reviews) before it is merged.

 It may take considerable time to review patch submissions, especially if
-they don't meet ISC style and quality guidelines.  If the patch is a good
-idea, we can and will do additional work to bring them up to par, but if
+they don't meet ISC style and quality guidelines.  If a patch is a good
+idea, we can and will do additional work to bring it up to par, but if
 we're busy with other work, it may take us a long time to get to it.

 To ensure your patch is acted on as promptly as possible, please:

-* Try to adhere to the [BIND 9 coding style](style.md).
+* Try to adhere to the [BIND 9 coding style](doc/dev/style.md).
 * Run `make` `check` to ensure your change hasn't caused any
  functional regressions.
 * Document your work, both in the patch itself and in the
  accompanying email.
 * In patches that make non-trivial functional changes, include system
  tests if possible; when introducing or substantially altering a
-  library API, include unit tests. See [Testing](dev.md#testing)
+  library API, include unit tests. See [Testing](doc/dev/dev.md#testing)
  for more information.

 ##### Changes to `configure`
@@ -163,9 +164,9 @@ directly; instead, edit `configure.in`, then run `autoconf`.  Similarly,
 instead of editing `config.h.in` directly, edit `configure.in` and run
 `autoheader`.

-When submitting your patch, it is fine to omit the `configure` diffs.
-Just send the `configure.in` diffs and we'll generate the new `configure`
-during the review process.
+When submitting a patch as a diff, it's fine to omit the `configure`
+diffs to save space.  Just send the `configure.in` diffs and we'll
+generate the new `configure` during the review process.

 ##### Documentation

@@ -181,24 +182,20 @@ of documentation in the BIND source tree:
 * API documentation is in the header file describing the API, in
  Doxygen-formatted comments.

-It is not necessary to edit any documentation files other than these; the
-PDF, HTML, and `nroff`-format files will be generated automatically
-from the `docbook` and `XML` files by a script whenever a documentation
-change is merged to a release branch.
+It is not necessary to edit any documentation files other than these;
+all PDF, HTML, and `nroff`-format man page files will be updated
+automatically from the `docbook` and `XML` files after merging.

-#### <a name="contrib"></a>Contrib code
+Patches to improve existing documentation are also very welcome!

-The software in the `contrib` directory of the BIND 9 `tar` archive is not
-formally supported by ISC, but is included for the convenience of users.
-These are things we consider useful or informative, but are not able to
-support at the same level as BIND.
+##### Tests

-`contrib` includes some useful DNS-related open source tools such as `zkt`,
-`nslint`, and the `idnkit` library for internationalized domain name
-support; useful scripts such as `nanny.pl` and `mkdane.sh`; performance
-testers including `queryperf` and `perftcpdns`; and drivers and modules for
-DLZ.
+BIND is a large and complex project. We rely heavily on continuous
+automated testing and cannot merge new code without adequate test coverage.
+Please see [the 'Testing' section of doc/dev/dev.md](doc/dev/dev.md#testing)
+for more information.

-If you have code with a BSD-compatible license that you would like us to
-include in `contrib`, please send it to `bind-suggest@isc.org`, with
-"`[CONTRIB]`" in the subject header.
+#### Thanks
+
+Thank you for your interest in contributing to the ongoing development
+of BIND.
@@ -22,7 +22,7 @@ MANPAGES =	isc-config.sh.1

 HTMLPAGES =	isc-config.sh.html

-MANOBJS =	README HISTORY OPTIONS ${MANPAGES} ${HTMLPAGES}
+MANOBJS =	README HISTORY OPTIONS CONTRIBUTING ${MANPAGES} ${HTMLPAGES}

@BIND9_MAKE_RULES@

@@ -96,15 +96,23 @@ test-force:

 README: README.md
 	${PANDOC} --email-obfuscation=none -s -t html README.md | \
-		${W3M} -dump -cols 75 -O ascii -T text/html > $@
+		${W3M} -dump -cols 75 -O ascii -T text/html | \
+		sed -e '$${/^$$/d;}' > $@

 HISTORY: HISTORY.md
 	${PANDOC} --email-obfuscation=none -s -t html HISTORY.md | \
-		${W3M} -dump -cols 75 -O ascii -T text/html > $@
+		${W3M} -dump -cols 75 -O ascii -T text/html | \
+		sed -e '$${/^$$/d;}' > $@

 OPTIONS: OPTIONS.md
 	${PANDOC} --email-obfuscation=none -s -t html OPTIONS.md | \
-		${W3M} -dump -cols 75 -O ascii -T text/html > $@
+		${W3M} -dump -cols 75 -O ascii -T text/html | \
+		sed -e '$${/^$$/d;}' > $@
+
+CONTRIBUTING: CONTRIBUTING.md
+	${PANDOC} --email-obfuscation=none -s -t html CONTRIBUTING.md | \
+		${W3M} -dump -cols 75 -O ascii -T text/html | \
+		sed -e '$${/^$$/d;}' > $@

 unit::
 	sh ${top_builddir}/unit/unittest.sh
@@ -19,9 +19,6 @@ Setting                   Description
                          named-checkzone
 -DNS_RUN_PID_DIR=0        Create default PID files in ${localstatedir}/run
                          rather than ${localstatedir}/run/named/
-                          Increase the maximum number of configurable
-DNS_RPZ_MAX_ZONES=64     response policy zones from 32 to 64; this is the
-                          highest possible setting
                          Disable the use of inline functions to implement
 -DISC_BUFFER_USEINLINE=0  the isc_buffer API: this reduces performance but
                          may be useful when debugging
@@ -23,6 +23,5 @@ Some of these settings are:
 |`-DCHECK_SIBLING=0`|Don't check sibling glue in `named-checkzone`|
 |`-DCHECK_LOCAL=0`|Don't check out-of-zone addresses in `named-checkzone`|
 |`-DNS_RUN_PID_DIR=0`|Create default PID files in `${localstatedir}/run` rather than `${localstatedir}/run/named/`|
-|`-DNS_RPZ_MAX_ZONES=64`|Increase the maximum number of configurable response policy zones from 32 to 64; this is the highest possible setting|
 |`-DISC_BUFFER_USEINLINE=0`|Disable the use of inline functions to implement the `isc_buffer` API: this reduces performance but may be useful when debugging |
 |`-DISC_HEAP_CHECK`|Test heap consistency after every heap operation; used when debugging|
@@ -50,19 +50,21 @@ bind9/releasenotes

 Reporting bugs and getting help

-Please report assertion failure errors and suspected security issues to
-security-officer@isc.org.
+To report non-security-sensitive bugs or request new features, you may
+open an Issue in the BIND 9 project on the ISC GitLab server at https://
+gitlab.isc.org/isc-projects/bind9.

-General bug reports can be sent to bind9-bugs@isc.org.
+Please note that, unless you explicitly mark the newly created Issue as
+"confidential", it will be publicly readable. Please do not include any
+information in bug reports that you consider to be confidential unless the
+issue has been marked as such. In particular, if submitting the contents
+of your configuration file in a non-confidential Issue, it is advisable to
+obscure key secrets: this can be done automatically by using
+named-checkconf -px.

-Feature requests can be sent to bind-suggest@isc.org.
-
-Please note that, while tickets submitted to ISC's ticketing system are
-not initially publicly readable by default, they can be made publicly
-acessible afterward. Please do not include information in bug reports that
-you consider to be confidential. In particular, when sending the contents
-of your configuration file, it is advisable to obscure key secrets: this
-can be done automatically by using named-checkconf -px.
+If the bug you are reporting is a potential security issue, such as an
+assertion failure or other crash in named, please do NOT use GitLab to
+report it. Instead, please send mail to security-officer@isc.org.

 Professional support and training for BIND are available from ISC at
 https://www.isc.org/support.
@@ -80,14 +82,20 @@ ISC maintains a public git repository for BIND; details can be found at
 http://www.isc.org/git/.

 Information for BIND contributors can be found in the following files: -
-General information: doc/dev/contrib.md - BIND 9 code style: doc/dev/
-style.md - BIND architecture and developer guide: doc/dev/dev.md
+General information: CONTRIBUTING.md - BIND 9 code style: doc/dev/style.md
+- BIND architecture and developer guide: doc/dev/dev.md

-Patches for BIND may be submitted either as Github pull requests or via
-email. When submitting a patch via email, please prepend the subject
-header with "[PATCH]" so it will be easier for us to find. If your patch
-introduces a new feature in BIND, please submit it to bind-suggest@isc.org
-; if it fixes a bug, please submit it to bind9-bugs@isc.org.
+Patches for BIND may be submitted as Merge Requests in the ISC GitLab
+server at at https://gitlab.isc.org/isc-projects/bind9/merge_requests.
+
+By default, external contributors don't have ability to fork BIND in the
+GitLab server, but if you wish to contribute code to BIND, you may request
+permission to do so. Thereafter, you can create git branches and directly
+submit requests that they be reviewed and merged.
+
+If you prefer, you may also submit code by opening a GitLab Issue and
+including your patch as an attachment, preferably generated by git
+format-patch.

 BIND 9.13 features

@@ -324,4 +332,3 @@ Acknowledgments
    (eay@cryptsoft.com)
  * This product includes software written by Tim Hudson
    (tjh@cryptsoft.com)
-
@@ -61,22 +61,24 @@ For up-to-date release notes and errata, see

 ### <a name="help"/> Reporting bugs and getting help

-Please report assertion failure errors and suspected security issues to
+To report non-security-sensitive bugs or request new features, you may
+open an Issue in the BIND 9 project on the
+[ISC GitLab server](https://gitlab.isc.org) at
+[https://gitlab.isc.org/isc-projects/bind9](https://gitlab.isc.org/isc-projects/bind9).
+
+Please note that, unless you explicitly mark the newly created Issue as
+"confidential", it will be publicly readable.  Please do not include any
+information in bug reports that you consider to be confidential unless
+the issue has been marked as such.  In particular, if submitting the
+contents of your configuration file in a non-confidential Issue, it is
+advisable to obscure key secrets: this can be done automatically by
+using `named-checkconf -px`.
+
+If the bug you are reporting is a potential security issue, such as an
+assertion failure or other crash in `named`, please do *NOT* use GitLab to
+report it. Instead, please send mail to
 [security-officer@isc.org](mailto:security-officer@isc.org).

-General bug reports can be sent to
-[bind9-bugs@isc.org](mailto:bind9-bugs@isc.org).
-
-Feature requests can be sent to
-[bind-suggest@isc.org](mailto:bind-suggest@isc.org).
-
-Please note that, while tickets submitted to ISC's ticketing system
-are not initially publicly readable by default, they can be made publicly
-acessible afterward.  Please do not include information in bug reports that
-you consider to be confidential. In particular, when sending the contents of
-your configuration file, it is advisable to obscure key secrets: this can
-be done automatically by using `named-checkconf -px`.
-
 Professional support and training for BIND are available from
 ISC at [https://www.isc.org/support](https://www.isc.org/support).

@@ -93,16 +95,24 @@ ISC maintains a public git repository for BIND; details can be found
 at [http://www.isc.org/git/](http://www.isc.org/git/).

 Information for BIND contributors can be found in the following files:
- General information: [doc/dev/contrib.md](doc/dev/contrib.md)
+- General information: [CONTRIBUTING.md](CONTRIBUTING)
 - BIND 9 code style: [doc/dev/style.md](doc/dev/style.md)
 - BIND architecture and developer guide: [doc/dev/dev.md](doc/dev/dev.md)

-Patches for BIND may be submitted either as Github pull requests
-or via email.  When submitting a patch via email, please prepend the
-subject header with "`[PATCH]`" so it will be easier for us to find. 
-If your patch introduces a new feature in BIND, please submit it to
-[bind-suggest@isc.org](mailto:bind-suggest@isc.org); if it fixes a bug,
-please submit it to [bind9-bugs@isc.org](mailto:bind9-bugs@isc.org).
+Patches for BIND may be submitted as
+[Merge Requests](https://gitlab.isc.org/isc-projects/bind9/merge_requests)
+in the [ISC GitLab server](https://gitlab.isc.org) at
+at [https://gitlab.isc.org/isc-projects/bind9/merge_requests](https://gitlab.isc.org/isc-projects/bind9/merge_requests).
+
+By default, external contributors don't have ability to fork BIND in the
+GitLab server, but if you wish to contribute code to BIND, you may request
+permission to do so. Thereafter, you can create git branches and directly
+submit requests that they be reviewed and merged.
+
+If you prefer, you may also submit code by opening a
+[GitLab Issue](https://gitlab.isc.org/isc-projects/bind9/issues) and
+including your patch as an attachment, preferably generated by
+`git format-patch`.

 ### <a name="features"/> BIND 9.13 features

@@ -9,8 +9,6 @@
 * information regarding copyright ownership.
 */

-/* $Id: acconfig.h,v 1.53 2008/12/01 23:47:44 tbox Exp $ */
-
 /*! \file */

 /***
@@ -7,14 +7,12 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-# $Id: Makefile.in,v 1.29 2009/10/05 12:07:08 fdupont Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-SUBDIRS =	named rndc dig delv dnssec tools tests nsupdate \
-		check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@
+SUBDIRS =	named rndc dig delv dnssec tools nsupdate check confgen \
+		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
 TARGETS =

@BIND9_MAKE_RULES@
@@ -19,7 +19,7 @@ READLINE_LIB = @READLINE_LIB@

 CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} \
 		${BIND9_INCLUDES} ${ISC_INCLUDES} \
-		${IRS_INCLUDES} ${ISCCFG_INCLUDES} @DST_OPENSSL_INC@
+		${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ @DST_OPENSSL_INC@

 CDEFINES =	-DVERSION=\"${VERSION}\" @CRYPTO@
 CWARNINGS =
@@ -41,10 +41,10 @@ DEPLIBS =	${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \
 		${ISCDEPLIBS} ${ISCCFGDEPLIBS}

 LIBS =		${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
-		${ISCLIBS} @IDNLIBS@ @LIBS@
+		${ISCLIBS} @LIBIDN2_LIBS@ @LIBS@

 NOSYMLIBS =	${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
-		${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@
+		${ISCNOSYMLIBS} @LIBIDN2_LIBS@ @LIBS@

 SUBDIRS =

@@ -190,7 +190,8 @@ help(void) {
 "                 +[no]fail           (Don't try next server on SERVFAIL)\n"
 "                 +[no]header-only    (Send query without a question section)\n"
 "                 +[no]identify       (ID responders in short answers)\n"
-"                 +[no]idnout         (convert IDN response)\n"
+"                 +[no]idnin          (Parse IDN names)\n"
+"                 +[no]idnout         (Convert IDN response)\n"
 "                 +[no]ignore         (Don't revert to TCP for TC responses.)\n"
 "                 +[no]keepalive      (Request EDNS TCP keepalive)\n"
 "                 +[no]keepopen       (Keep the TCP socket open between queries)\n"
@@ -1045,13 +1046,29 @@ plus_option(const char *option, isc_boolean_t is_batchfile,
 				lookup->identify = state;
 				break;
 			case 'n':
-				FULLCHECK("idnout");
-#ifndef WITH_IDN
-				fprintf(stderr, ";; IDN support not enabled\n");
+				switch (cmd[3]) {
+				case 'i':
+					FULLCHECK("idnin");
+#ifndef WITH_IDN_SUPPORT
+					fprintf(stderr, ";; IDN input support"
+					        " not enabled\n");
 #else
-				lookup->idnout = state;
+					lookup->idnin = state;
 #endif
 				break;
+				case 'o':
+					FULLCHECK("idnout");
+#ifndef WITH_IDN_OUT_SUPPORT
+					fprintf(stderr, ";; IDN output support"
+					        " not enabled\n");
+#else
+					lookup->idnout = state;
+#endif
+					break;
+				default:
+					goto invalid_option;
+				}
+				break;
 			default:
 				goto invalid_option;
 			}
@@ -776,6 +776,17 @@
 	  </listitem>
 	</varlistentry>

+	<varlistentry>
+	  <term><option>+[no]idnin</option></term>
+	  <listitem>
+	    <para>
+	      Process [do not process] IDN domain names on input.
+	      This requires IDN SUPPORT to have been enabled at
+	      compile time.  The default is to process IDN input.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
 	<varlistentry>
 	  <term><option>+[no]idnout</option></term>
 	  <listitem>
@@ -1288,10 +1299,9 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
      <command>dig</command> appropriately converts character encoding of
      domain name before sending a request to DNS server or displaying a
      reply from the server.
-      If you'd like to turn off the IDN support for some reason, defines
-      the <envar>IDN_DISABLE</envar> environment variable.
-      The IDN support is disabled if the variable is set when
-      <command>dig</command> runs.
+      If you'd like to turn off the IDN support for some reason, use 
+      parameters <parameter>+noidnin</parameter> and
+      <parameter>+noidnout</parameter>.
    </para>
  </refsection>

@@ -24,17 +24,18 @@
 #include <unistd.h>
 #include <string.h>
 #include <limits.h>
+#include <errno.h>

 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif

-#ifdef WITH_IDN
-#include <idn/result.h>
-#include <idn/log.h>
-#include <idn/resconf.h>
-#include <idn/api.h>
+#ifdef WITH_IDN_SUPPORT
+
+#ifdef WITH_LIBIDN2
+#include <idn2.h>
 #endif
+#endif /* WITH_IDN_SUPPORT */

 #include <dns/byaddr.h>
 #include <dns/fixedname.h>
@@ -134,18 +135,23 @@ int lookup_counter = 0;

 static char servercookie[256];

-#ifdef WITH_IDN
-static void		initialize_idn(void);
-static isc_result_t	output_filter(isc_buffer_t *buffer,
-				      unsigned int used_org,
-				      isc_boolean_t absolute);
-static idn_result_t	append_textname(char *name, const char *origin,
-					size_t namesize);
-static void		idn_check_result(idn_result_t r, const char *msg);
+#ifdef WITH_IDN_SUPPORT
+static void idn_initialize(void);
+static isc_result_t idn_locale_to_ace(const char *from,
+		char *to,
+		size_t tolen);
+#endif /* WITH_IDN_SUPPORT */

-#define MAXDLEN		256
-int  idnoptions	= 0;
-#endif
+#ifdef WITH_IDN_OUT_SUPPORT
+static isc_result_t idn_ace_to_locale(const char *from,
+		char *to,
+		size_t tolen);
+static isc_result_t output_filter(isc_buffer_t *buffer,
+		unsigned int used_org,
+		isc_boolean_t absolute);
+#define MAXDLEN 256
+
+#endif /* WITH_IDN_OUT_SUPPORT */

 isc_socket_t *keep = NULL;
 isc_sockaddr_t keepaddr;
@@ -646,7 +652,12 @@ make_empty_lookup(void) {
 	looknew->ttlunits = ISC_FALSE;
 	looknew->ttlunits = ISC_FALSE;
 	looknew->qr = ISC_FALSE;
-#ifdef WITH_IDN
+#ifdef WITH_IDN_SUPPORT
+	looknew->idnin = ISC_TRUE;
+#else
+	looknew->idnin = ISC_FALSE;
+#endif
+#ifdef WITH_IDN_OUT_SUPPORT
 	looknew->idnout = ISC_TRUE;
 #else
 	looknew->idnout = ISC_FALSE;
@@ -791,6 +802,7 @@ clone_lookup(dig_lookup_t *lookold, isc_boolean_t servers) {
 	looknew->nocrypto = lookold->nocrypto;
 	looknew->ttlunits = lookold->ttlunits;
 	looknew->qr = lookold->qr;
+	looknew->idnin = lookold->idnin;
 	looknew->idnout = lookold->idnout;
 	looknew->udpsize = lookold->udpsize;
 	looknew->edns = lookold->edns;
@@ -1294,8 +1306,19 @@ setup_system(isc_boolean_t ipv4only, isc_boolean_t ipv6only) {

 	irs_resconf_destroy(&resconf);

-#ifdef WITH_IDN
-	initialize_idn();
+#ifdef HAVE_SETLOCALE
+	/* Set locale */
+	(void)setlocale(LC_ALL, "");
+#endif
+
+#ifdef WITH_IDN_SUPPORT
+	idn_initialize();
+#endif
+
+#ifdef WITH_IDN_OUT_SUPPORT
+	/* Set domain name -> text post-conversion filter. */
+	result = dns_name_settotextfilter(output_filter);
+	check_result(result, "dns_name_settotextfilter");
 #endif

 	if (keyfile[0] != 0)
@@ -2026,12 +2049,13 @@ setup_lookup(dig_lookup_t *lookup) {
 	char store[MXNAME];
 	char ecsbuf[20];
 	char cookiebuf[256];
-#ifdef WITH_IDN
-	idn_result_t mr;
-	char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
+	char *origin = NULL;
+	char *textname = NULL;
+#ifdef WITH_IDN_SUPPORT
+	char idn_origin[MXNAME], idn_textname[MXNAME];
 #endif

-#ifdef WITH_IDN
+#ifdef WITH_IDN_OUT_SUPPORT
 	result = dns_name_settotextfilter(lookup->idnout ?
 					  output_filter : NULL);
 	check_result(result, "dns_name_settotextfilter");
@@ -2064,15 +2088,20 @@ setup_lookup(dig_lookup_t *lookup) {
 	isc_buffer_init(&lookup->onamebuf, lookup->oname_space,
 			sizeof(lookup->oname_space));

-#ifdef WITH_IDN
 	/*
 	 * We cannot convert `textname' and `origin' separately.
 	 * `textname' doesn't contain TLD, but local mapping needs
 	 * TLD.
 	 */
-	mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,
-			    utf8_textname, sizeof(utf8_textname));
-	idn_check_result(mr, "convert textname to UTF-8");
+	textname = lookup->textname;
+#ifdef WITH_IDN_SUPPORT
+	if (lookup->idnin) {
+		result = idn_locale_to_ace(lookup->textname, idn_textname,
+					    sizeof(idn_textname));
+		check_result(result, "convert textname to IDN encoding");
+		debug("idn_textname: %s", idn_textname);
+		textname = idn_textname;
+	}
 #endif

 	/*
@@ -2083,8 +2112,8 @@ setup_lookup(dig_lookup_t *lookup) {
 	 * is TRUE or we got a domain line in the resolv.conf file.
 	 */
 	if (lookup->new_search) {
-#ifdef WITH_IDN
-		if ((count_dots(utf8_textname) >= ndots) || !usesearch) {
+		if ((count_dots(textname) >= ndots) || !usesearch)
+		{
 			lookup->origin = NULL; /* Force abs lookup */
 			lookup->done_as_is = ISC_TRUE;
 			lookup->need_search = usesearch;
@@ -2092,33 +2121,8 @@ setup_lookup(dig_lookup_t *lookup) {
 			lookup->origin = ISC_LIST_HEAD(search_list);
 			lookup->need_search = ISC_FALSE;
 		}
-#else
-		if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
-			lookup->origin = NULL; /* Force abs lookup */
-			lookup->done_as_is = ISC_TRUE;
-			lookup->need_search = usesearch;
-		} else if (lookup->origin == NULL && usesearch) {
-			lookup->origin = ISC_LIST_HEAD(search_list);
-			lookup->need_search = ISC_FALSE;
-		}
-#endif
 	}

-#ifdef WITH_IDN
-	if (lookup->origin != NULL) {
-		mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP,
-				    lookup->origin->origin, utf8_origin,
-				    sizeof(utf8_origin));
-		idn_check_result(mr, "convert origin to UTF-8");
-		mr = append_textname(utf8_textname, utf8_origin,
-				     sizeof(utf8_textname));
-		idn_check_result(mr, "append origin to textname");
-	}
-	mr = idn_encodename(idnoptions | IDN_LOCALMAP | IDN_NAMEPREP |
-			    IDN_IDNCONV | IDN_LENCHECK, utf8_textname,
-			    idn_textname, sizeof(idn_textname));
-	idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
-#else
 	if (lookup->origin != NULL) {
 		debug("trying origin %s", lookup->origin->origin);
 		result = dns_message_gettempname(lookup->sendmsg,
@@ -2126,8 +2130,18 @@ setup_lookup(dig_lookup_t *lookup) {
 		check_result(result, "dns_message_gettempname");
 		dns_name_init(lookup->oname, NULL);
 		/* XXX Helper funct to conv char* to name? */
-		len = (unsigned int) strlen(lookup->origin->origin);
-		isc_buffer_init(&b, lookup->origin->origin, len);
+		origin = lookup->origin->origin;
+#ifdef WITH_IDN_SUPPORT
+		if (lookup->idnin) {
+			result = idn_locale_to_ace(lookup->origin->origin,
+						idn_origin, sizeof(idn_origin));
+			check_result(result, "convert origin to IDN encoding");
+			debug("trying idn origin %s", idn_origin);
+			origin = idn_origin;
+		}
+#endif
+		len = (unsigned int) strlen(origin);
+		isc_buffer_init(&b, origin, len);
 		isc_buffer_add(&b, len);
 		result = dns_name_fromtext(lookup->oname, &b, dns_rootname,
 					   0, &lookup->onamebuf);
@@ -2137,7 +2151,7 @@ setup_lookup(dig_lookup_t *lookup) {
 			dns_message_puttempname(lookup->sendmsg,
 						&lookup->oname);
 			fatal("'%s' is not in legal name syntax (%s)",
-			      lookup->origin->origin,
+			      origin,
 			      isc_result_totext(result));
 		}
 		if (lookup->trace && lookup->trace_root) {
@@ -2148,8 +2162,8 @@ setup_lookup(dig_lookup_t *lookup) {

 			dns_fixedname_init(&fixed);
 			name = dns_fixedname_name(&fixed);
-			len = (unsigned int) strlen(lookup->textname);
-			isc_buffer_init(&b, lookup->textname, len);
+			len = (unsigned int) strlen(textname);
+			isc_buffer_init(&b, textname, len);
 			isc_buffer_add(&b, len);
 			result = dns_name_fromtext(name, &b, NULL, 0, NULL);
 			if (result == ISC_R_SUCCESS &&
@@ -2174,28 +2188,17 @@ setup_lookup(dig_lookup_t *lookup) {
 			}
 		}
 		dns_message_puttempname(lookup->sendmsg, &lookup->oname);
-	} else
-#endif
-	{
+	} else {
 		debug("using root origin");
 		if (lookup->trace && lookup->trace_root)
 			dns_name_clone(dns_rootname, lookup->name);
 		else {
-#ifdef WITH_IDN
-			len = (unsigned int) strlen(idn_textname);
-			isc_buffer_init(&b, idn_textname, len);
+			len = (unsigned int) strlen(textname);
+			isc_buffer_init(&b, textname, len);
 			isc_buffer_add(&b, len);
 			result = dns_name_fromtext(lookup->name, &b,
 						   dns_rootname, 0,
 						   &lookup->namebuf);
-#else
-			len = (unsigned int) strlen(lookup->textname);
-			isc_buffer_init(&b, lookup->textname, len);
-			isc_buffer_add(&b, len);
-			result = dns_name_fromtext(lookup->name, &b,
-						   dns_rootname, 0,
-						   &lookup->namebuf);
-#endif
 		}
 		if (result != ISC_R_SUCCESS) {
 			dns_message_puttempname(lookup->sendmsg,
@@ -4153,7 +4156,7 @@ cancel_all(void) {
 */
 void
 destroy_libs(void) {
-#ifdef WITH_IDN
+#ifdef WITH_IDN_SUPPORT
 	isc_result_t result;
 #endif

@@ -4187,7 +4190,7 @@ destroy_libs(void) {

 	clear_searchlist();

-#ifdef WITH_IDN
+#ifdef WITH_IDN_SUPPORT
 	result = dns_name_settotextfilter(NULL);
 	check_result(result, "dns_name_settotextfilter");
 #endif
@@ -4234,27 +4237,7 @@ destroy_libs(void) {
 		isc_mem_destroy(&mctx);
 }

-#ifdef WITH_IDN
-static void
-initialize_idn(void) {
-	idn_result_t r;
-	isc_result_t result;
-
-#ifdef HAVE_SETLOCALE
-	/* Set locale */
-	(void)setlocale(LC_ALL, "");
-#endif
-	/* Create configuration context. */
-	r = idn_nameinit(1);
-	if (r != idn_success)
-		fatal("idn api initialization failed: %s",
-		      idn_result_tostring(r));
-
-	/* Set domain name -> text post-conversion filter. */
-	result = dns_name_settotextfilter(output_filter);
-	check_result(result, "dns_name_settotextfilter");
-}
-
+#ifdef WITH_IDN_OUT_SUPPORT
 static isc_result_t
 output_filter(isc_buffer_t *buffer, unsigned int used_org,
 	      isc_boolean_t absolute)
@@ -4262,6 +4245,7 @@ output_filter(isc_buffer_t *buffer, unsigned int used_org,
 	char tmp1[MAXDLEN], tmp2[MAXDLEN];
 	size_t fromlen, tolen;
 	isc_boolean_t end_with_dot;
+	isc_result_t result;

 	/*
 	 * Copy contents of 'buffer' to 'tmp1', supply trailing dot
@@ -4270,6 +4254,7 @@ output_filter(isc_buffer_t *buffer, unsigned int used_org,
 	fromlen = isc_buffer_usedlength(buffer) - used_org;
 	if (fromlen >= MAXDLEN)
 		return (ISC_R_SUCCESS);
+
 	memmove(tmp1, (char *)isc_buffer_base(buffer) + used_org, fromlen);
 	end_with_dot = (tmp1[fromlen - 1] == '.') ? ISC_TRUE : ISC_FALSE;
 	if (absolute && !end_with_dot) {
@@ -4278,13 +4263,16 @@ output_filter(isc_buffer_t *buffer, unsigned int used_org,
 			return (ISC_R_SUCCESS);
 		tmp1[fromlen - 1] = '.';
 	}
+
 	tmp1[fromlen] = '\0';

 	/*
 	 * Convert contents of 'tmp1' to local encoding.
 	 */
-	if (idn_decodename(IDN_DECODE_APP, tmp1, tmp2, MAXDLEN) != idn_success)
+	result = idn_ace_to_locale(tmp1, tmp2, sizeof(tmp2));
+	if (result != ISC_R_SUCCESS) {
 		return (ISC_R_SUCCESS);
+	}
 	strlcpy(tmp1, tmp2, MAXDLEN);

 	/*
@@ -4304,32 +4292,67 @@ output_filter(isc_buffer_t *buffer, unsigned int used_org,

 	return (ISC_R_SUCCESS);
 }
+#endif

-static idn_result_t
-append_textname(char *name, const char *origin, size_t namesize) {
-	size_t namelen = strlen(name);
-	size_t originlen = strlen(origin);
-
-	/* Already absolute? */
-	if (namelen > 0 && name[namelen - 1] == '.')
-		return (idn_success);
-
-	/* Append dot and origin */
-
-	if (namelen + 1 + originlen >= namesize)
-		return (idn_buffer_overflow);
-
-	if (*origin != '.')
-		name[namelen++] = '.';
-	(void)strlcpy(name + namelen, origin, namesize - namelen);
-	return (idn_success);
-}
-
+#ifdef WITH_IDN_SUPPORT
+#ifdef WITH_LIBIDN2
 static void
-idn_check_result(idn_result_t r, const char *msg) {
-	if (r != idn_success) {
-		exitcode = 1;
-		fatal("%s: %s", msg, idn_result_tostring(r));
-	}
+idn_initialize(void) {
 }
-#endif /* WITH_IDN */
+
+static isc_result_t
+idn_locale_to_ace(const char *from, char *to, size_t tolen) {
+	int res;
+	char *tmp_str = NULL;
+
+	res = idn2_lookup_ul(from, &tmp_str, IDN2_NONTRANSITIONAL);
+	if (res == IDN2_DISALLOWED)
+		res = idn2_lookup_ul(from, &tmp_str, IDN2_TRANSITIONAL);
+
+	if (res == IDN2_OK) {
+		/* check the length */
+		if (strlen(tmp_str) >= tolen) {
+			debug("ACE string is too long");
+			idn2_free(tmp_str);
+			return ISC_R_NOSPACE;
+		}
+
+		(void) strlcpy(to, tmp_str, tolen);
+		idn2_free(tmp_str);
+		return ISC_R_SUCCESS;
+	}
+
+	fatal("idn2_lookup_ul failed: %s", idn2_strerror(res));
+	return ISC_R_FAILURE;
+}
+
+#ifdef WITH_IDN_OUT_SUPPORT
+static isc_result_t
+idn_ace_to_locale(const char *from, char *to, size_t tolen) {
+	int res;
+	char *tmp_str = NULL;
+
+	res = idn2_to_unicode_8zlz(from, &tmp_str,
+			       IDN2_NONTRANSITIONAL|IDN2_NFC_INPUT);
+
+	if (res == IDN2_OK) {
+		/* check the length */
+		if (strlen(tmp_str) >= tolen) {
+			debug("encoded ASC string is too long");
+			idn2_free(tmp_str);
+			return ISC_R_FAILURE;
+		}
+
+		(void) strncpy(to, tmp_str, tolen);
+		free(tmp_str);
+		return ISC_R_SUCCESS;
+	} else {
+		debug("idn2_to_unicode_8zlz failed: %s",
+		      idn2_strerror(res));
+	}
+
+	return ISC_R_FAILURE;
+}
+#endif /* WITH_IDN_OUT_SUPPORT */
+#endif /* WITH_LIBIDN2 */
+#endif /* WITH_IDN_SUPPORT */
@@ -19,13 +19,6 @@
 #include <locale.h>
 #endif

-#ifdef WITH_IDN
-#include <idn/result.h>
-#include <idn/log.h>
-#include <idn/resconf.h>
-#include <idn/api.h>
-#endif
-
 #include <isc/app.h>
 #include <isc/commandline.h>
 #include <isc/netaddr.h>
@@ -721,9 +714,6 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) {
 			    lookup->rdtype != dns_rdatatype_axfr)
 				lookup->rdtype = rdtype;
 			lookup->rdtypeset = ISC_TRUE;
-#ifdef WITH_IDN
-			idnoptions = 0;
-#endif
 			if (rdtype == dns_rdatatype_axfr) {
 				/* -l -t any -v */
 				list_type = dns_rdatatype_any;
@@ -736,13 +726,6 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) {
 			} else if (rdtype == dns_rdatatype_any) {
 				if (!lookup->tcp_mode_set)
 					lookup->tcp_mode = ISC_TRUE;
-#ifdef WITH_IDN
-			} else if (rdtype == dns_rdatatype_a ||
-				   rdtype == dns_rdatatype_aaaa ||
-				   rdtype == dns_rdatatype_mx) {
-				idnoptions = IDN_ASCCHECK;
-				list_type = rdtype;
-#endif
 			} else
 				list_type = rdtype;
 			list_addresses = ISC_FALSE;
@@ -771,9 +754,6 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) {
 			if (!lookup->rdtypeset ||
 			    lookup->rdtype != dns_rdatatype_axfr)
 				lookup->rdtype = dns_rdatatype_any;
-#ifdef WITH_IDN
-			idnoptions = 0;
-#endif
 			list_type = dns_rdatatype_any;
 			list_addresses = ISC_FALSE;
 			lookup->rdtypeset = ISC_TRUE;
@@ -885,9 +865,6 @@ main(int argc, char **argv) {
 	ISC_LIST_INIT(search_list);

 	fatalexit = 1;
-#ifdef WITH_IDN
-	idnoptions = IDN_ASCCHECK;
-#endif

 	/* setup dighost callbacks */
 	dighost_printmessage = printmessage;
@@ -129,6 +129,7 @@ struct dig_lookup {
 		use_usec,
 		nocrypto,
 		ttlunits,
+		idnin,
 		idnout,
 		qr;
 	char textname[MXNAME]; /*% Name we're going to be looking up */
@@ -268,9 +269,6 @@ extern char *progname;
 extern int tries;
 extern int fatalexit;
 extern isc_boolean_t verbose;
-#ifdef WITH_IDN
-extern int idnoptions;
-#endif

 /*
 * Routines in dighost.c.
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2018  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -5,11 +5,14 @@
 static char xslmsg[] =
 	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 	"<!--\n"
-	" - Copyright (C) 2006-2009, 2012-2017 Internet Systems Consortium, Inc. (\"ISC\")\n"
+	" - Copyright (C) Internet Systems Consortium, Inc. (\"ISC\")\n"
 	" -\n"
 	" - This Source Code Form is subject to the terms of the Mozilla Public\n"
 	" - License, v. 2.0. If a copy of the MPL was not distributed with this\n"
 	" - file, You can obtain one at http://mozilla.org/MPL/2.0/.\n"
+	" -\n"
+	" - See the COPYRIGHT file distributed with this work for additional\n"
+	" - information regarding copyright ownership.\n"
 	"-->\n"
 	"\n"
 	"<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" xmlns=\"http://www.w3.org/1999/xhtml\" version=\"1.0\">\n"
@@ -2311,7 +2311,7 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps,
 	if (dnsrps_enabled) {
 		cfg_obj_log(rpz_obj, named_g_lctx, DNS_RPZ_ERROR_LEVEL,
 			    "\"dnsrps-enable yes\" but"
-			    " with `./configure --enable-dnsrps`");
+			    " without `./configure --enable-dnsrps`");
 		return (ISC_R_FAILURE);
 	}
 #else
@@ -14788,7 +14788,7 @@ isc_result_t
 named_server_dnstap(named_server_t *server, isc_lex_t *lex,
 		    isc_buffer_t **text)
 {
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 	char *ptr;
 	isc_result_t result;
 	isc_boolean_t reopen = ISC_FALSE;
@@ -1600,7 +1600,7 @@ generatexml(named_server_t *server, isc_uint32_t flags,
 	isc_uint64_t udpoutsizestat_values[dns_sizecounter_out_max];
 	isc_uint64_t tcpinsizestat_values[dns_sizecounter_in_max];
 	isc_uint64_t tcpoutsizestat_values[dns_sizecounter_out_max];
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 	isc_uint64_t dnstapstat_values[dns_dnstapcounter_max];
 #endif
 	isc_result_t result;
@@ -1723,7 +1723,7 @@ generatexml(named_server_t *server, isc_uint32_t flags,
 			goto error;
 		TRY0(xmlTextWriterEndElement(writer)); /* resstat */

-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 		if (server->dtenv != NULL) {
 			isc_stats_t *dnstapstats = NULL;
 			TRY0(xmlTextWriterStartElement(writer,
@@ -2395,7 +2395,7 @@ generatejson(named_server_t *server, size_t *msglen,
 	isc_uint64_t udpoutsizestat_values[dns_sizecounter_out_max];
 	isc_uint64_t tcpinsizestat_values[dns_sizecounter_in_max];
 	isc_uint64_t tcpoutsizestat_values[dns_sizecounter_out_max];
-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 	isc_uint64_t dnstapstat_values[dns_dnstapcounter_max];
 #endif
 	stats_dumparg_t dumparg;
@@ -2562,7 +2562,7 @@ generatejson(named_server_t *server, size_t *msglen,
 		else
 			json_object_put(counters);

-#if HAVE_DNSTAP
+#ifdef HAVE_DNSTAP
 		/* dnstap stat counters */
 		if (named_g_server->dtenv != NULL) {
 			isc_stats_t *dnstapstats = NULL;
@@ -15,7 +15,7 @@ setup(name='isc',
      description='Python functions to support BIND utilities',
      url='https://www.isc.org/bind',
      author='Internet Systems Consortium, Inc',
-      author_email='bind9-bugs@isc.org',
+      author_email='info@isc.org',
      license='MPL',
      requires=['ply'],
      packages=['isc'])
@@ -3,25 +3,11 @@ genrandom
 headerdep_test.sh
 nxtify
 sdig
-t_journal
 *_test
-t_atomic
-t_db
 gsstest
-t_dst
-t_hashes
-t_master
-t_mem
-t_names
-t_net
-t_rbt
-t_resolver
-t_sockaddr
 conf.sh
 dlopen
 keycreate
 keydelete
 gssapi_krb
-t_tasks
-t_timers
 makejournal
@@ -32,239 +32,35 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@

 LIBS =		@LIBS@

-SUBDIRS =	atomic db dst master mem hashes names \
-		net rbt resolver sockaddr tasks timers system \
-		@PKCS11_TOOLS@
-
+SUBDIRS =	system @PKCS11_TOOLS@
 TESTDIRS =	system

 # Test programs that are built by default:
 # cfg_test is needed for regenerating doc/misc/options
 # makejournal is needed by system tests
+# wire_test is needed for fuzz testing
+# other opptional test programs have been moved to ./optional

 # Alphabetically
-TARGETS =	@XTARGETS@ cfg_test@EXEEXT@ makejournal@EXEEXT@ \
-		wire_test@EXEEXT@
+XTARGETS =	all_tests
+TARGETS =	cfg_test@EXEEXT@ makejournal@EXEEXT@ \
+		wire_test@EXEEXT@ @XTARGETS@

-# All the other tests are optional and not built by default.
-
-# Alphabetically
-XTARGETS =	adb_test@EXEEXT@ \
-		byaddr_test@EXEEXT@ \
-		backtrace_test@EXEEXT@ \
-		backtrace_test_nosymtbl@EXEEXT@ \
-		byname_test@EXEEXT@ \
-		db_test@EXEEXT@ \
-		entropy_test@EXEEXT@ \
-		entropy2_test@EXEEXT@ \
-		hash_test@EXEEXT@ \
-		fsaccess_test@EXEEXT@ \
-		inter_test@EXEEXT@ \
-		keyboard_test@EXEEXT@ \
-		lex_test@EXEEXT@ \
-		lfsr_test@EXEEXT@ \
-		log_test@EXEEXT@ \
-		master_test@EXEEXT@ \
-		mempool_test@EXEEXT@ \
-		name_test@EXEEXT@ \
-		nsecify@EXEEXT@ \
-		ratelimiter_test@EXEEXT@ \
-		rbt_test@EXEEXT@ \
-		rwlock_test@EXEEXT@ \
-		serial_test@EXEEXT@ \
-		shutdown_test@EXEEXT@ \
-		sig0_test@EXEEXT@ \
-		sock_test@EXEEXT@ \
-		sym_test@EXEEXT@ \
-		task_test@EXEEXT@ \
-		timer_test@EXEEXT@ \
-		wire_test@EXEEXT@ \
-		zone_test@EXEEXT@
-
-# Alphabetically
-SRCS =		cfg_test.c makejournal.c wire_test.c ${XSRCS}
-
-XSRCS =		adb_test.c \
-		byaddr_test.c \
-		backtrace_test.c \
-		byname_test.c \
-		db_test.c \
-		entropy_test.c \
-		entropy2_test.c \
-		hash_test.c \
-		fsaccess_test.c \
-		inter_test.c \
-		keyboard_test.c \
-		lex_test.c \
-		lfsr_test.c \
-		log_test.c \
-		master_test.c \
-		mempool_test.c \
-		name_test.c \
-		nsecify.c \
-		ratelimiter_test.c \
-		rbt_test.c \
-		rwlock_test.c \
-		serial_test.c \
-		shutdown_test.c \
-		sig0_test.c \
-		sock_test.c \
-		sym_test.c \
-		task_test.c \
-		timer_test.c \
-		wire_test.c \
-		zone_test.c
+SRCS =		cfg_test.c makejournal.c wire_test.c

@BIND9_MAKE_RULES@

-# disable optimization for backtrace test to get the expected result
-BTTEST_CFLAGS =	${BACKTRACECFLAGS} ${EXT_CFLAGS} ${ALL_CPPFLAGS} -g \
-		${ALWAYS_WARNINGS} ${STD_CWARNINGS} ${CWARNINGS}
+.NOTPARALLEL:

-all_tests: ${XTARGETS}
-
-adb_test@EXEEXT@: adb_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ adb_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-backtrace_test_nosymtbl@EXEEXT@: ${srcdir}/backtrace_test.c ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} -o $@ \
-	${srcdir}/backtrace_test.c ${ISCLIBS} ${LIBS}
-
-backtrace_test@EXEEXT@: ${srcdir}/backtrace_test.c backtrace_test_nosymtbl@EXEEXT@
-	#first step: create a first symbol table
-	rm -f symtbl.c
-	if test X${MKSYMTBL_PROGRAM} != X; then \
-	${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl \
-	backtrace_test_nosymtbl@EXEEXT@; else \
-	cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi
-	#second step: build a binary with the first symbol table
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \
-	-o $@0 ${srcdir}/backtrace_test.c symtbl.c \
-	${ISCNOSYMLIBS} ${LIBS}
-	rm -f symtbl.c
-	#third step: create a second symbol table
-	if test X${MKSYMTBL_PROGRAM} != X; then \
-	${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl $@0; else \
-	cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi
-	#fourth step: build the final binary
-	rm -f $@0
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \
-	-o $@ ${srcdir}/backtrace_test.c symtbl.c ${ISCNOSYMLIBS} ${LIBS}
-	rm -f symtbl.c
-
-nsecify@EXEEXT@: nsecify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsecify.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-byaddr_test@EXEEXT@: byaddr_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byaddr_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-byname_test@EXEEXT@: byname_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byname_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-lex_test@EXEEXT@: lex_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lex_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-lfsr_test@EXEEXT@: lfsr_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lfsr_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-log_test@EXEEXT@: log_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ log_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-name_test@EXEEXT@: name_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ name_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ hash_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-entropy_test@EXEEXT@: entropy_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-entropy2_test@EXEEXT@: entropy2_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy2_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-sock_test@EXEEXT@: sock_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sock_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-sym_test@EXEEXT@: sym_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sym_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-task_test@EXEEXT@: task_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ task_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-shutdown_test@EXEEXT@: shutdown_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ shutdown_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-timer_test@EXEEXT@: timer_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ timer_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-ratelimiter_test@EXEEXT@: ratelimiter_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ratelimiter_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-rbt_test@EXEEXT@: rbt_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rbt_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-rwlock_test@EXEEXT@: rwlock_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rwlock_test.@O@ \
-		${ISCLIBS} ${LIBS}
+.PHONY:
+all_tests:
+	echo "making depend in `pwd`/optional"; \
+	(cd optional; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@)

 wire_test@EXEEXT@: wire_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ wire_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}

-master_test@EXEEXT@: master_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ master_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-db_test@EXEEXT@: db_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ db_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-mempool_test@EXEEXT@: mempool_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ mempool_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-serial_test@EXEEXT@: serial_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ serial_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-zone_test@EXEEXT@: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-fsaccess_test@EXEEXT@: fsaccess_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ fsaccess_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-inter_test@EXEEXT@: inter_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ inter_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-keyboard_test@EXEEXT@: keyboard_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ keyboard_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-sig0_test@EXEEXT@: sig0_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sig0_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
 cfg_test@EXEEXT@: cfg_test.@O@ ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ cfg_test.@O@ \
 		${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS}
@@ -277,9 +73,8 @@ distclean::
 	rm -f headerdep_test.sh

 clean distclean::
-	rm -f ${TARGETS} ${XTARGETS}
-	rm -f t_journal
-	rm -f backtrace_test_symtbl.c
+	rm -f ${TARGETS}
+	( cd optional; $(MAKE) $@)

 check: test

@@ -1,47 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-srcdir =	@srcdir@
-VPATH =		@srcdir@
-top_srcdir =	@top_srcdir@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
-
-CDEFINES =
-CWARNINGS =
-
-ISCLIBS =	../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
-
-ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-
-DEPLIBS =	${ISCDEPLIBS}
-
-LIBS =		${ISCLIBS} @LIBS@
-
-TLIB =		../../../lib/tests/libt_api.@A@
-
-TARGETS =	t_atomic@EXEEXT@
-
-SRCS =		t_atomic.c
-
-@BIND9_MAKE_RULES@
-
-t_atomic@EXEEXT@: t_atomic.@O@ ${DEPLIBS} ${TLIB}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ t_atomic.@O@ ${TLIB} ${LIBS}
-
-test: t_atomic@EXEEXT@
-	-@./t_atomic@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a
-
-testhelp:
-	@./t_atomic@EXEEXT@ -h
-
-clean distclean::
-	rm -f ${TARGETS}
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_atomic.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|@PLATFORM@">
-      <Configuration>Debug</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|@PLATFORM@">
-      <Configuration>Release</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EC6ECB35-58C0-48EC-BAC9-9A652D9406C9}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>t_atomic</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <StringPooling>true</StringPooling>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_atomic.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
@@ -1,57 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-# $Id: b8t.mk,v 1.11 2007/06/19 23:46:59 tbox Exp $
-
-#
-# bind 8 multi-host make
-# PLATFORM set in the environment by cron
-#
-
-MODULE	= bind
-BASE	= /build
-BDIR	= $(BASE)/$(MODULE)
-RDIR	= /proj/build-reports/bind8/hosts/$(PLATFORM)
-SDIR	= $(HOME)/b8t/src
-CVSROOT	= /proj/cvs/isc
-
-all:	clobber populate config build
-
-clobber:
-	@echo "CLOBBBER `date`"
-	@if test ! -d $(BASE) ; then mkdir -p $(BASE) ; fi
-	@rm -fr $(BDIR)
-	@echo "DONE `date`"
-
-populate:
-	@echo "POPULATE `date`"
-	@( cd $(BASE) && tar -xvf $(SDIR)/$(MODULE).tar ) > $(RDIR)/.populate 2>&1
-	@echo "DONE `date`"
-
-tarsrc:
-	@echo "TARSRC `date`"
-	@rm -fr $(SDIR)/$(MODULE)
-	@( cd $(SDIR) && cvs -d $(CVSROOT) checkout $(MODULE) )
-	@( cd $(SDIR) && tar -cvf $(MODULE).tar $(MODULE) )
-	@echo "DONE `date`"
-
-config:
-	@echo "CONFIG `date`"
-	@( cd $(BDIR)/src && make SRC=$(BDIR)/src DST=$(BDIR)/dst links ) > $(RDIR)/.config 2>&1
-	@echo "DONE `date`"
-
-build:
-	@echo "BUILD `date`"
-	@( cd $(BDIR)/dst && make -k clean depend all ) > $(RDIR)/.build 2>&1
-	@echo "DONE `date`"
-
-test:
-	@echo "TEST `date`"
-	@touch $(RDIR)/.test
-	@echo "DONE `date`"
@@ -1,62 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-# $Id: b9t.mk,v 1.13 2007/06/19 23:46:59 tbox Exp $
-
-#
-# makefile to configure, build and test bind9
-# this is run by cron (user wpk) on aa, sol, irix, hp and aix
-# $PLATFORM is set in the environment by cron
-#
-
-BASE	= /build
-BDIR	= $(BASE)
-MODULE	= bind9
-SDIR	= $(HOME)/b9t/src
-
-# as it says
-CVSROOT	= /proj/cvs/isc
-
-# where the config, build and test output goes
-RDIR	= /proj/build-reports/$(MODULE)/hosts/$(PLATFORM)
-
-all:	clobber populate config build test
-
-clobber:
-	@echo "CLOBBBER `date`"
-	@if test ! -d $(BDIR) ; then mkdir -p $(BDIR) > /dev/null 2>&1 ; fi
-	@( cd $(BDIR) && rm -fr $(MODULE) )
-	@echo "DONE `date`"
-
-populate:
-	@echo "POPULATE `date`"
-	@( cd $(BDIR) && tar -xvf $(SDIR)/$(MODULE).tar ) > $(RDIR)/.populate 2>&1
-	@echo "DONE `date`"
-
-config:
-	@echo "CONFIG `date`"
-	@( cd $(BDIR)/$(MODULE) && ./configure ) > $(RDIR)/.config 2>&1
-	@echo "DONE `date`"
-
-build:
-	@echo "BUILD `date`"
-	@( cd $(BDIR)/$(MODULE) && $(MAKE) -k all ) > $(RDIR)/.build 2>&1
-	@echo "DONE `date`"
-
-test:
-	@echo "TEST `date`"
-	-@( cd $(BDIR)/$(MODULE)/bin/tests && $(MAKE) test ) > $(RDIR)/.test 2>&1
-	@echo "DONE `date`"
-
-tarsrc:
-	@echo "TARSRC `date`"
-	@rm -fr $(SDIR)/$(MODULE)
-	@( cd $(SDIR) && cvs -d $(CVSROOT) checkout $(MODULE) && tar -cvf $(MODULE).tar $(MODULE) )
-	@echo "DONE `date`"
-
@@ -1,11 +1,6 @@
-Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")

-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.

 	bash buildzones.sh < zones	# creates setup, run, servers/* master/*
 					# named.conf
@@ -1,52 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-srcdir =	@srcdir@
-VPATH =		@srcdir@
-top_srcdir =	@top_srcdir@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} \
-		${ISC_INCLUDES} @DST_OPENSSL_INC@
-
-CDEFINES =	@CRYPTO@
-CWARNINGS =
-
-DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =	../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
-ISCCFGLIBS = 	../../../lib/isccfg/libisccfg.@A@
-
-DNSDEPLIBS =	../../../lib/dns/libdns.@A@
-ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCCFGDEPLIBS = ../../../lib/isccfg/libisccfg.@A@
-
-DEPLIBS =	${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
-
-LIBS =		${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
-
-TLIB =		../../../lib/tests/libt_api.@A@
-
-SRCS =		t_db.c
-
-TARGETS =	t_db@EXEEXT@
-
-@BIND9_MAKE_RULES@
-
-t_db@EXEEXT@: t_db.@O@ ${DEPLIBS} ${TLIB}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ t_db.@O@ ${TLIB} ${LIBS}
-
-test: t_db@EXEEXT@
-	-@./t_db@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a
-
-testhelp:
-	@./t_db -h
-
-clean distclean::
-	rm -f ${TARGETS}
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,9 +0,0 @@
-#
-# test data for dns_db_class
-#
-# format:
-# filename class
-#
-#
-dns_db_class_1.data	in
-#	dns_db_class_1.data	any
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_closeversion test 1
-#
-# format:
-# filename type origin class cache new_name new_type existing_name existing_type
-#
-dns_db_closeversion_1.data	rbt	vix.com.	in	zone	a.b.c.vix.com.	A	a.vix.com.	NS
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_closeversion test 2
-#
-# format:
-# filename type origin class cache new_name new_type existing_name existing_type
-#
-dns_db_closeversion_1.data	rbt	vix.com.	in	zone	a.b.c.vix.com.	A	a.vix.com.	NS
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a.b.c.vix.com.		a	1.2.3.4
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_currentversion
-#
-# format:
-#	filename findname findtype
-#
-dns_db_currentversion.data	rbt	vix.com.	IN	zone	a.b.c.vix.com.	A
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_expirenode
-#
-# format:
-# filename type origin class existing_name existing_type
-#
-dns_db_expirenode.data	rbt	vix.com.	in	a.vix.com.	10000	0	ISC_R_NOTFOUND
@@ -1,12 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
-a.b.c		in	ns	b
@@ -1,10 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-
-a.b.c		in	NS	ns1.vix.com.
-a.b.c		in	A	1.2.3.4
@@ -1,8 +0,0 @@
-#
-# test data for dns_db_find expiration time handling
-#
-# format:
-#	dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results
-#
-dns_db_find_10.data	rbt	vix.com.	in	cache	a.b.c.vix.com.	NS	0	1010	ISC_R_NOTFOUND
-dns_db_find_10.data	rbt	vix.com.	in	cache	a.b.c.vix.com.	NS	0	0	ISC_R_SUCCESS
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_find best match
-#
-# format:
-#	dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results
-#
-dns_db_find_1.data	rbt	vix.com.	in	zone	a.b.c.vix.com.	NS	DNS_DB_GLUEOK	0	DNS_R_DELEGATION
@@ -1,9 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-fx		in	ns	a.fx.vix.com.
-a.fx		in	a	1.2.3.4
@@ -1,9 +0,0 @@
-#
-# test data for dns_db_find DNS_R_GLUE
-#
-# format:
-#	dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results
-#
-dns_db_find_2.data	rbt	vix.com.	in	zone	a.fx.vix.com.	A	DNS_DBFIND_GLUEOK	0	DNS_R_GLUE
-dns_db_find_2.data	rbt	vix.com.	in	zone	fx.vix.com.	NS	DNS_DBFIND_GLUEOK	0	DNS_R_GLUE
-dns_db_find_2.data	rbt	vix.com.	in	zone	a.fx.vix.com.	NS	DNS_DBFIND_GLUEOK	0	DNS_R_DELEGATION
@@ -1,10 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a.b.c		in	ns	b
-a.a.b.c		in	a	10.0.0.1
-b		in	a	10.0.0.2
@@ -1,9 +0,0 @@
-#
-# test data for dns_db_find DNS_R_DELAGATION
-#
-# format:
-#	dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results
-#
-dns_db_find_3.data	rbt	vix.com.	in	zone	a.b.c.vix.com.	NS	DNS_DB_GLUEOK	0	DNS_R_DELEGATION
-dns_db_find_3.data	rbt	vix.com.	in	zone	a.a.b.c.vix.com.	NS	DNS_DB_GLUEOK	0	DNS_R_DELEGATION
-dns_db_find_3.data	rbt	vix.com.	in	zone	a.a.b.c.vix.com.	A	DNS_DB_GLUEOK	0	DNS_R_DELEGATION
@@ -1,9 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a.b.c		in	ns	b
-b.a.b.c		in	a	10.0.0.2
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_find DNS_R_DELEGATION
-#
-# format:
-#	dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results
-#
-dns_db_find_4.data	rbt	vix.com.	in	zone	a.b.c.vix.com.	ANY	0	0	DNS_R_DELEGATION
@@ -1,10 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a.b.c		in	DNAME	x.y.z
-a.x.y.z		in	A	1.2.3.4
-
@@ -1,8 +0,0 @@
-#
-# test data for dns_db_find DNS_R_DNAME
-#
-# format:
-#	dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results
-#
-dns_db_find_5.data	rbt	vix.com.	in	zone	x.a.b.c.vix.com.	ANY	0	0	DNS_R_DNAME
-dns_db_find_5.data	rbt	vix.com.	in	zone	a.a.b.c.vix.com.	ANY	0	0	DNS_R_DNAME
@@ -1,10 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-exploder	in	CNAME	mx
-mx		in	A	1.2.3.4
-
@@ -1,8 +0,0 @@
-#
-# test data for dns_db_find DNS_R_CNAME
-#
-# format:
-#	dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results
-#
-dns_db_find_6.data	rbt	vix.com.	in	zone	exploder.vix.com.	A	0	0	DNS_R_CNAME
-dns_db_find_6.data	rbt	vix.com.	in	zone	exploder.vix.com.	ANY	0	0	ISC_R_SUCCESS
@@ -1,12 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-
-a.b.c.d		in	A	1.2.3.4
-a.b		in	A	1.2.3.4
-a		in	NS	ns1.vix.com.
-
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_find DNS_R_NXDOMAIN
-#
-# format:
-#	dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results
-#
-dns_db_find_7.data	rbt	vix.com.	in	zone	a.b.c.vix.com.	ANY	0	0	DNS_R_NXDOMAIN
@@ -1,13 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-
-a.b.c.d		in	A	1.2.3.4
-a.b.c		in	A	1.2.3.4
-a.b		in	A	1.2.3.4
-a		in	NS	ns1.vix.com.
-
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_find DNS_R_NXRRSET
-#
-# format:
-#	dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results
-#
-dns_db_find_8.data	rbt	vix.com.	in	zone	a.b.c.vix.com.	NS	0	0	DNS_R_NXRRSET
@@ -1,13 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-
-a.b.c.d		in	NS	ns1.vix.com.
-a.b.c		in	A	1.2.3.4
-a.b		in	NS	ns1.vix.com.
-a		in	NS	ns1.vix.com.
-
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_find ISC_R_NOTFOUND
-#
-# format:
-#	dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results
-#
-dns_db_find_9.data	rbt	vix.com.	in	cache	a.b.c.vix.com.	NS	0	0	ISC_R_NOTFOUND
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,9 +0,0 @@
-#
-# test data for dns_db_findnode, case ISC_R_SUCCESS
-#
-# format:
-# filename type origin class cache existingname rdatatype
-#
-dns_db_findnode_1.data	rbt	vix.com.	in	zone	a.vix.com.	NS	ISC_R_SUCCESS
-dns_db_findnode_1.data	rbt	vix.com.	in	zone	b.vix.com.	A	ISC_R_SUCCESS
-dns_db_findnode_1.data	rbt	vix.com.	in	zone	c.vix.com.	A	ISC_R_NOTFOUND
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_findnode 2
-#
-# format:
-# filename type origin class cache newname
-#
-dns_db_findnode_2.data	rbt	vix.com.	in	zone	a.b.c.vix.com.
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_iscache test 1
-#
-# format:
-# filename db_type origin class
-#
-dns_db_iscache_1.data	rbt	.	in
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_iscache test 1
-#
-# format:
-# filename db_type origin class
-#
-dns_db_iscache_2.data	rbt	.	in
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_iszone test 1
-#
-# format:
-# filename db_type origin class
-#
-dns_db_iszone_1.data	rbt	.	in
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_iszone test 2
-#
-# format:
-# filename db_type origin class
-#
-dns_db_iszone_2.data	rbt	.	in
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,6 +0,0 @@
-$TTL 5
-@ 	IN	SOA	ns1 hostmaster 1 3600 1200 3600000 3600
-@	IN	NS	ns1
-ns1	IN	A	10.0.0.1
-sub 	IN	SOA	ns2 hostmaster 1 3600 1200 3600000 3600
-ns2	IN	A	10.0.0.2
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_load
-#
-# format:
-# filename type origin cache class findname expected_result
-#
-dns_db_load_1.data	rbt	.	zone	in	ISC_R_SUCCESS	a.	A	DNS_R_DELEGATION
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_load_soa_not_top
-#
-# format:
-# filename type origin cache class findname expected_result
-#
-dns_db_load_25.data	rbt	.	zone	in	DNS_R_NOTZONETOP	a.	A	DNS_R_DELEGATION
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,7 +0,0 @@
-#
-# test data for dns_db_newversion
-#
-# format:
-# filename type origin class cache newname newtype
-#
-dns_db_newversion.data	rbt	vix.com.	in	zone	a.b.c.vix.com.	A
@@ -1,11 +0,0 @@
-$TTL 1000
-@		in	soa	localhost. postmaster.localhost. (
-				1993050801	;serial
-				3600		;refresh
-				1800		;retry
-				604800		;expiration
-				3600 )		;minimum
-a		in	ns	ns.vix.com.
-a		in	ns	ns2.vix.com.
-a		in	ns	ns3.vix.com.
-b		in	a	1.2.3.4
@@ -1,8 +0,0 @@
-#
-# test data for dns_db_origin
-#
-# format:
-#	filename origin
-#
-dns_db_origin_1.data	.
-dns_db_origin_1.data	vix.com.
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_db.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|@PLATFORM@">
-      <Configuration>Debug</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|@PLATFORM@">
-      <Configuration>Release</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E6338E67-3224-4E66-9463-7AD719DA9346}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>t_db</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\isccfg\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libisccfg.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <StringPooling>true</StringPooling>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\isccfg\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libisccfg.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_db.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-# $Id: run-test.sh,v 1.3 2009/06/04 02:56:47 tbox Exp $
-
-
-sign="../../dnssec/dnssec-signzone -f signed.zone -o example.com."
-
-signit() {
-	rm -f signed.zone
-	grep '^;' $zone
-	$sign $zone
-}
-
-expect_success() {
-	if ! test -f signed.zone ; then
-		echo "Error: expected success, but sign failed for $zone."
-	else
-		echo "Success:  Sign succeeded for $zone."
-	fi
-}
-
-expect_failure() {
-	if test -f signed.zone ; then
-		echo "Error: expected failure, but sign succeeded for $zone."
-	else
-		echo "Success:  Sign failed (expected) for $zone"
-	fi
-}
-
-zone="test1.zone" ; signit ; expect_success
-zone="test2.zone" ; signit ; expect_failure
-zone="test3.zone" ; signit ; expect_failure
-zone="test4.zone" ; signit ; expect_success
-zone="test5.zone" ; signit ; expect_failure
-zone="test6.zone" ; signit ; expect_failure
-zone="test7.zone" ; signit ; expect_failure
-zone="test8.zone" ; signit ; expect_failure
@@ -1,9 +0,0 @@
-;
-;	This is a zone which has two DNSKEY records, both of which have
-; existing private key files available.  They should be loaded automatically
-; and the zone correctly signed.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+005+07065.key
-$include Kexample.com.+005+23362.key
@@ -1,8 +0,0 @@
-;
-;	This is a zone which has one non-KSK DNSKEY record for which the
-; private key file exists.  It should be loaded automatically and the zone
-; correctly signed.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+005+07065.key
@@ -1,8 +0,0 @@
-;
-;       This is a zone which has one KSK DNSKEY record for which the
-; private key file exists.  It should be loaded automatically.  As there
-; is no non-KSK DNSKEY the resulting zone should be rejected.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+005+23362.key
@@ -1,10 +0,0 @@
-;
-;	This is a zone which has three DNSKEY records, two (KSK + ZSK) of
-; which have existing private key files available.  The third is a 
-; pre-published ZSK.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+005+07065.key
-$include Kexample.com.+005+23362.key
-$include bogus-zsk.key
@@ -1,9 +0,0 @@
-;
-;	This is a zone which has three DNSKEY records, two (KSK +ZSK) of which
-; have existing private key files available.  The third is a KSK.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+005+07065.key
-$include Kexample.com.+005+23362.key
-$include bogus-ksk.key
@@ -1,9 +0,0 @@
-;
-;	This is a zone which has two DNSKEY records, none of which have 
-; existing private key files available.  The resulting zone should fail
-; the consistancy tests.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include bogus-ksk.key
-$include bogus-zsk.key
@@ -1,9 +0,0 @@
-;
-;	This is a zone which has two DNSKEY records, one of which,
-; the KSK, has a private key.  The resulting zone should be rejected as
-; it has no ZSK signatures.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+005+23362.key
-$include bogus-zsk.key
@@ -1,16 +0,0 @@
-randomfile
-Kdh.+002+18602.key
-Kdh.+002+18602.private
-Kdh.+002+48957.key
-Kdh.+002+48957.private
-Ktest.+001+00002.key
-Ktest.+001+54622.key
-Ktest.+001+54622.private
-Ktest.+003+23616.key
-Ktest.+003+23616.private
-Ktest.+003+49667.key
-dst_2_data
-t2_data_1
-t2_data_2
-t2_dsasig
-t2_rsasig
@@ -1 +0,0 @@
-dh. IN KEY 0 2 2 AAEBAAAAYIHI/wjtOagNga9GILSoS02IVelgLilPE/TfhtvShsiDAXqb IfxQcj2JkuOnNLs5ttb2WZXWl5/jsSjIxHMwMF2XY4gwt/lwHBf/vgYH r7aIxnKXov1jk9rymTLHGKIOtg==
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`dh. IN KEY 0 2 2 AAEBAAAAYIHI/wjtOagNga9GILSoS02IVelgLilPE/TfhtvShsiDAXqb IfxQcj2JkuOnNLs5ttb2WZXWl5/jsSjIxHMwMF2XY4gwt/lwHBf/vgYH r7aIxnKXov1jk9rymTLHGKIOtg==`