Minor tone edits during review with Vicky

Fixup the manpages after ddns-confgen.rst -> tsig-keygen.rst rename

See merge request isc-projects/bind9!3817

.gitignore

@@ -4,11 +4,13 @@
 *.gcno
 *.la
 *.lo
+*.log
 *.o
 *.orig
 *.plist/ # ccc-analyzer store its results in .plist directories
 *.rej
 *.so
+*.trs
 *_test
 *.ipch # vscode/intellisense precompiled header
 *~
@@ -52,6 +54,7 @@ __pycache__/
 /stamp-h1
 /test-driver
 Makefile
+Makefile.in
 ans.run
 gen.dSYM/
 kyua.log
@@ -63,3 +66,4 @@ timestamp
 /cppcheck.results
 /tsan
 /util/check-make-install
+/INSTALL

.gitlab-ci.yml

@@ -27,10 +27,12 @@ variables:
   ASAN_OPTIONS_COMMON: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
   TSAN_OPTIONS_COMMON: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-10/bin/llvm-symbolizer"
 
-  TARBALL_COMPRESSOR: xz
   TARBALL_EXTENSION: xz
 
+  AM_COLOR_TESTS: always
+
 stages:
+  - autoconf
   - precheck
   - build
   - unit
@@ -167,7 +169,7 @@ stages:
 .autoconf: &autoconf_job
   <<: *release_branch_triggering_rules
   <<: *base_image
-  stage: precheck
+  stage: autoconf
   script:
     - autoreconf -fi
   artifacts:
@@ -179,12 +181,12 @@ stages:
     --disable-maintainer-mode \
     --enable-developer \
     --with-libtool \
-    --disable-static \
     --with-cmocka \
     --with-libxml2 \
     --with-json-c \
     --prefix=$HOME/.local \
     --without-make-clean \
+    --with-python=python3 \
     $EXTRA_CONFIGURE \
     || cat config.log
 
@@ -196,10 +198,10 @@ stages:
     - test -n "${OOT_BUILD_WORKSPACE}" && mkdir "${OOT_BUILD_WORKSPACE}" && cd "${OOT_BUILD_WORKSPACE}"
   script:
     - *configure
-    - make depend | grep "error:" && exit 1
     - make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
     - test -z "${RUN_MAKE_INSTALL}" || make install
     - test -z "${RUN_MAKE_INSTALL}" || sh util/check-make-install
+    - if test "$(git status --porcelain | grep -Ev '\?\?' | wc -l)" -gt "0"; then git status --short; exit 1; fi
   needs:
     - job: autoreconf
       artifacts: true
@@ -234,6 +236,7 @@ stages:
   artifacts:
     untracked: true
     expire_in: "1 day"
+    when: always
 
 .setup_interfaces: &setup_interfaces |
     if [ "$(id -u)" -eq "0" ]; then
@@ -253,8 +256,10 @@ stages:
     - *setup_interfaces
     - *setup_softhsm
   script:
-    - ( cd bin/tests/system && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1 )
-    - test -s bin/tests/system/systests.output
+    - cd bin/tests/system
+    - make -j${TEST_PARALLEL_JOBS:-1} -k check V=1 || make -j${TEST_PARALLEL_JOBS:-1} -k recheck V=1
+  after_script:
+    - cat bin/tests/system/test-suite.log
 
 .system_test: &system_test_job
   <<: *system_test_common
@@ -267,6 +272,7 @@ stages:
   <<: *system_test_common
   allow_failure: true
   after_script:
+    - cat bin/tests/system/test-suite.log
     - find bin -name 'tsan.*' -exec python3 util/parse_tsan.py {} \;
   artifacts:
     expire_in: "1 day"
@@ -313,9 +319,7 @@ stages:
   before_script:
     - *setup_softhsm
   script:
-    - make unit
-  after_script:
-    - *kyua_report_html
+    - make -j${TEST_PARALLEL_JOBS:-1} -k unit V=1
 
 .unit_test: &unit_test_job
   <<: *unit_test_common
@@ -328,16 +332,12 @@ stages:
   <<: *unit_test_common
   allow_failure: true
   after_script:
-    - *kyua_report_html
     - find lib -name 'tsan.*' -exec python3 util/parse_tsan.py {} \;
   artifacts:
     expire_in: "1 day"
     paths:
       - lib/*/tests/tsan.*
       - tsan/
-      - kyua.log
-      - kyua.results
-      - kyua_html/
     when: on_failure
 
 .cppcheck_args: &run_cppcheck |
@@ -381,7 +381,6 @@ autoreconf:
 misc:
   <<: *precheck_job
   script:
-    - sh util/check-ans-prereq.sh
     - sh util/checklibs.sh > checklibs.out
     - sh util/tabify-changes < CHANGES > CHANGES.tmp
     - diff -urNap CHANGES CHANGES.tmp
@@ -462,16 +461,15 @@ tarball-create:
   stage: precheck
   <<: *base_image
   script:
-    - source version
-    - export BIND_DIRECTORY="bind-${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}"
-    - git archive --prefix="${BIND_DIRECTORY}/" --output="${BIND_DIRECTORY}.tar" HEAD
-    - mkdir "${BIND_DIRECTORY}"
-    - echo "SRCID=$(git rev-list --max-count=1 HEAD | cut -b1-7)" > "${BIND_DIRECTORY}/srcid"
-    - tar --append --file="${BIND_DIRECTORY}.tar" "${BIND_DIRECTORY}/srcid"
-    - ${TARBALL_COMPRESSOR} "${BIND_DIRECTORY}.tar"
+    - *configure
+    - make -j${BUILD_PARALLEL_JOBS:-1} all V=1
+    - make -j${BUILD_PARALLEL_JOBS:-1} dist V=1
   artifacts:
     paths:
       - bind-*.tar.${TARBALL_EXTENSION}
+  needs:
+    - job: autoreconf
+      artifacts: true
   only:
     - tags
 
@@ -484,14 +482,8 @@ docs:
   before_script:
     - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
     - test -n "${OOT_BUILD_WORKSPACE}" && mkdir "${OOT_BUILD_WORKSPACE}" && cd "${OOT_BUILD_WORKSPACE}"
-    - pip3 install pytest requests || pip install pytest requests || true
-    - pip3 install sphinx sphinx_rtd_theme || pip install sphinx sphinx_rtd_theme
-    - apt -yqqq update
-    - apt -yqqq dist-upgrade
-    - apt -yqqq install texlive-full texlive-xetex latexmk xindy
   script:
     - *configure
-    - make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
     - make -j${BUILD_PARALLEL_JOBS:-1} -k doc V=1
   needs:
     - job: autoreconf
@@ -546,7 +538,7 @@ gcc:centos6:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--with-libidn2 --disable-warn-error"
+    EXTRA_CONFIGURE: "--with-libidn2 --disable-warn-error --without-python"
   <<: *centos_centos6_amd64_image
   <<: *build_job
 
@@ -829,7 +821,7 @@ gcc:tumbleweed:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--with-libidn2 --with-gssapi=/usr/lib/mit/bin/krb5-config"
+    EXTRA_CONFIGURE: "--with-libidn2 --with-python --with-gssapi=/usr/lib/mit/bin/krb5-config"
   <<: *tumbleweed_latest_amd64_image
   <<: *build_job
 
@@ -1180,30 +1172,6 @@ system:clang:openbsd6.7:amd64:
     - schedules
     - web
 
-# Jobs with libtool disabled
-
-nolibtool:sid:amd64:
-  variables:
-    CC: gcc
-    CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--with-libidn2 --without-libtool --with-dlopen"
-  <<: *debian_sid_amd64_image
-  <<: *build_job
-
-system:nolibtool:sid:amd64:
-  <<: *debian_sid_amd64_image
-  <<: *system_test_job
-  needs:
-    - job: nolibtool:sid:amd64
-      artifacts: true
-
-unit:nolibtool:sid:amd64:
-  <<: *debian_sid_amd64_image
-  <<: *unit_test_job
-  needs:
-    - job: nolibtool:sid:amd64
-      artifacts: true
-
 # Jobs for Visual Studio 2017 builds on Windows (amd64)
 
 msvc:windows:amd64:
@@ -1243,9 +1211,7 @@ release:
   <<: *base_image
   stage: release
   script:
-    # Determine BIND version
-    - source version
-    - export BIND_DIRECTORY="bind-${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}"
+    - export BIND_DIRECTORY="$(basename "$(find . -name "bind-*.tar.*" -printf "%f")" ".tar.${TARBALL_EXTENSION}")"
     # Remove redundant files and system test utilities from Windows build artifacts
     - find Build/Release/ -name "*.pdb" -print -delete
     - find Build/Debug/ \( -name "*.bsc" -o -name "*.idb" \) -print -delete
@@ -1259,10 +1225,11 @@ release:
     - pushd release
     - mv "../${BIND_DIRECTORY}.tar.${TARBALL_EXTENSION}" ../BIND*.zip .
     - tar --extract --file="${BIND_DIRECTORY}.tar.${TARBALL_EXTENSION}"
-    - mv "${BIND_DIRECTORY}"/{CHANGES*,COPYRIGHT,LICENSE,README,srcid} .
+    - mv "${BIND_DIRECTORY}"/{CHANGES*,COPYRIGHT,LICENSE,README.md,srcid} .
     - rm -rf "${BIND_DIRECTORY}"
     - mv "../doc/arm/_build/html" doc/arm/
     - mv "../doc/arm/_build/latex/Bv9ARM.pdf" doc/arm/
+    - mv "../doc/arm/_build/epub/Bv9ARM.epub" doc/arm/
     - echo '<!DOCTYPE HTML><html lang="en"><meta http-equiv="refresh" content="0; url=doc/arm/html/notes.html"><title>Redirect</title></html>' > "RELEASE-NOTES-${BIND_DIRECTORY}.html"
     - popd
     # Create release tarball
@@ -1351,6 +1318,7 @@ respdiff:
     CFLAGS: "${CFLAGS_COMMON} -Og"
     BIND_BASELINE_VERSION: v9_11_3
   script:
+    - autoreconf -fi
     - ./configure --without-make-clean
     - make -j${BUILD_PARALLEL_JOBS:-1} V=1
     - *setup_interfaces
@@ -1384,12 +1352,13 @@ abi-check:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
-    BIND_BASELINE_VERSION: v9_16_4
+    BIND_BASELINE_VERSION: v9_17_2
   script:
     - *configure
     - make -j${BUILD_PARALLEL_JOBS:-1} V=1
     - git clone --branch "${BIND_BASELINE_VERSION}" --depth 1 https://gitlab.isc.org/isc-projects/bind9.git refbind
     - cd refbind/
+    - autoreconf -fi
     - *configure
     - make -j${BUILD_PARALLEL_JOBS:-1} V=1
     - cd ..

.gitlab/issue_templates/Release.md

@@ -1,21 +1,28 @@
 ## Release Schedule
 
+**Code Freeze:**
+
 **Tagging Deadline:**
 
 **Public Release:**
 
 ## Release Checklist
 
-## 2 Working Days Before the Tagging Deadline
+### Before the Code Freeze
 
+ - [ ] ***(QA)*** Inform Support and Marketing of impending release (and give estimated release dates).
+ - [ ] ***(QA)*** Ensure there are no permanent test failures on any platform.
+ - [ ] ***(QA)*** Check Perflab to ensure there has been no unexplained drop in performance for the versions being released.
  - [ ] ***(QA)*** Check whether all issues assigned to the release milestone are resolved[^1].
  - [ ] ***(QA)*** Ensure that there are no outstanding merge requests in the private repository[^1] (Subscription Edition only).
  - [ ] ***(QA)*** Ensure all merge requests marked for backporting have been indeed backported.
 
-## Before the Tagging Deadline
+### Before the Tagging Deadline
 
- - [ ] ***(QA)*** Inform Support/Marketing of impending release (and give estimated release dates).
- - [ ] ***(QA)*** Check Perflab to ensure there has been no unexplained drop in performance for the versions being released.
+ - [ ] ***(QA)*** Look for outstanding documentation issues (e.g. `CHANGES` mistakes) and address them if any are found.
+ - [ ] ***(QA)*** Ensure release notes are correct, ask Support and Marketing to check them as well.
+ - [ ] ***(Support)*** Check release notes, ask QA to correct any mistakes found.
+ - [ ] ***(Marketing)*** Check release notes, ask QA to correct any mistakes found.
  - [ ] ***(SwEng)*** Update API files for libraries with new version information.
  - [ ] ***(SwEng)*** Change software version and library versions in `configure.ac` (new major release only).
  - [ ] ***(SwEng)*** Rebuild `configure` using Autoconf on `docs.isc.org`.
@@ -25,12 +32,11 @@
  - [ ] ***(SwEng)*** Update `version`.
  - [ ] ***(SwEng)*** Build documentation on `docs.isc.org`.
  - [ ] ***(QA)*** Check that all the above steps were performed correctly.
- - [ ] ***(QA)*** Check that the contents of release notes match the merge requests comprising the releases.
  - [ ] ***(QA)*** Check that the formatting is correct for text, PDF, and HTML versions of release notes.
  - [ ] ***(SwEng)*** Tag the releases[^2].  (Tags may only be pushed to the public repository for releases which are *not* security releases.)
  - [ ] ***(SwEng)*** If this is the first tag for a release (e.g. beta), create a release branch named `release_v9_X_Y` to allow development to continue on the maintenance branch whilst release engineering continues.
 
-## Before the ASN Deadline (for ASN Releases) or the Public Release Date (for Regular Releases)
+### Before the ASN Deadline (for ASN Releases) or the Public Release Date (for Regular Releases)
 
  - [ ] ***(QA)*** Verify GitLab CI results for the tags created and prepare a QA report for the releases to be published.
  - [ ] ***(QA)*** Request signatures for the tarballs, providing their location and checksums.
@@ -41,7 +47,7 @@
  - [ ] ***(QA)*** Notify Support that the releases have been prepared.
  - [ ] ***(Support)*** Send out ASNs (if applicable).
 
-## On the Day of Public Release
+### On the Day of Public Release
 
  - [ ] ***(Support)*** Wait for clearance from Security Officer to proceed with the public release (if applicable).
  - [ ] ***(Support)*** Place tarballs in public location on FTP site.
@@ -57,8 +63,11 @@
  - [ ] ***(Marketing)*** Update [Wikipedia entry for BIND](https://en.wikipedia.org/wiki/BIND).
  - [ ] ***(Marketing)*** Write blog article (if a major release).
  - [ ] ***(QA)*** Ensure all new tags are annotated and signed.
- - [ ] ***(SwEng)*** Push tags for the published releases to the public repository.
  - [ ] ***(SwEng)*** Merge the automatically prepared `prep 9.X.Y` commit which updates `version` and documentation on the release branch into the relevant maintenance branch (`v9_X`).
+ - [ ] ***(SwEng)*** Push tags for the published releases to the public repository.
+ - [ ] ***(QA)*** For each maintained branch, update the `BIND_BASELINE_VERSION` variable for the `abi-check` job in `.gitlab-ci.yml` to the latest published BIND version tag for a given branch.
+ - [ ] ***(QA)*** Prepare empty release notes for the next set of releases.
+ - [ ] ***(QA)*** Update QA tools used in GitLab CI (e.g. Flake8, PyLint) by modifying the relevant `Dockerfile`.
 
 [^1]: If not, use the time remaining until the tagging deadline to ensure all outstanding issues are either resolved or moved to a different milestone.
 

.lgtm.yml

@@ -0,0 +1,35 @@
+extraction:
+  cpp:
+    prepare:
+      packages:
+      - "libxml2-dev"
+      - "libjson-c-dev"
+      - "libssl-dev"
+      - "zlib1g-dev"
+      - "libcmocka-dev"
+      - "pkg-config"
+      - "libcap2-dev"
+      - "libedit-dev"
+      - "libidn2-dev"
+      - "libmaxminddb-dev"
+      - "libuv1-dev"
+    configure:
+      command:
+      - "autoreconf -fi"
+      - "CFLAGS=\"-Og -g\" ./configure --enable-developer"
+path_classifiers:
+  test:
+    - "lib/*/tests/"
+    - "bin/tests/"
+  docs:
+    - "**/*.xml"
+    - "**/*.docbook"
+    - "**/*.html"
+    - "**/*.1"
+    - "**/*.5"
+    - "**/*.8"
+queries:
+  - exclude: libltdl/
+  - exclude: fuzz/
+  - exclude: "bin/tests/system/*/ans*/*.py"
+  - exclude: cpp/use-of-goto

AUTHORS

@@ -0,0 +1,53 @@
+Mark Andrews
+Andreas Gustafsson
+Evan Hunt
+Brian Wellington
+Bob Halley
+David Lawrence
+Michael Graff
+Michael Sawyer
+Ondřej Surý
+James Brister
+Tatuya JINMEI 神明達哉
+Francis Dupont
+Michał Kępień
+Danny Mayer
+Mukund Sivaraman
+Jeremy C. Reed
+William King
+Stephen Morris
+Witold Kręcicki
+Curtis Blackburn
+Scott Mann
+Rob Austein
+Jim Reid
+Eric Luce
+Olafur Gudmundsson
+Stephen Jacob
+Damien Neil
+Tony Finch
+Jakob Schlyter
+Petr Menšík
+Vernon Schryver
+Matt Nelson
+Shane Kerr
+Paul Ebersman
+Ray Bellis
+Shawn Routhier
+Ben Cottrell
+Tomas Hozza
+johnd
+Bill Parker
+李昶
+Kevin Chen
+Jonathan Casey
+Mary Stahl
+Mathieu Arnold
+David Hankins
+Paul Hoffman
+Paul Vixie
+Brian Conry
+Anay Panvalkar
+colleen
+Robert Edmonds
+João Damas

CHANGES

@@ -1,24 +1,46 @@
-	--- 9.16.5 released ---
+5461.	[bug]		The header STALE attribute was not being updated with
+			the write lock being held leading to incorrect
+			statistics.  Convert the header attributes to use atomic
+			operations. [GL #1475]
+
+5460.	[cleanup]	tsig-keygen was previously an alias for
+			ddns-confgen and was documented in the ddns-confgen
+			man page. This has been reversed; tsig-keygen is
+			now the primary name. [GL #1998]
+
+5459.	[bug]		Bad isc_mem_put() size when an invalid type was
+			specified in a update-policy rule. [GL #1990]
 
 5458.	[bug]		Prevent a theoretically possible NULL dereference caused
 			by a data race between zone_maintenance() and
 			dns_zone_setview_helper(). [GL #1627]
 
-5455.	[bug]		named could crash when cleaning dead nodes in
-			lib/dns/rbtdb.c that were being reused. [GL #1968]
+5457.	[placeholder]
 
-5454.	[bug]		Address a startup crash that occurred when the server
-			was under load and the root zone had not yet been
-			loaded. [GL #1862]
+5456.	[func]		Added "primaries" as a synonym for "masters" in
+			named.conf, and "primary-only" as a synonym for
+			"master-only" in the parameters to "notify",
+			in order to bring terminology up to date with
+			RFC 8499. [GL #1948]
 
-5453.	[bug]		named crashed on shutdown when a new rndc connection was
-			received during shutdown. [GL #1747]
+5455.	[bug]		`named` could crash when cleaning dead nodes
+			in lib/dns/rbtdb.c that have been reused meanwhile.
+			[GL #1968]
 
-5452.	[bug]		The "blackhole" ACL was accidentally disabled for client
-			queries. [GL #1936]
+5454.	[bug]		Address a startup crash happening when server is
+			under load and root zone is not yet loaded. [GL #1862]
+
+5453.	[bug]		`named` would crash on shutdown when new `rndc`
+			connection is received at the same time as
+			shutting down. [GL #1747]
+
+5452.	[bug]		The "blackhole" ACL was accidentally disabled with
+			respect to client queries. [GL #1936]
 
 5451.	[func]		Add 'rndc dnssec -status' command. [GL #1612]
 
+5450.	[placeholder]
+
 5449.	[bug]		Fix a socket shutdown race in netmgr udp. [GL #1938]
 
 5448.	[bug]		Fix a race condition in isc__nm_tcpdns_send().
@@ -31,26 +53,30 @@
 
 5446.	[bug]		The validator could fail to accept a properly signed
 			RRset if an unsupported algorithm appeared earlier in
-			the DNSKEY RRset than a supported algorithm. It could
+			the DNSKEY RRset than a supported algorithm.  It could
 			also stop if it detected a malformed public key.
 			[GL #1689]
 
-5444.	[bug]		'rndc dnstap -roll <value>' did not limit the number of
-			saved files to <value>. [GL !3728]
+5445.	[cleanup]	Disable and disallow static linking. [GL #1933]
+
+5444.	[bug]		'rndc dnstap -roll <value>' was not limiting the
+			number of saved files to <value>. [GL !3728]
 
 5443.	[bug]		The "primary" and "secondary" keywords, when used
 			as parameters for "check-names", were not
 			processed correctly and were being ignored. [GL #1949]
 
-5441.	[bug]		${LMDB_CFLAGS} was missing from make/includes.in.
-			[GL #1955]
+5442.	[func]		Add support for outgoing TCP connections in netmgr.
+			[GL #1958]
 
-5440.	[test]		Properly handle missing kyua. [GL #1950]
+5441.	[placeholder]
 
-5439.	[bug]		The DS RRset returned by dns_keynode_dsset() was used in
-			a non-thread-safe manner. [GL #1926]
+5440.	[placeholder]
 
-	--- 9.16.4 released ---
+5439.	[bug]		The dsset returned by dns_keynode_dsset() was not
+			thread safe. [GL #1926]
+
+	--- 9.17.2 released ---
 
 5438.	[bug]		Fix a race in TCP accepting code. [GL #1930]
 
@@ -69,6 +95,11 @@
 			content and query patterns. (CVE-2020-8619) [GL #1111]
 			[GL #1718]
 
+5433.	[placeholder]
+
+5432.	[bug]		Check the question section when processing AXFR, IXFR,
+			and SOA replies when transferring a zone in. [GL #1683]
+
 5431.	[func]		Reject DS records at the zone apex when loading
 			master files. Log but otherwise ignore attempts to
 			add DS records at the zone apex via UPDATE. [GL #1798]
@@ -77,9 +108,14 @@
 			is created for each IPv6 interface (just as with IPv4).
 			[GL #1782]
 
+5429.	[cleanup]	Move BIND binaries which are neither daemons nor
+			administrative programs to $bindir. [GL #1724]
+
 5428.	[bug]		Clean up GSSAPI resources in nsupdate only after taskmgr
 			has been destroyed. Thanks to Petr Menšík. [GL !3316]
 
+5427.	[placeholder]
+
 5426.	[bug]		Don't abort() when setting SO_INCOMING_CPU on the socket
 			fails. [GL #1911]
 
@@ -104,9 +140,19 @@
 5420.	[bug]		Add missing isc_{mutex,conditional}_destroy() calls
 			that caused a memory leak on FreeBSD. [GL #1893]
 
+5419.	[func]		Add new dig command line option, "+qid=<num>", which
+			allows the query ID to be set to an arbitrary value.
+			Add a new ./configure option, --enable-singletrace,
+			which allows trace logging of a single query when QID is
+			set to 0. [GL #1851]
+
 5418.	[bug]		delv failed to parse deprecated trusted-keys-style
 			trust anchors. [GL #1860]
 
+5417.	[cleanup]	The code determining the advertised UDP buffer size in
+			outgoing EDNS queries has been refactored to improve its
+			clarity. [GL #1868]
+
 5416.	[bug]		Fix a lock order inversion in lib/isc/unix/socket.c.
 			[GL #1859]
 
@@ -128,6 +174,10 @@
 			accept() and pass the accepted socket to child threads
 			for processing. [GL !3320]
 
+5410.	[func]		Add the ability to specify per-type record count limits,
+			which are enforced when adding records via UPDATE, in an
+			"update-policy" statement. [GL #1657]
+
 5409.	[performance]	When looking up NSEC3 data in a zone database, skip the
 			check for empty non-terminal nodes; the NSEC3 tree does
 			not have any. [GL #1834]
@@ -138,12 +188,14 @@
 5407.	[func]		Zone timers are now exported via statistics channel.
 			Thanks to Paul Frieden, Verizon Media. [GL #1232]
 
+5406.	[func]		Add a new logging category, "rpz-passthru", which allows
+			RPZ passthru actions to be logged in a separate channel.
+			[GL #54]
+
 5405.	[bug]		'named-checkconf -p' could include spurious text in
 			server-addresses statements due to an uninitialized DSCP
 			value. [GL #1812]
 
-	--- 9.16.3 released ---
-
 5404.	[bug]		'named-checkconf -z' could incorrectly indicate
 			success if errors were found in one view but not in a
 			subsequent one. [GL #1807]
@@ -189,10 +241,18 @@
 			desired values. This has been fixed. [GL #1042]
 			[GL #1090]
 
+5393.	[cleanup]	Unused and/or redundant APIs were removed from libirs.
+			[GL #1758]
+
 5392.	[bug]		It was possible for named to crash during shutdown
 			or reconfiguration if an RPZ zone was still being
 			updated. [GL #1779]
 
+5391.	[func]		The BIND 9 build system has been changed to use a
+			typical autoconf+automake+libtool stack. When building
+			from the Git repository, run "autoreconf -fi" first.
+			[GL #4]
+
 5390.	[security]	Replaying a TSIG BADTIME response as a request could
 			trigger an assertion failure. (CVE-2020-8617)
 			[GL #1703]
@@ -201,8 +261,10 @@
 			bugs and use PKCS#11 v3.0 EdDSA macros and constants.
 			Thanks to Aaron Thompson. [GL !3391]
 
-5387.	[func]		Warn about AXFR streams with inconsistent message IDs.
-			[GL #1674]
+5388.	[func]		Reject AXFR streams where the message ID is not
+			consistent. [GL #1674]
+
+5387.	[placeholder]
 
 5386.	[cleanup]	Address Coverity warnings in lib/dns/keymgr.c.
 			[GL #1737]
@@ -214,7 +276,7 @@
 			implicitly set to "yes". Now "inline-signing" is only
 			set to "yes" if the zone is not dynamic. [GL #1709]
 
-	--- 9.16.2 released ---
+	--- 9.17.1 released ---
 
 5383.	[func]		Add a quota attach function with a callback and clean up
 			the isc_quota API. [GL !3280]
@@ -229,9 +291,13 @@
 5380.	[contrib]	Fix building MySQL DLZ modules against MySQL 8
 			libraries. [GL #1678]
 
+5379.	[placeholder]
+
 5378.	[bug]		Receiving invalid DNS data was triggering an assertion
 			failure in nslookup. [GL #1652]
 
+5377.	[placeholder]
+
 5376.	[bug]		Fix ineffective DNS rebinding protection when BIND is
 			configured as a forwarding DNS server. Thanks to Tobias
 			Klein. [GL #1574]
@@ -266,14 +332,16 @@
 			Fixed by deactivating the netmgr handle before
 			scheduling the asynchronous close routine. [GL #1700]
 
+5369.	[func]		Add the ability to specify whether to wait for
+			nameserver domain names to be looked up, with a new RPZ
+			modifying directive 'nsdname-wait-recurse'. [GL #1138]
+
 5368.	[bug]		Named failed to restart if 'rndc addzone' names
 			contained special characters (e.g. '/'). [GL #1655]
 
-5367.	[bug]		Fixed a flaw in the calculation of the zone database
-			size so that "max-journal-size default" uses the correct
-			limit. [GL #1661]
+5367.	[placeholder]
 
-	--- 9.16.1 released ---
+	--- 9.17.0 released ---
 
 5366.	[bug]		Fix a race condition with the keymgr when the same
 			zone plus dnssec-policy is configured in multiple
@@ -295,12 +363,24 @@
 			properties that no longer match were not being retired.
 			[GL #1624]
 
+5362.	[func]		Limit the size of IXFR responses so that AXFR will
+			be used instead if it would be smaller. This is
+			controlled by the "max-ixfr-ratio" option, which
+			is a percentage representing the ratio of IXFR size
+			to the size of the entire zone. This value cannot
+			exceed 100%, which is the default. [GL #1515]
+
 5361.	[bug]		named might not accept new connections after
 			hitting tcp-clients quota. [GL #1643]
 
 5360.	[bug]		delv could fail to load trust anchors in DNSKEY
 			format. [GL #1647]
 
+5359.	[func]		"rndc nta -d" and "rndc secroots" now include
+			"validate-except" entries when listing negative
+			trust anchors. These are indicated by the keyword
+			"permanent" in place of an expiry date. [GL #1532]
+
 5358.	[bug]		Inline master zones whose master files were touched
 			but otherwise unchanged and were subsequently reloaded
 			may have stopped re-signing. [GL !3135]
@@ -310,8 +390,6 @@
 			re-signed in time.  This was a side effect of 5315.
 			[GL !3137]
 
-	--- 9.16.0 released ---
-
 5356.	[func]		Update dnssec-policy configuration statements:
 			- Rename "zone-max-ttl" dnssec-policy option to
 			  "max-zone-ttl" for consistency with the existing
@@ -354,7 +432,7 @@
 5349.	[bug]		Fix a race in task_pause/unpause. [GL #1571]
 
 5348.	[bug]		dnssec-settime -Psync was not being honoured.
-			[GL !2925]
+			[GL !2893]
 
 	--- 9.15.8 released ---
 

CODE_OF_CONDUCT

@@ -1,79 +0,0 @@
-CODE OF CONDUCT
-
-BIND 9 Code of Conduct
-
-Like the technical community as a whole, the BIND 9 team and community is
-made up of a mixture of professionals and volunteers from all over the
-world, working on every aspect of the mission - including mentorship,
-teaching, and connecting people.
-
-Diversity is one of our huge strengths, but it can also lead to
-communication issues and unhappiness. To that end, we have a few ground
-rules that we ask people to adhere to. This code applies equally to the
-core development team, open source contributors and those seeking help and
-guidance.
-
-This isn't an exhaustive list of things that you can't do. Rather, take it
-in the spirit in which it's intended - a guide to make it easier to enrich
-all of us and the technical communities in which we participate.
-
-This code of conduct applies to all spaces managed by the BIND 9 project
-or Internet Systems Consortium. This includes chat, the mailing lists, the
-issue tracker, and any other fora created by the project team which the
-community uses for communication. In addition, violations of this code
-outside these spaces may affect a person's ability to participate within
-them.
-
-If you believe someone is violating the code of conduct, we ask that you
-report it by emailing conduct@isc.org. For more details please see our
-Reporting Guidelines.
-
-  * Be friendly and patient.
-  * Be welcoming. We strive to be a community that welcomes and supports
-    people of all backgrounds and identities. This includes, but is not
-    limited to members of any race, ethnicity, culture, national origin,
-    colour, immigration status, social and economic class, educational
-    level, sex, sexual orientation, gender identity and expression, age,
-    size, family status, political belief, religion, and mental and
-    physical ability.
-  * Be considerate. Your work will be used by other people, and you in
-    turn will depend on the work of others. Any decision you take will
-    affect users and colleagues, and you should take those consequences
-    into account when making decisions. Remember that we're a world-wide
-    community, so you might not be communicating in someone else's primary
-    language.
-  * Be respectful. Not all of us will agree all the time, but disagreement
-    is no excuse for poor behavior and poor manners. We might all
-    experience some frustration now and then, but we cannot allow that
-    frustration to turn into a personal attack. It's important to remember
-    that a community where people feel uncomfortable or threatened is not
-    a productive one. Members of the BIND 9 community should be respectful
-    when dealing with other members as well as with people outside the
-    BIND 9 community.
-  * Be careful in the words that you choose. We are a community of
-    professionals, and we conduct ourselves professionally. Be kind to
-    others. Do not insult or put down other participants. Harassment and
-    other exclusionary behavior aren't acceptable. This includes, but is
-    not limited to:
-      + Violent threats or language directed against another person.
-      + Discriminatory jokes and language.
-      + Posting sexually explicit or violent material.
-      + Posting (or threatening to post) other people's personally
-        identifying information ("doxing").
-      + Personal insults, especially those using racist or sexist terms.
-      + Unwelcome sexual attention.
-      + Advocating for, or encouraging, any of the above behavior.
-      + Repeated harassment of others. In general, if someone asks you to
-        stop, then stop.
-  * When we disagree, try to understand why. Disagreements, both social
-    and technical, happen all the time and BIND 9 is no exception. It is
-    important that we resolve disagreements and differing views
-    constructively. Remember that we're different. The strength of BIND 9
-    comes from its varied community, people from a wide range of
-    backgrounds. Different people have different perspectives on issues.
-    Being unable to understand why someone holds a viewpoint doesn't mean
-    that they're wrong. Don't forget that it is human to err and blaming
-    each other doesn't get us anywhere. Instead, focus on helping to
-    resolve issues and learning from mistakes.
-
-Original text courtesy of the Django Code of Conduct project.

CODE_OF_CONDUCT.md

@@ -6,8 +6,8 @@ on every aspect of the mission - including mentorship, teaching, and connecting
 people.
 
 Diversity is one of our huge strengths, but it can also lead to communication
-issues and unhappiness. To that end, we have a few ground rules that we ask
-people to adhere to. This code applies equally to the core development team, open source contributors and those
+issues and unhappiness. To that end, we have a few ground rules to which we expect
+people to adhere. This code applies equally to the core development team, open source contributors and those
 seeking help and guidance.
 
 This isn't an exhaustive list of things that you can't do. Rather, take it in

CONTRIBUTING

@@ -1,196 +0,0 @@
-CONTRIBUTING
-
-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).
-
-At Internet Systems Consortium, we're committed to building communities
-that are welcoming and inclusive; environments where people are encouraged
-to share ideas, treat each other with respect, and collaborate towards the
-best solutions. To reinforce our commitment, the Internet Systems
-Consortium has adopted the Contributor Covenant version 1.4 as our Code of
-Conduct for BIND 9 project, as well as for the conduct of our developers
-throughout the industry.
-
-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 vulnerabilities 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.

COPYING

@@ -0,0 +1 @@
+LICENSE

ChangeLog

@@ -0,0 +1 @@
+CHANGES

HISTORY

@@ -1,600 +0,0 @@
-HISTORY
-
-Functional enhancements from prior major releases of BIND 9
-
-BIND 9.14
-
-BIND 9.14 (a stable branch based on the 9.13 development branch) includes
-a number of changes from BIND 9.12 and earlier releases. New features
-include:
-
-  * A new "plugin" mechanism has been added to allow query functionality
-    to be extended using dynamically loadable libraries. The "filter-aaaa"
-    feature has been removed from named and is now implemented as a
-    plugin.
-  * Socket and task code has been refactored to improve performance.
-  * QNAME minimization, as described in RFC 7816, is now supported.
-  * "Root key sentinel" support, enabling validating resolvers to indicate
-    via a special query which trust anchors are configured for the root
-    zone.
-  * Secondary zones can now be configured as "mirror" zones; their
-    contents are transferred in as with traditional slave zones, but are
-    subject to DNSSEC validation and are not treated as authoritative data
-    when answering. This makes it easier to configure a local copy of the
-    root zone as described in RFC 7706.
-  * The "validate-except" option allows configuration of domains below
-    which DNSSEC validation should not be performed.
-  * The default value of "dnssec-validation" is now "auto".
-  * IDNA2008 is now supported when linking with libidn2.
-  * "named -V" now outputs the default paths for files used by named and
-    other tools.
-
-In addition, workarounds that were formerly in place to enable resolution
-of domains whose authoritative servers did not respond to EDNS queries
-have been removed. See https://dnsflagday.net for more details.
-
-Cryptographic support has been modernized. BIND now uses the best
-available pseudo-random number generator for the platform on which it's
-built. Very old versions of OpenSSL are no longer supported. Cryptography
-is now mandatory: building BIND without DNSSEC is no longer supported.
-
-Special code to support certain legacy operating systems has also been
-removed; see the file PLATFORMS.md for details of supported platforms. In
-addition to OpenSSL, BIND now requires support for IPv6, threads, and
-standard atomic operations provided by the C compiler.
-
-BIND 9.12
-
-BIND 9.12 includes a number of changes from BIND 9.11 and earlier
-releases. New features include:
-
-  * named and related libraries have been substantially refactored for
-    improved query performance -- particularly on delegation heavy zones
-    -- and for improved readability, maintainability, and testability.
-  * Code implementing the name server query processing logic has been
-    moved into a new libns library, for easier testing and use in tools
-    other than named.
-  * Cached, validated NSEC and other records can now be used to synthesize
-    NXDOMAIN responses.
-  * The DNS Response Policy Service API (DNSRPS) is now supported.
-  * Setting 'max-journal-size default' now limits the size of journal
-    files to twice the size of the zone.
-  * dnstap-read -x prints a hex dump of the wire format of each logged DNS
-    message.
-  * dnstap output files can now be configured to roll automatically when
-    reaching a given size.
-  * Log file timestamps can now also be formatted in ISO 8601 (local) or
-    ISO 8601 (UTC) formats.
-  * Logging channels and dnstap output files can now be configured to use
-    a timestamp as the suffix when rolling to a new file.
-  * 'named-checkconf -l' lists zones found in named.conf.
-  * Added support for the EDNS Padding and Keepalive options.
-  * 'new-zones-directory' option sets the location where the configuration
-    data for zones added by rndc addzone is stored.
-  * The default key algorithm in rndc-confgen is now hmac-sha256.
-  * filter-aaaa-on-v4 and filter-aaaa-on-v6 options are now available by
-    default without a configure option.
-  * The obsolete isc-hmac-fixup command has been removed.
-
-BIND 9.11
-
-BIND 9.11.0 includes a number of changes from BIND 9.10 and earlier
-releases. New features include:
-
-  * Added support for Catalog Zones, a new method for provisioning
-    servers: a list of zones to be served is stored in a DNS zone, along
-    with their configuration parameters. Changes to the catalog zone are
-    propagated to slaves via normal AXFR/IXFR, whereupon the zones that
-    are listed in it are automatically added, deleted or reconfigured.
-  * Added support for "dnstap", a fast and flexible method of capturing
-    and logging DNS traffic.
-  * Added support for "dyndb", a new API for loading zone data from an
-    external database, developed by Red Hat for the FreeIPA project.
-  * "fetchlimit" quotas are now compiled in by default. These are for the
-    use of recursive resolvers that are are under high query load for
-    domains whose authoritative servers are nonresponsive or are
-    experiencing a denial of service attack:
-      + "fetches-per-server" limits the number of simultaneous queries
-        that can be sent to any single authoritative server. The
-        configured value is a starting point; it is automatically adjusted
-        downward if the server is partially or completely non-responsive.
-        The algorithm used to adjust the quota can be configured via the
-        "fetch-quota-params" option.
-      + "fetches-per-zone" limits the number of simultaneous queries that
-        can be sent for names within a single domain. (Note: Unlike
-        "fetches-per-server", this value is not self-tuning.)
-      + New stats counters have been added to count queries spilled due to
-        these quotas.
-  * Added a new "dnssec-keymgr" key mainenance utility, which can generate
-    or update keys as needed to ensure that a zone's keys match a defined
-    DNSSEC policy.
-  * The experimental "SIT" feature in BIND 9.10 has been renamed "COOKIE"
-    and is no longer optional. EDNS COOKIE is a mechanism enabling clients
-    to detect off-path spoofed responses, and servers to detect
-    spoofed-source queries. Clients that identify themselves using COOKIE
-    options are not subject to response rate limiting (RRL) and can
-    receive larger UDP responses.
-  * SERVFAIL responses can now be cached for a limited time (defaulting to
-    1 second, with an upper limit of 30). This can reduce the frequency of
-    retries when a query is persistently failing.
-  * Added an "nsip-wait-recurse" switch to RPZ. This causes NSIP rules to
-    be skipped if a name server IP address isn't in the cache yet; the
-    address will be looked up and the rule will be applied on future
-    queries.
-  * Added a Python RNDC module. This allows multiple commands to sent over
-    a persistent RNDC channel, which saves time.
-  * The "controls" block in named.conf can now grant read-only "rndc"
-    access to specified clients or keys. Read-only clients could, for
-    example, check "rndc status" but could not reconfigure or shut down
-    the server.
-  * "rndc" commands can now return arbitrarily large amounts of text to
-    the caller.
-  * The zone serial number of a dynamically updatable zone can now be set
-    via "rndc signing -serial ". This allows inline-signing zones to be
-    set to a specific serial number.
-  * The new "rndc nta" command can be used to set a Negative Trust Anchor
-    (NTA), disabling DNSSEC validation for a specific domain; this can be
-    used when responses from a domain are known to be failing validation
-    due to administrative error rather than because of a spoofing attack.
-    Negative trust anchors are strictly temporary; by default they expire
-    after one hour, but can be configured to last up to one week.
-  * "rndc delzone" can now be used on zones that were not originally
-    created by "rndc addzone".
-  * "rndc modzone" reconfigures a single zone, without requiring the
-    entire server to be reconfigured.
-  * "rndc showzone" displays the current configuration of a zone.
-  * "rndc managed-keys" can be used to check the status of RFC 5011
-    managed trust anchors, or to force trust anchors to be refreshed.
-  * "max-cache-size" can now be set to a percentage of available memory.
-    The default is 90%.
-  * Update forwarding performance has been improved by allowing a single
-    TCP connection to be shared by multiple updates.
-  * The EDNS Client Subnet (ECS) option is now supported for authoritative
-    servers; if a query contains an ECS option then ACLs containing
-    "geoip" or "ecs" elements can match against the the address encoded in
-    the option. This can be used to select a view for a query, so that
-    different answers can be provided depending on the client network.
-  * The EDNS EXPIRE option has been implemented on the client side,
-    allowing a slave server to set the expiration timer correctly when
-    transferring zone data from another slave server.
-  * The key generation and manipulation tools (dnssec-keygen,
-    dnssec-settime, dnssec-importkey, dnssec-keyfromlabel) now take
-    "-Psync" and "-Dsync" options to set the publication and deletion
-    times of CDS and CDNSKEY parent-synchronization records. Both named
-    and dnssec-signzone can now publish and remove these records at the
-    scheduled times.
-  * A new "minimal-any" option reduces the size of UDP responses for query
-    type ANY by returning a single arbitrarily selected RRset instead of
-    all RRsets.
-  * A new "masterfile-style" zone option controls the formatting of text
-    zone files: When set to "full", a zone file is dumped in
-    single-line-per-record format.
-  * "serial-update-method" can now be set to "date". On update, the serial
-    number will be set to the current date in YYYYMMDDNN format.
-  * "dnssec-signzone -N date" sets the serial number to YYYYMMDDNN.
-  * "named -L " causes named to send log messages to the specified file by
-    default instead of to the system log.
-  * "dig +ttlunits" prints TTL values with time-unit suffixes: w, d, h, m,
-    s for weeks, days, hours, minutes, and seconds.
-  * "dig +unknownformat" prints dig output in RFC 3597 "unknown record"
-    presentation format.
-  * "dig +ednsopt" allows dig to set arbitrary EDNS options on requests.
-  * "dig +ednsflags" allows dig to set yet-to-be-defined EDNS flags on
-    requests.
-  * "mdig" is an alternate version of dig which sends multiple pipelined
-    TCP queries to a server. Instead of waiting for a response after
-    sending a query, it sends all queries immediately and displays
-    responses in the order received.
-  * "serial-query-rate" no longer controls NOTIFY messages. These are
-    separately controlled by "notify-rate" and "startup-notify-rate".
-  * "nsupdate" now performs "check-names" processing by default on records
-    to be added. This can be disabled with "check-names no".
-  * The statistics channel now supports DEFLATE compression, reducing the
-    size of the data sent over the network when querying statistics.
-  * New counters have been added to the statistics channel to track the
-    sizes of incoming queries and outgoing responses in histogram buckets,
-    as specified in RSSAC002.
-  * A new NXDOMAIN redirect method (option "nxdomain-redirect") has been
-    added, allowing redirection to a specified DNS namespace instead of a
-    single redirect zone.
-  * When starting up, named now ensures that no other named process is
-    already running.
-  * Files created by named to store information, including "mkeys" and
-    "nzf" files, are now named after their corresponding views unless the
-    view name contains characters incompatible with use as a filename. Old
-    style filenames (based on the hash of the view name) will still work.
-
-BIND 9.10.0
-
-BIND 9.10.0 includes a number of changes from BIND 9.9 and earlier
-releases. New features include:
-
-  * DNS Response-rate limiting (DNS RRL), which blunts the impact of
-    reflection and amplification attacks, is always compiled in and no
-    longer requires a compile-time option to enable it.
-  * An experimental "Source Identity Token" (SIT) EDNS option is now
-    available. Similar to DNS Cookies as invented by Donald Eastlake 3rd,
-    these are designed to enable clients to detect off-path spoofed
-    responses, and to enable servers to detect spoofed-source queries.
-    Servers can be configured to send smaller responses to clients that
-    have not identified themselves using a SIT option, reducing the
-    effectiveness of amplification attacks. RRL processing has also been
-    updated; clients proven to be legitimate via SIT are not subject to
-    rate limiting. Use "configure --enable-sit" to enable this feature in
-    BIND.
-  * A new zone file format, "map", stores zone data in a format that can
-    be mapped directly into memory, allowing significantly faster zone
-    loading.
-  * "delv" (domain entity lookup and validation) is a new tool with
-    dig-like semantics for looking up DNS data and performing internal
-    DNSSEC validation. This allows easy validation in environments where
-    the resolver may not be trustworthy, and assists with troubleshooting
-    of DNSSEC problems. (NOTE: In previous development releases of BIND
-    9.10, this utility was called "delve". The spelling has been changed
-    to avoid confusion with the "delve" utility included with the Xapian
-    search engine.)
-  * Improved EDNS(0) processing for better resolver performance and
-    reliability over slow or lossy connections.
-  * A new "configure --with-tuning=large" option tunes certain compiled-in
-    constants and default settings to values better suited to large
-    servers with abundant memory. This can improve performance on such
-    servers, but will consume more memory and may degrade performance on
-    smaller systems.
-  * Substantial improvement in response-policy zone (RPZ) performance. Up
-    to 32 response-policy zones can be configured with minimal performance
-    loss.
-  * To improve recursive resolver performance, cache records which are
-    still being requested by clients can now be automatically refreshed
-    from the authoritative server before they expire, reducing or
-    eliminating the time window in which no answer is available in the
-    cache.
-  * New "rpz-client-ip" triggers and drop policies allowing response
-    policies based on the IP address of the client.
-  * ACLs can now be specified based on geographic location using the
-    MaxMind GeoIP databases. Use "configure --with-geoip" to enable.
-  * Zone data can now be shared between views, allowing multiple views to
-    serve the same zones authoritatively without storing multiple copies
-    in memory.
-  * New XML schema (version 3) for the statistics channel includes many
-    new statistics and uses a flattened XML tree for faster parsing. The
-    older schema is now deprecated.
-  * A new stylesheet, based on the Google Charts API, displays XML
-    statistics in charts and graphs on javascript-enabled browsers.
-  * The statistics channel can now provide data in JSON format as well as
-    XML.
-  * New stats counters track TCP and UDP queries received per zone, and
-    EDNS options received in total.
-  * The internal and export versions of the BIND libraries (libisc,
-    libdns, etc) have been unified so that external library clients can
-    use the same libraries as BIND itself.
-  * A new compile-time option, "configure --enable-native-pkcs11", allows
-    BIND 9 cryptography functions to use the PKCS#11 API natively, so that
-    BIND can drive a cryptographic hardware service module (HSM) directly
-    instead of using a modified OpenSSL as an intermediary. (Note: This
-    feature requires an HSM to have a full implementation of the PKCS#11
-    API; many current HSMs only have partial implementations. The new
-    "pkcs11-tokens" command can be used to check API completeness. Native
-    PKCS#11 is known to work with the Thales nShield HSM and with SoftHSM
-    version 2 from the Open DNSSEC project.)
-  * The new "max-zone-ttl" option enforces maximum TTLs for zones. This
-    can simplify the process of rolling DNSSEC keys by guaranteeing that
-    cached signatures will have expired within the specified amount of
-    time.
-  * "dig +subnet" sends an EDNS CLIENT-SUBNET option when querying.
-  * "dig +expire" sends an EDNS EXPIRE option when querying. When this
-    option is sent with an SOA query to a server that supports it, it will
-    report the expiry time of a slave zone.
-  * New "dnssec-coverage" tool to check DNSSEC key coverage for a zone and
-    report if a lapse in signing coverage has been inadvertently
-    scheduled.
-  * Signing algorithm flexibility and other improvements for the "rndc"
-    control channel.
-  * "named-checkzone" and "named-compilezone" can now read journal files,
-    allowing them to process dynamic zones.
-  * Multiple DLZ databases can now be configured. Individual zones can be
-    configured to be served from a specific DLZ database. DLZ databases
-    now serve zones of type "master" and "redirect".
-  * "rndc zonestatus" reports information about a specified zone.
-  * "named" now listens on IPv6 as well as IPv4 interfaces by default.
-  * "named" now preserves the capitalization of names when responding to
-    queries: for instance, a query for "example.com" may be answered with
-    "example.COM" if the name was configured that way in the zone file.
-    Some clients have a bug causing them to depend on the older behavior,
-    in which the case of the answer always matched the case of the query,
-    rather than the case of the name configured in the DNS. Such clients
-    can now be specified in the new "no-case-compress" ACL; this will
-    restore the older behavior of "named" for those clients only.
-  * new "dnssec-importkey" command allows the use of offline DNSSEC keys
-    with automatic DNSKEY management.
-  * New "named-rrchecker" tool to verify the syntactic correctness of
-    individual resource records.
-  * When re-signing a zone, the new "dnssec-signzone -Q" option drops
-    signatures from keys that are still published but are no longer
-    active.
-  * "named-checkconf -px" will print the contents of configuration files
-    with the shared secrets obscured, making it easier to share
-    configuration (e.g. when submitting a bug report) without revealing
-    private information.
-  * "rndc scan" causes named to re-scan network interfaces for changes in
-    local addresses.
-  * On operating systems with support for routing sockets, network
-    interfaces are re-scanned automatically whenever they change.
-  * "tsig-keygen" is now available as an alternate command name to use for
-    "ddns-confgen".
-
-BIND 9.9.0
-
-BIND 9.9.0 includes a number of changes from BIND 9.8 and earlier
-releases. New features include:
-
-  * Inline signing, allowing automatic DNSSEC signing of master zones
-    without modification of the zonefile, or "bump in the wire" signing in
-    slaves.
-  * NXDOMAIN redirection.
-  * New 'rndc flushtree' command clears all data under a given name from
-    the DNS cache.
-  * New 'rndc sync' command dumps pending changes in a dynamic zone to
-    disk without a freeze/thaw cycle.
-  * New 'rndc signing' command displays or clears signing status records
-    in 'auto-dnssec' zones.
-  * NSEC3 parameters for 'auto-dnssec' zones can now be set prior to
-    signing, eliminating the need to initially sign with NSEC.
-  * Startup time improvements on large authoritative servers.
-  * Slave zones are now saved in raw format by default.
-  * Several improvements to response policy zones (RPZ).
-  * Improved hardware scalability by using multiple threads to listen for
-    queries and using finer-grained client locking
-  * The 'also-notify' option now takes the same syntax as 'masters', so it
-    can used named masterlists and TSIG keys.
-  * 'dnssec-signzone -D' writes an output file containing only DNSSEC
-    data, which can be included by the primary zone file.
-  * 'dnssec-signzone -R' forces removal of signatures that are not expired
-    but were created by a key which no longer exists.
-  * 'dnssec-signzone -X' allows a separate expiration date to be specified
-    for DNSKEY signatures from other signatures.
-  * New '-L' option to dnssec-keygen, dnssec-settime, and
-    dnssec-keyfromlabel sets the default TTL for the key.
-  * dnssec-dsfromkey now supports reading from standard input, to make it
-    easier to convert DNSKEY to DS.
-  * RFC 1918 reverse zones have been added to the empty-zones table per
-    RFC 6303.
-  * Dynamic updates can now optionally set the zone's SOA serial number to
-    the current UNIX time.
-  * DLZ modules can now retrieve the source IP address of the querying
-    client.
-  * 'request-ixfr' option can now be set at the per-zone level.
-  * 'dig +rrcomments' turns on comments about DNSKEY records, indicating
-    their key ID, algorithm and function
-  * Simplified nsupdate syntax and added readline support
-
-BIND 9.8.0
-
-BIND 9.8.0 includes a number of changes from BIND 9.7 and earlier
-releases. New features include:
-
-  * Built-in trust anchor for the root zone, which can be switched on via
-    "dnssec-validation auto;"
-  * Support for DNS64.
-  * Support for response policy zones (RPZ).
-  * Support for writable DLZ zones.
-  * Improved ease of configuration of GSS/TSIG for interoperability with
-    Active Directory
-  * Support for GOST signing algorithm for DNSSEC.
-  * Removed RTT Banding from server selection algorithm.
-  * New "static-stub" zone type.
-  * Allow configuration of resolver timeouts via "resolver-query-timeout"
-    option.
-  * The DLZ "dlopen" driver is now built by default.
-  * Added a new include file with function typedefs for the DLZ "dlopen"
-    driver.
-  * Made "--with-gssapi" default.
-  * More verbose error reporting from DLZ LDAP.
-
-BIND 9.7.0
-
-BIND 9.7.0 includes a number of changes from BIND 9.6 and earlier
-releases. Most are intended to simplify DNSSEC configuration. New features
-include:
-
-  * Fully automatic signing of zones by "named".
-  * Simplified configuration of DNSSEC Lookaside Validation (DLV).
-  * Simplified configuration of Dynamic DNS, using the "ddns-confgen"
-    command line tool or the "local" update-policy option. (As a side
-    effect, this also makes it easier to configure automatic zone
-    re-signing.)
-  * New named option "attach-cache" that allows multiple views to share a
-    single cache.
-  * DNS rebinding attack prevention.
-  * New default values for dnssec-keygen parameters.
-  * Support for RFC 5011 automated trust anchor maintenance
-  * Smart signing: simplified tools for zone signing and key maintenance.
-  * The "statistics-channels" option is now available on Windows.
-  * A new DNSSEC-aware libdns API for use by non-BIND9 applications
-  * On some platforms, named and other binaries can now print out a stack
-    backtrace on assertion failure, to aid in debugging.
-  * A "tools only" installation mode on Windows, which only installs dig,
-    host, nslookup and nsupdate.
-  * Improved PKCS#11 support, including Keyper support and explicit
-    OpenSSL engine selection.
-
-BIND 9.6.0
-
-  * Full NSEC3 support
-  * Automatic zone re-signing
-  * New update-policy methods tcp-self and 6to4-self
-  * The BIND 8 resolver library, libbind, has been removed from the BIND 9
-    distribution and is now available as a separate download.
-  * Change the default pid file location from /var/run to /var/run/
-    {named,lwresd} for improved chroot/setuid support.
-
-BIND 9.5.0
-
-  * GSS-TSIG support (RFC 3645).
-  * DHCID support.
-  * Experimental http server and statistics support for named via xml.
-  * More detailed statistics counters including those supported in BIND 8.
-  * Faster ACL processing.
-  * Use Doxygen to generate internal documentation.
-  * Efficient LRU cache-cleaning mechanism.
-  * NSID support.
-
-BIND 9.4.0
-
-  * Implemented "additional section caching (or acache)", an internal
-    cache framework for additional section content to improve response
-    performance. Several configuration options were provided to control
-    the behavior.
-  * New notify type 'master-only'. Enable notify for master zones only.
-  * Accept 'notify-source' style syntax for query-source.
-  * rndc now allows addresses to be set in the server clauses.
-  * New option "allow-query-cache". This lets "allow-query" be used to
-    specify the default zone access level rather than having to have every
-    zone override the global value. "allow-query-cache" can be set at both
-    the options and view levels. If "allow-query-cache" is not set then
-    "allow-recursion" is used if set, otherwise "allow-query" is used if
-    set unless "recursion no;" is set in which case "none;" is used,
-    otherwise the default (localhost; localnets;) is used.
-  * rndc: the source address can now be specified.
-  * ixfr-from-differences now takes master and slave in addition to yes
-    and no at the options and view levels.
-  * Allow the journal's name to be changed via named.conf.
-  * 'rndc notify zone [class [view]]' resend the NOTIFY messages for the
-    specified zone.
-  * 'dig +trace' now randomly selects the next servers to try. Report if
-    there is a bad delegation.
-  * Improve check-names error messages.
-  * Make public the function to read a key file, dst_key_read_public().
-  * dig now returns the byte count for axfr/ixfr.
-  * allow-update is now settable at the options / view level.
-  * named-checkconf now checks the logging configuration.
-  * host now can turn on memory debugging flags with '-m'.
-  * Don't send notify messages to self.
-  * Perform sanity checks on NS records which refer to 'in zone' names.
-  * New zone option "notify-delay". Specify a minimum delay between sets
-    of NOTIFY messages.
-  * Extend adjusting TTL warning messages.
-  * Named and named-checkzone can now both check for non-terminal wildcard
-    records.
-  * "rndc freeze/thaw" now freezes/thaws all zones.
-  * named-checkconf now check acls to verify that they only refer to
-    existing acls.
-  * The server syntax has been extended to support a range of servers.
-  * Report differences between hints and real NS rrset and associated
-    address records.
-  * Preserve the case of domain names in rdata during zone transfers.
-  * Restructured the data locking framework using architecture dependent
-    atomic operations (when available), improving response performance on
-    multi-processor machines significantly. x86, x86_64, alpha, powerpc,
-    and mips are currently supported.
-  * UNIX domain controls are now supported.
-  * Add support for additional zone file formats for improving loading
-    performance. The masterfile-format option in named.conf can be used to
-    specify a non-default format. A separate command named-compilezone was
-    provided to generate zone files in the new format. Additionally, the
-    -I and -O options for dnssec-signzone specify the input and output
-    formats.
-  * dnssec-signzone can now randomize signature end times (dnssec-signzone
-    -j jitter).
-  * Add support for CH A record.
-  * Add additional zone data constancy checks. named-checkzone has
-    extended checking of NS, MX and SRV record and the hosts they
-    reference. named has extended post zone load checks. New zone options:
-    check-mx and integrity-check.
-  * edns-udp-size can now be overridden on a per server basis.
-  * dig can now specify the EDNS version when making a query.
-  * Added framework for handling multiple EDNS versions.
-  * Additional memory debugging support to track size and mctx arguments.
-  * Detect duplicates of UDP queries we are recursing on and drop them.
-    New stats category "duplicates".
-  * "USE INTERNAL MALLOC" is now runtime selectable.
-  * The lame cache is now done on a <qname,qclass,qtype> basis as some
-    servers only appear to be lame for certain query types.
-  * Limit the number of recursive clients that can be waiting for a single
-    query (<qname,qtype,qclass>) to resolve. New options clients-per-query
-    and max-clients-per-query.
-  * dig: report the number of extra bytes still left in the packet after
-    processing all the records.
-  * Support for IPSECKEY rdata type.
-  * Raise the UDP receive buffer size to 32k if it is less than 32k.
-  * x86 and x86_64 now have separate atomic locking implementations.
-  * named-checkconf now validates update-policy entries.
-  * Attempt to make the amount of work performed in a iteration self
-    tuning. The covers nodes clean from the cache per iteration, nodes
-    written to disk when rewriting a master file and nodes destroyed per
-    iteration when destroying a zone or a cache.
-  * ISC string copy API.
-  * Automatic empty zone creation for D.F.IP6.ARPA and friends. Note: RFC
-    1918 zones are not yet covered by this but are likely to be in a
-    future release.
-  * New options: empty-server, empty-contact, empty-zones-enable and
-    disable-empty-zone.
-  * dig now has a '-q queryname' and '+showsearch' options.
-  * host/nslookup now continue (default)/fail on SERVFAIL.
-  * dig now warns if 'RA' is not set in the answer when 'RD' was set in
-    the query. host/nslookup skip servers that fail to set 'RA' when 'RD'
-    is set unless a server is explicitly set.
-  * Integrate contributed DLZ code into named.
-  * Integrate contributed IDN code from JPNIC.
-  * libbind: corresponds to that from BIND 8.4.7.
-
-BIND 9.3.0
-
-  * DNSSEC is now DS based (RFC 3658).
-  * DNSSEC lookaside validation.
-  * check-names is now implemented.
-  * rrset-order is more complete.
-  * IPv4/IPv6 transition support, dual-stack-servers.
-  * IXFR deltas can now be generated when loading master files,
-    ixfr-from-differences.
-  * It is now possible to specify the size of a journal, max-journal-size.
-  * It is now possible to define a named set of master servers to be used
-    in masters clause, masters.
-  * The advertised EDNS UDP size can now be set, edns-udp-size.
-  * allow-v6-synthesis has been obsoleted.
-  * Zones containing MD and MF will now be rejected.
-  * dig, nslookup name. now report "Not Implemented" as NOTIMP rather than
-    NOTIMPL. This will have impact on scripts that are looking for
-    NOTIMPL.
-  * libbind: corresponds to that from BIND 8.4.5.
-
-BIND 9.2.0
-
-  * The size of the cache can now be limited using the "max-cache-size"
-    option.
-  * The server can now automatically convert RFC1886-style recursive
-    lookup requests into RFC2874-style lookups, when enabled using the new
-    option "allow-v6-synthesis". This allows stub resolvers that support
-    AAAA records but not A6 record chains or binary labels to perform
-    lookups in domains that make use of these IPv6 DNS features.
-  * Performance has been improved.
-  * The man pages now use the more portable "man" macros rather than the
-    "mandoc" macros, and are installed by "make install".
-  * The named.conf parser has been completely rewritten. It now supports
-    "include" directives in more places such as inside "view" statements,
-    and it no longer has any reserved words.
-  * The "rndc status" command is now implemented.
-  * rndc can now be configured automatically.
-  * A BIND 8 compatible stub resolver library is now included in lib/bind.
-  * OpenSSL has been removed from the distribution. This means that to use
-    DNSSEC, OpenSSL must be installed and the --with-openssl option must
-    be supplied to configure. This does not apply to the use of TSIG,
-    which does not require OpenSSL.
-  * The source distribution now builds on Windows. See win32utils/
-    readme1.txt and win32utils/win32-build.txt for details.
-  * This distribution also includes a new lightweight stub resolver
-    library and associated resolver daemon that fully support forward and
-    reverse lookups of both IPv4 and IPv6 addresses. This library is
-    considered experimental and is not a complete replacement for the BIND
-    8 resolver library. Applications that use the BIND 8 res_* functions
-    to perform DNS lookups or dynamic updates still need to be linked
-    against the BIND 8 libraries. For DNS lookups, they can also use the
-    new "getrrsetbyname()" API.
-  * BIND 9.2 is capable of acting as an authoritative server for DNSSEC
-    secured zones. This functionality is believed to be stable and
-    complete except for lacking support for verifications involving
-    wildcard records in secure zones.
-  * When acting as a caching server, BIND 9.2 can be configured to perform
-    DNSSEC secure resolution on behalf of its clients. This part of the
-    DNSSEC implementation is still considered experimental. For detailed
-    information about the state of the DNSSEC implementation, see the file
-    doc/misc/dnssec.

HISTORY.md

@@ -10,6 +10,21 @@
 -->
 ### Functional enhancements from prior major releases of BIND 9
 
+#### BIND 9.16
+
+BIND 9.16 (a stable branch based on the 9.15 development branch)
+includes a number of changes from BIND 9.14 and earlier releases.
+New features include:
+
+* New `dnssec-policy` statement to configure a key and signing policy
+  for zones, enabling automatic key regeneration and rollover.
+* New network manager based on `libuv`.
+* Added support for the new GeoIP2 geolocation API, `libmaxminddb`.
+* Improved DNSSEC trust anchor configuration using the `trust-anchors`
+  statement, permitting configuration of trust anchors in DS as well as
+  DNSKEY format.
+* YAML output for `dig`, `mdig`, and `delv`.
+
 #### BIND 9.14
 
 BIND 9.14 (a stable branch based on the 9.13 development branch)

Kyuafile

@@ -1,4 +0,0 @@
-syntax(2)
-test_suite('bind9')
-
-include('lib/Kyuafile')

Makefile.am

@@ -0,0 +1,25 @@
+include $(top_srcdir)/Makefile.top
+
+SUBDIRS = . libltdl lib doc bin
+
+BUILT_SOURCES = bind.keys.h
+CLEANFILES = bind.keys.h
+
+bind.keys.h: bind.keys Makefile
+	${PERL} ${top_srcdir}/util/bindkeys.pl ${top_srcdir}/bind.keys > $@
+
+dist_sysconf_DATA = bind.keys
+
+.PHONY: doc
+
+EXTRA_DIST = 			\
+	util/bindkeys.pl	\
+	contrib			\
+	CHANGES			\
+	COPYRIGHT		\
+	LICENSE			\
+	*.md
+
+dist-hook:
+	find $(distdir) -type f -name .gitignore -delete
+	git rev-parse --short HEAD | cut -b1-7 > $(distdir)/srcid

Makefile.docs

@@ -0,0 +1,51 @@
+SPHINX_V = $(SPHINX_V_@AM_V@)
+SPHINX_V_ = $(SPHINX_V_@AM_DEFAULT_V@)
+SPHINX_V_0 = -q
+SPHINX_V_1 = -n
+
+AM_V_SPHINX = $(AM_V_SPHINX_@AM_V@)
+AM_V_SPHINX_ = $(AM_V_SPHINX_@AM_DEFAULT_V@)
+AM_V_SPHINX_0 = @echo "  SPHINX   $@";
+
+SPHINXBUILDDIR = $(builddir)/_build
+
+common_SPHINXOPTS =			\
+	-c $(srcdir)			\
+	-a				\
+	$(SPHINX_V)
+
+ALLSPHINXOPTS =				\
+	$(common_SPHINXOPTS)		\
+	-D version="$(PACKAGE_VERSION)"	\
+	-D today="$(RELEASE_DATE)"	\
+	-D release="$(PACKAGE_VERSION)"	\
+	$(SPHINXOPTS)			\
+	$(srcdir)
+
+man_SPHINXOPTS =			\
+	$(common_SPHINXOPTS)		\
+	-D version="@""PACKAGE_VERSION@"\
+	-D today="@""RELEASE_DATE@"	\
+	-D release="@""PACKAGE_VERSION@"\
+	$(SPHINXOPTS)			\
+	$(srcdir)
+
+AM_V_SED = $(AM_V_SED_@AM_V@)
+AM_V_SED_ = $(AM_V_SED_@AM_DEFAULT_V@)
+AM_V_SED_0 = @echo "  SED $@";
+
+AM_V_CFG_TEST = $(AM_V_CFG_TEST_@AM_V@)
+AM_V_CFG_TEST_ = $(AM_V_CFG_TEST_@AM_DEFAULT_V@)
+AM_V_CFG_TEST_0 = @echo "  CFG_GEN $@";
+
+AM_V_RST_OPTIONS = $(AM_V_CFG_TEST_@AM_V@)
+AM_V_RST_OPTIONS_ = $(AM_V_RST_OPTIONS_@AM_DEFAULT_V@)
+AM_V_RST_OPTIONS_0 = @echo "  RST_OPTIONS $@";
+
+AM_V_RST_ZONEOPT = $(AM_V_CFG_TEST_@AM_V@)
+AM_V_RST_ZONEOPT_ = $(AM_V_RST_ZONEOPT_@AM_DEFAULT_V@)
+AM_V_RST_ZONEOPT_0 = @echo "  RST_ZONEOPT $@";
+
+AM_V_RST_GRAMMARS = $(AM_V_CFG_TEST_@AM_V@)
+AM_V_RST_GRAMMARS_ = $(AM_V_RST_GRAMMARS_@AM_DEFAULT_V@)
+AM_V_RST_GRAMMARS_0 = @echo "  RST_GRAMMARS $@";

Makefile.in

@@ -1,113 +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@
-top_builddir =  @top_builddir@
-
-VERSION=@BIND9_VERSION@
-
-SUBDIRS =	make lib fuzz bin doc
-TARGETS =
-PREREQS =	bind.keys.h
-
-MANOBJS =	README HISTORY OPTIONS CONTRIBUTING PLATFORMS CODE_OF_CONDUCT
-
-@BIND9_MAKE_RULES@
-
-newrr:
-	cd lib/dns; ${MAKE} newrr
-
-bind.keys.h: ${top_srcdir}/bind.keys ${srcdir}/util/bindkeys.pl
-	${PERL} ${srcdir}/util/bindkeys.pl < ${top_srcdir}/bind.keys > $@
-
-distclean::
-	rm -f config.cache config.h config.log config.status TAGS
-	rm -f libtool configure.lineno
-	rm -f util/conf.sh docutil/docbook2man-wrapper.sh
-
-# XXX we should clean libtool stuff too.  Only do this after we add rules
-# to make it.
-maintainer-clean::
-	rm -f configure
-	rm -f bind.keys.h
-
-docclean manclean maintainer-clean::
-	rm -f ${MANOBJS}
-
-doc man:: ${MANOBJS}
-
-installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} \
-	${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir}
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
-
-install:: installdirs
-	${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir}
-
-uninstall::
-	rm -f ${DESTDIR}${sysconfdir}/bind.keys
-
-test check:
-	@if test -n "`${PERL} ${top_srcdir}/bin/tests/system/testsock.pl 2>/dev/null || echo fail`"; then \
-	echo I: NOTE: The tests were not run because they require that; \
-	echo I:	the IP addresses 10.53.0.1 through 10.53.0.8 are configured; \
-	echo I:	as alias addresses on the loopback interface.  Please run; \
-	echo I:	\'bin/tests/system/ifconfig.sh up\' as root to configure; \
-	echo I:	them, then rerun the tests. Run make force-test to run the; \
-	echo I:	tests anyway.; \
-	exit 1; \
-	fi
-	${MAKE} test-force
-
-force-test: test-force
-
-test-force:
-	status=0; \
-	(cd fuzz && ${MAKE} check) || status=1; \
-	(cd bin/tests && ${MAKE} ${MAKEDEFS} test) || status=1; \
-	(test -f ${top_builddir}/unit/unittest.sh && \
-		$(SHELL) ${top_builddir}/unit/unittest.sh) || status=1; \
-	exit $$status
-
-README: README.md
-	${PANDOC} --email-obfuscation=none -s --metadata title="README" -f markdown-smart -t html README.md | \
-		${W3M} -dump -cols 75 -O ascii -T text/html | \
-		sed -e '$${/^$$/d;}' > $@
-
-HISTORY: HISTORY.md
-	${PANDOC} --email-obfuscation=none -s --metadata title="HISTORY" -f markdown-smart -t html HISTORY.md | \
-		${W3M} -dump -cols 75 -O ascii -T text/html | \
-		sed -e '$${/^$$/d;}' > $@
-
-OPTIONS: OPTIONS.md
-	${PANDOC} --email-obfuscation=none -s --metadata title="OPTIONS" -f markdown-smart -t html OPTIONS.md | \
-		${W3M} -dump -cols 75 -O ascii -T text/html | \
-		sed -e '$${/^$$/d;}' > $@
-
-CONTRIBUTING: CONTRIBUTING.md
-	${PANDOC} --email-obfuscation=none -s --metadata title="CONTRIBUTING" -f markdown-smart -t html CONTRIBUTING.md | \
-		${W3M} -dump -cols 75 -O ascii -T text/html | \
-		sed -e '$${/^$$/d;}' > $@
-
-PLATFORMS: PLATFORMS.md
-	${PANDOC} --email-obfuscation=none -s --metadata title="PLATFORMS" -f markdown-smart -t html PLATFORMS.md | \
-		${W3M} -dump -cols 75 -O ascii -T text/html | \
-		sed -e '$${/^$$/d;}' > $@
-
-CODE_OF_CONDUCT: CODE_OF_CONDUCT.md
-	${PANDOC} --email-obfuscation=none -s --metadata title="CODE OF CONDUCT" -f markdown-smart -t html CODE_OF_CONDUCT.md | \
-		${W3M} -dump -cols 75 -O ascii -T text/html | \
-		sed -e '$${/^$$/d;}' > $@
-
-unit::
-	sh ${top_builddir}/unit/unittest.sh
-
-clean::

Makefile.tests

@@ -0,0 +1,10 @@
+# Hey Emacs, this is -*- makefile-automake -*- file!
+# vim: filetype=automake
+
+AM_CPPFLAGS +=					\
+	$(CMOCKA_CFLAGS)			\
+	-DTESTS_DIR=\"$(abs_srcdir)\"		\
+	-DNAMED_PLUGINDIR=\"$(libdir)/named\"
+
+LDADD =			\
+	$(CMOCKA_LIBS)

Makefile.top

@@ -0,0 +1,89 @@
+# Hey Emacs, this is -*- makefile-automake -*- file!
+# vim: filetype=automake
+
+ACLOCAL_AMFLAGS = -I $(top_srcdir)/m4
+
+AM_CFLAGS =					\
+	$(STD_CFLAGS)
+
+AM_CPPFLAGS =					\
+	$(STD_CPPFLAGS)				\
+	-include $(top_builddir)/config.h	\
+	-I$(srcdir)/include
+
+if HAVE_GSSAPI
+AM_CPPFLAGS +=					\
+	$(GSSAPI_CFLAGS)
+endif
+
+LIBISC_CFLAGS =						\
+	-I$(top_srcdir)/include				\
+	-I$(top_srcdir)/lib/isc/unix/include		\
+	-I$(top_srcdir)/lib/isc/pthreads/include	\
+	-I$(top_srcdir)/lib/isc/include			\
+	-I$(top_builddir)/lib/isc/include
+
+if HAVE_JSON_C
+LIBISC_CFLAGS +=					\
+	$(JSON_C_CFLAGS)
+endif HAVE_JSON_C
+
+if HAVE_LIBXML2
+LIBISC_CFLAGS +=					\
+	$(LIBXML2_CFLAGS)
+endif HAVE_LIBXML2
+
+LIBISC_LIBS = $(top_builddir)/lib/isc/libisc.la
+
+LIBDNS_CFLAGS = \
+	-I$(top_srcdir)/lib/dns/include			\
+	-I$(top_builddir)/lib/dns/include
+
+LIBDNS_LIBS = \
+	$(top_builddir)/lib/dns/libdns.la
+
+if HAVE_DNSTAP
+LIBDNS_CFLAGS +=					\
+	$(DNSTAP_CFLAGS)
+endif HAVE_DNSTAP
+
+if HAVE_LMDB
+LIBDNS_CFLAGS +=					\
+	$(LMDB_CFLAGS)
+endif HAVE_LMDB
+
+LIBNS_CFLAGS = \
+	-I$(top_srcdir)/lib/ns/include
+
+LIBNS_LIBS = \
+	$(top_builddir)/lib/ns/libns.la
+
+LIBIRS_CFLAGS = \
+	-I$(top_srcdir)/lib/irs/include
+
+LIBIRS_LIBS = \
+	$(top_builddir)/lib/irs/libirs.la
+
+LIBISCCFG_CFLAGS = \
+	-I$(top_srcdir)/lib/isccfg/include
+
+LIBISCCFG_LIBS = \
+	$(top_builddir)/lib/isccfg/libisccfg.la
+
+LIBISCCC_CFLAGS = \
+	-I$(top_srcdir)/lib/isccc/include/
+
+LIBISCCC_LIBS = \
+	$(top_builddir)/lib/isccc/libisccc.la
+
+LIBBIND9_CFLAGS = \
+	-I$(top_srcdir)/lib/bind9/include
+
+LIBBIND9_LIBS = \
+	$(top_builddir)/lib/bind9/libbind9.la
+
+LIBLTDL_CFLAGS = \
+	-I$(top_srcdir)/libltdl
+
+LIBLTDL_LIBS = \
+	$(top_builddir)/libltdl/libltdlc.la

NEWS

@@ -0,0 +1 @@
+CHANGES

OPTIONS

@@ -1,28 +0,0 @@
-OPTIONS
-
-Setting the STD_CDEFINES environment variable before running configure can
-be used to enable certain compile-time options that are not explicitly
-defined in configure.
-
-Some of these settings are:
-
-         Setting                            Description
-                          Overwrite memory with tag values when allocating
--DISC_MEM_DEFAULTFILL=1   or freeing it; this impairs performance but
-                          makes debugging of memory problems easier.
-                          Don't track memory allocations by file and line
--DISC_MEM_TRACKLINES=0    number; this improves performance but makes
-                          debugging more difficult.
--DISC_FACILITY=LOG_LOCAL0 Change the default syslog facility for named
--DNS_CLIENT_DROPPORT=0    Disable dropping queries from particular
-                          well-known ports:
--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/
-                          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
--DISC_HEAP_CHECK          Test heap consistency after every heap
-                          operation; used when debugging

PLATFORMS

@@ -1,99 +0,0 @@
-PLATFORMS
-
-Supported platforms
-
-In general, this version of BIND will build and run on any POSIX-compliant
-system with a C11-compliant C compiler, BSD-style sockets with
-RFC-compliant IPv6 support, POSIX-compliant threads, the libuv
-asynchronous I/O library, and the OpenSSL cryptography library.
-
-The following C11 features are used in BIND 9:
-
-  * Atomic operations support from the compiler is needed, either in the
-    form of builtin operations, C11 atomics, or the Interlocked family of
-    functions on Windows.
-
-  * Thread Local Storage support from the compiler is needed, either in
-    the form of C11 _Thread_local/thread_local, the __thread GCC
-    extension, or the __declspec(thread) MSVC extension on Windows.
-
-BIND 9.16 requires a fairly recent version of libuv (at least 1.x). For
-some of the older systems listed below, you will have to install an
-updated libuv package from sources such as EPEL, PPA, or other native
-sources for updated packages. The other option is to build and install
-libuv from source.
-
-Certain optional BIND features have additional library dependencies. These
-include libxml2 and libjson-c for statistics, libmaxminddb for
-geolocation, libfstrm and libprotobuf-c for DNSTAP, and libidn2 for
-internationalized domain name conversion.
-
-ISC regularly tests BIND on many operating systems and architectures, but
-lacks the resources to test all of them. Consequently, ISC is only able to
-offer support on a "best effort" basis for some.
-
-Regularly tested platforms
-
-As of Jul 2020, BIND 9.16 is fully supported and regularly tested on the
-following systems:
-
-  * Debian 9, 10
-  * Ubuntu LTS 16.04, 20.04
-  * Fedora 32
-  * Red Hat Enterprise Linux / CentOS 7, 8
-  * FreeBSD 11.3, 12.1
-  * OpenBSD 6.6
-  * Alpine Linux
-
-The amd64, i386, armhf and arm64 CPU architectures are all fully
-supported.
-
-Best effort
-
-The following are platforms on which BIND is known to build and run. ISC
-makes every effort to fix bugs on these platforms, but may be unable to do
-so quickly due to lack of hardware, less familiarity on the part of
-engineering staff, and other constraints. With the exception of Windows
-Server 2012 R2, none of these are tested regularly by ISC.
-
-  * Windows Server 2012 R2, 2016 / x64
-  * Windows 10 / x64
-  * macOS 10.12+
-  * Solaris 11
-  * NetBSD
-  * Other Linux distributions still supported by their vendors, such as:
-      + Ubuntu 19.04+
-      + Gentoo
-      + Arch Linux
-  * OpenWRT/LEDE 17.01+
-  * Other CPU architectures (mips, mipsel, sparc, ...)
-
-Community maintained
-
-These systems may not all have the required dependencies for building BIND
-easily available, although it will be possible in many cases to compile
-those directly from source. The community and interested parties may wish
-to help with maintenance, and we welcome patch contributions, although we
-cannot guarantee that we will accept them. All contributions will be
-assessed against the risk of adverse effect on officially supported
-platforms.
-
-  * Platforms past or close to their respective EOL dates, such as:
-      + Ubuntu 14.04, 18.10
-      + CentOS 6
-      + Debian Jessie
-      + FreeBSD 10.x
-
-Unsupported platforms
-
-These are platforms on which BIND 9.16 is known not to build or run:
-
-  * Platforms without at least OpenSSL 1.0.2
-  * Windows 10 / x86
-  * Windows Server 2012 and older
-  * Solaris 10 and older
-  * Platforms that don't support IPv6 Advanced Socket API (RFC 3542)
-  * Platforms that don't support atomic operations (via compiler or
-    library)
-  * Linux without NPTL (Native POSIX Thread Library)
-  * Platforms on which libuv cannot be compiled

PLATFORMS.md

@@ -25,7 +25,7 @@ The following C11 features are used in BIND 9:
   of C11 `_Thread_local`/`thread_local`, the `__thread` GCC extension, or
   the `__declspec(thread)` MSVC extension on Windows.
 
-BIND 9.16 requires a fairly recent version of `libuv` (at least 1.x).  For
+BIND 9.17 requires a fairly recent version of `libuv` (at least 1.x).  For
 some of the older systems listed below, you will have to install an updated
 `libuv` package from sources such as EPEL, PPA, or other native sources for
 updated packages. The other option is to build and install `libuv` from
@@ -42,7 +42,7 @@ offer support on a "best effort" basis for some.
 
 ### Regularly tested platforms
 
-As of Jul 2020, BIND 9.16 is fully supported and regularly tested on the
+As of Jul 2020, BIND 9.17 is fully supported and regularly tested on the
 following systems:
 
 * Debian 9, 10
@@ -93,7 +93,7 @@ platforms.
 
 ## Unsupported platforms
 
-These are platforms on which BIND 9.16 is known *not* to build or run:
+These are platforms on which BIND 9.17 is known *not* to build or run:
 
 * Platforms without at least OpenSSL 1.0.2
 * Windows 10 / x86

README

@@ -1,383 +0,0 @@
-README
-
-BIND 9
-
-Contents
-
- 1. Introduction
- 2. Reporting bugs and getting help
- 3. Contributing to BIND
- 4. BIND 9.16 features
- 5. Building BIND
- 6. macOS
- 7. Dependencies
- 8. Compile-time options
- 9. Automated testing
-10. Documentation
-11. Change log
-12. Acknowledgments
-
-Introduction
-
-BIND (Berkeley Internet Name Domain) is a complete, highly portable
-implementation of the DNS (Domain Name System) protocol.
-
-The BIND name server, named, is able to serve as an authoritative name
-server, recursive resolver, DNS forwarder, or all three simultaneously. It
-implements views for split-horizon DNS, automatic DNSSEC zone signing and
-key management, catalog zones to facilitate provisioning of zone data
-throughout a name server constellation, response policy zones (RPZ) to
-protect clients from malicious data, response rate limiting (RRL) and
-recursive query limits to reduce distributed denial of service attacks,
-and many other advanced DNS features. BIND also includes a suite of
-administrative tools, including the dig and delv DNS lookup tools,
-nsupdate for dynamic DNS zone updates, rndc for remote name server
-administration, and more.
-
-BIND 9 began as a complete re-write of the BIND architecture that was used
-in versions 4 and 8. Internet Systems Consortium (https://www.isc.org), a
-501(c)(3) public benefit corporation dedicated to providing software and
-services in support of the Internet infrastructure, developed BIND 9 and
-is responsible for its ongoing maintenance and improvement. BIND is open
-source software licensed under the terms of the Mozilla Public License,
-version 2.0.
-
-For a summary of features introduced in past major releases of BIND, see
-the file HISTORY.
-
-For a detailed list of changes made throughout the history of BIND 9, see
-the file CHANGES. See below for details on the CHANGES file format.
-
-For up-to-date versions and release notes, see https://www.isc.org/
-download/.
-
-For information about supported platforms, see PLATFORMS.
-
-Reporting bugs and getting help
-
-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.
-
-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, send mail to security-officer@isc.org using our
-OpenPGP key to secure your message. (Information about OpenPGP and links
-to our key can be found at https://www.isc.org/pgpkey.) Please do not
-discuss the bug on any public mailing list.
-
-For a general overview of ISC security policies, read the Knowledge Base
-article at https://kb.isc.org/docs/aa-00861.
-
-Professional support and training for BIND are available from ISC at
-https://www.isc.org/support.
-
-To join the BIND Users mailing list, or view the archives, visit https://
-lists.isc.org/mailman/listinfo/bind-users.
-
-If you're planning on making changes to the BIND 9 source code, you may
-also want to join the BIND Workers mailing list, at https://lists.isc.org/
-mailman/listinfo/bind-workers.
-
-Contributing to BIND
-
-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: CONTRIBUTING.md - Code of Conduct: CODE_OF_CONDUCT.md
-- BIND 9 code style: doc/dev/style.md - BIND architecture and developer
-guide: doc/dev/dev.md
-
-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.16 features
-
-BIND 9.16 is the current stable branch of BIND 9. It includes all changes
-from the 9.15 development branch, updating the previous stable branch,
-9.14. New features include:
-
-  * New dnssec-policy statement to configure a key and signing policy for
-    zones, enabling automatic key regeneration and rollover.
-  * New network manager based on libuv.
-  * Added support for the new GeoIP2 geolocation API, libmaxminddb.
-  * Improved DNSSEC trust anchor configuration using the trust-anchors
-    statement, permitting configuration of trust anchors in DS as well as
-    DNSKEY format.
-  * YAML output for dig, mdig, and delv.
-
-Building BIND
-
-Minimally, BIND requires a UNIX or Linux system with an ANSI C compiler,
-basic POSIX support, and a 64-bit integer type. BIND also requires the
-libuv asynchronous I/O library, and a cryptography provider library such
-as OpenSSL or a hardware service module supporting PKCS#11. On Linux, BIND
-requires the libcap library to set process privileges, though this
-requirement can be overridden by disabling capability support at compile
-time. See Compile-time options below for details on other libraries that
-may be required to support optional features.
-
-Successful builds have been observed on many versions of Linux and UNIX,
-including RHEL/CentOS, Fedora, Debian, Ubuntu, SLES, openSUSE, Slackware,
-Alpine, FreeBSD, NetBSD, OpenBSD, macOS, Solaris, OpenIndiana, OmniOS CE,
-HP-UX, and OpenWRT.
-
-BIND is also available for Windows Server 2012 R2 and higher. See
-win32utils/build.txt for details on building for Windows systems.
-
-To build on a UNIX or Linux system, use:
-
-    $ ./configure
-    $ make
-
-If you're planning on making changes to the BIND 9 source, you should run
-make depend. If you're using Emacs, you might find make tags helpful.
-
-Several environment variables that can be set before running configure
-will affect compilation. Significant ones are:
-
-   Variable                            Description
-CC             The C compiler to use. configure tries to figure out the
-               right one for supported systems.
-               C compiler flags. Defaults to include -g and/or -O2 as
-CFLAGS         supported by the compiler. Please include '-g' if you need
-               to set CFLAGS.
-               System header file directories. Can be used to specify
-STD_CINCLUDES  where add-on thread or IPv6 support is, for example.
-               Defaults to empty string.
-               Any additional preprocessor symbols you want defined.
-STD_CDEFINES   Defaults to empty string. For a list of possible settings,
-               see the file OPTIONS.
-LDFLAGS        Linker flags. Defaults to empty string.
-BUILD_CC       Needed when cross-compiling: the native C compiler to use
-               when building for the target system.
-BUILD_CFLAGS   CFLAGS for the target system during cross-compiling.
-BUILD_CPPFLAGS CPPFLAGS for the target system during cross-compiling.
-BUILD_LDFLAGS  LDFLAGS for the target system during cross-compiling.
-BUILD_LIBS     LIBS for the target system during cross-compiling.
-
-Additional environment variables affecting the build are listed at the end
-of the configure help text, which can be obtained by running the command:
-
-$ ./configure --help
-
-macOS
-
-Building on macOS assumes that the "Command Tools for Xcode" is installed.
-This can be downloaded from https://developer.apple.com/download/more/ or,
-if you have Xcode already installed, you can run xcode-select --install.
-(Note that an Apple ID may be required to access the download page.)
-
-Dependencies
-
-Portions of BIND that are written in Python, including dnssec-keymgr,
-dnssec-coverage, dnssec-checkds, and some of the system tests, require the
-argparse, ply and distutils.core modules to be available. argparse is a
-standard module as of Python 2.7 and Python 3.2. ply is available from
-https://pypi.python.org/pypi/ply. distutils.core is required for
-installation.
-
-Compile-time options
-
-To see a full list of configuration options, run configure --help.
-
-To build shared libraries, specify --with-libtool on the configure command
-line.
-
-For the server to support DNSSEC, you need to build it with crypto
-support. To use OpenSSL, you should have OpenSSL 1.0.2e or newer
-installed. If the OpenSSL library is installed in a nonstandard location,
-specify the prefix using --with-openssl=<PREFIX> on the configure command
-line. To use a PKCS#11 hardware service module for cryptographic
-operations, specify the path to the PKCS#11 provider library using
---with-pkcs11=<PREFIX>, and configure BIND with --enable-native-pkcs11.
-
-To support the HTTP statistics channel, the server must be linked with at
-least one of the following libraries: libxml2 http://xmlsoft.org or json-c
-https://github.com/json-c/json-c. If these are installed at a nonstandard
-location, then:
-
-  * for libxml2, specify the prefix using --with-libxml2=/prefix,
-  * for json-c, adjust PKG_CONFIG_PATH.
-
-To support compression on the HTTP statistics channel, the server must be
-linked against libzlib. If this is installed in a nonstandard location,
-specify the prefix using --with-zlib=/prefix.
-
-To support storing configuration data for runtime-added zones in an LMDB
-database, the server must be linked with liblmdb. If this is installed in
-a nonstandard location, specify the prefix using with-lmdb=/prefix.
-
-To support MaxMind GeoIP2 location-based ACLs, the server must be linked
-with libmaxminddb. This is turned on by default if the library is found;
-if the library is installed in a nonstandard location, specify the prefix
-using --with-maxminddb=/prefix. GeoIP2 support can be switched off with
---disable-geoip.
-
-For DNSTAP packet logging, you must have installed libfstrm https://
-github.com/farsightsec/fstrm and libprotobuf-c https://
-developers.google.com/protocol-buffers, and BIND must be configured with
---enable-dnstap.
-
-Certain compiled-in constants and default settings can be decreased to
-values better suited to small machines, e.g. OpenWRT boxes, by specifying
---with-tuning=small on the configure command line. This will decrease
-memory usage by using smaller structures, but will degrade performance.
-
-On Linux, process capabilities are managed in user space using the libcap
-library, which can be installed on most Linux systems via the libcap-dev
-or libcap-devel package. Process capability support can also be disabled
-by configuring with --disable-linux-caps.
-
-On some platforms it is necessary to explicitly request large file support
-to handle files bigger than 2GB. This can be done by using
---enable-largefile on the configure command line.
-
-Support for the "fixed" rrset-order option can be enabled or disabled by
-specifying --enable-fixed-rrset or --disable-fixed-rrset on the configure
-command line. By default, fixed rrset-order is disabled to reduce memory
-footprint.
-
-The --enable-querytrace option causes named to log every step of
-processing every query. This should only be enabled when debugging,
-because it has a significant negative impact on query performance.
-
-make install will install named and the various BIND 9 libraries. By
-default, installation is into /usr/local, but this can be changed with the
---prefix option when running configure.
-
-You may specify the option --sysconfdir to set the directory where
-configuration files like named.conf go by default, and --localstatedir to
-set the default parent directory of run/named.pid. --sysconfdir defaults
-to $prefix/etc and --localstatedir defaults to $prefix/var.
-
-Automated testing
-
-A system test suite can be run with make test. The system tests require
-you to configure a set of virtual IP addresses on your system (this allows
-multiple servers to run locally and communicate with one another). These
-IP addresses can be configured by running the command bin/tests/system/
-ifconfig.sh up as root.
-
-Some tests require Perl and the Net::DNS and/or IO::Socket::INET6 modules,
-and will be skipped if these are not available. Some tests require Python
-and the dnspython module and will be skipped if these are not available.
-See bin/tests/system/README for further details.
-
-Unit tests are implemented using the CMocka unit testing framework. To
-build them, use configure --with-cmocka. Execution of tests is done by the
-Kyua test execution engine; if the kyua command is available, then unit
-tests can be run via make test or make unit.
-
-Documentation
-
-The BIND 9 Administrator Reference Manual is included with the source
-distribution, in DocBook XML, HTML, and PDF format, in the doc/arm
-directory.
-
-Some of the programs in the BIND 9 distribution have man pages in their
-directories. In particular, the command line options of named are
-documented in bin/named/named.8.
-
-Frequently (and not-so-frequently) asked questions and their answers can
-be found in the ISC Knowledge Base at https://kb.isc.org.
-
-Additional information on various subjects can be found in other README
-files throughout the source tree.
-
-Change log
-
-A detailed list of all changes that have been made throughout the
-development BIND 9 is included in the file CHANGES, with the most recent
-changes listed first. Change notes include tags indicating the category of
-the change that was made; these categories are:
-
-   Category                            Description
-[func]         New feature
-[bug]          General bug fix
-[security]     Fix for a significant security flaw
-[experimental] Used for new features when the syntax or other aspects of
-               the design are still in flux and may change
-[port]         Portability enhancement
-[maint]        Updates to built-in data such as root server addresses and
-               keys
-[tuning]       Changes to built-in configuration defaults and constants to
-               improve performance
-[performance]  Other changes to improve server performance
-[protocol]     Updates to the DNS protocol such as new RR types
-[test]         Changes to the automatic tests, not affecting server
-               functionality
-[cleanup]      Minor corrections and refactoring
-[doc]          Documentation
-[contrib]      Changes to the contributed tools and libraries in the
-               'contrib' subdirectory
-               Used in the master development branch to reserve change
-[placeholder]  numbers for use in other branches, e.g. when fixing a bug
-               that only exists in older releases
-
-In general, [func] and [experimental] tags will only appear in new-feature
-releases (i.e., those with version numbers ending in zero). Some new
-functionality may be backported to older releases on a case-by-case basis.
-All other change types may be applied to all currently-supported releases.
-
-Bug report identifiers
-
-Most notes in the CHANGES file include a reference to a bug report or
-issue number. Prior to 2018, these were usually of the form [RT #NNN] and
-referred to entries in the "bind9-bugs" RT database, which was not open to
-the public. More recent entries use the form [GL #NNN] or, less often, [GL
-!NNN], which, respectively, refer to issues or merge requests in the
-GitLab database. Most of these are publicly readable, unless they include
-information which is confidential or security sensitive.
-
-To look up a GitLab issue by its number, use the URL https://
-gitlab.isc.org/isc-projects/bind9/issues/NNN. To look up a merge request,
-use https://gitlab.isc.org/isc-projects/bind9/merge_requests/NNN.
-
-In rare cases, an issue or merge request number may be followed with the
-letter "P". This indicates that the information is in the private ISC
-GitLab instance, which is not visible to the public.
-
-Acknowledgments
-
-  * The original development of BIND 9 was underwritten by the following
-    organizations:
-
-      Sun Microsystems, Inc.
-      Hewlett Packard
-      Compaq Computer Corporation
-      IBM
-      Process Software Corporation
-      Silicon Graphics, Inc.
-      Network Associates, Inc.
-      U.S. Defense Information Systems Agency
-      USENIX Association
-      Stichting NLnet - NLnet Foundation
-      Nominum, Inc.
-
-  * This product includes software developed by the OpenSSL Project for
-    use in the OpenSSL Toolkit. http://www.OpenSSL.org/
-
-  * This product includes cryptographic software written by Eric Young
-    (eay@cryptsoft.com)
-
-  * This product includes software written by Tim Hudson
-    (tjh@cryptsoft.com)

README.md

@@ -15,7 +15,7 @@
 1. [Introduction](#intro)
 1. [Reporting bugs and getting help](#help)
 1. [Contributing to BIND](#contrib)
-1. [BIND 9.16 features](#features)
+1. [BIND 9.17 features](#features)
 1. [Building BIND](#build)
 1. [macOS](#macos)
 1. [Dependencies](#dependencies)
@@ -28,26 +28,26 @@
 ### <a name="intro"/> Introduction
 
 BIND (Berkeley Internet Name Domain) is a complete, highly portable
-implementation of the DNS (Domain Name System) protocol.
+implementation of the Domain Name System (DNS) protocol.
 
-The BIND name server, `named`, is able to serve as an authoritative name
-server, recursive resolver, DNS forwarder, or all three simultaneously.  It
+The BIND name server, `named`, can act as an authoritative name
+server, recursive resolver, DNS forwarder, or all three simultaneously. It
 implements views for split-horizon DNS, automatic DNSSEC zone signing and
 key management, catalog zones to facilitate provisioning of zone data
 throughout a name server constellation, response policy zones (RPZ) to
 protect clients from malicious data, response rate limiting (RRL) and
 recursive query limits to reduce distributed denial of service attacks,
-and many other advanced DNS features.  BIND also includes a suite of
+and many other advanced DNS features. BIND also includes a suite of
 administrative tools, including the `dig` and `delv` DNS lookup tools,
 `nsupdate` for dynamic DNS zone updates, `rndc` for remote name server
 administration, and more.
 
-BIND 9 began as a complete re-write of the BIND architecture that was
+BIND 9 began as a complete rewrite of the BIND architecture that was
 used in versions 4 and 8.  Internet Systems Consortium
-([https://www.isc.org](https://www.isc.org)), a 501(c)(3) public benefit
+([https://www.isc.org](https://www.isc.org)), a 501(c)(3) US public benefit
 corporation dedicated to providing software and services in support of the
 Internet infrastructure, developed BIND 9 and is responsible for its
-ongoing maintenance and improvement.  BIND is open source software
+ongoing maintenance and improvement. BIND is open source software
 licensed under the terms of the Mozilla Public License, version 2.0.
 
 For a summary of features introduced in past major releases of BIND,
@@ -65,19 +65,19 @@ For information about supported platforms, see [PLATFORMS](PLATFORMS.md).
 ### <a name="help"/> Reporting bugs and getting help
 
 To report non-security-sensitive bugs or request new features, you may
-open an Issue in the BIND 9 project on the
+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
+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
+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
+If you are reporting a bug that is a potential security issue, such as an
 assertion failure or other crash in `named`, please do *NOT* use GitLab to
 report it. Instead, send mail to
 [security-officer@isc.org](mailto:security-officer@isc.org) using our
@@ -86,11 +86,12 @@ to our key can be found at
 [https://www.isc.org/pgpkey](https://www.isc.org/pgpkey).) Please do not
 discuss the bug on any public mailing list.
 
-For a general overview of ISC security policies, read the Knowledge Base
+For a general overview of ISC security policies, read the Knowledgebase
 article at [https://kb.isc.org/docs/aa-00861](https://kb.isc.org/docs/aa-00861).
 
 Professional support and training for BIND are available from
-ISC at [https://www.isc.org/support](https://www.isc.org/support).
+ISC. Contact us at [https://www.isc.org/contact](https://www.isc.org/contact)
+for more information.
 
 To join the __BIND Users__ mailing list, or view the archives, visit
 [https://lists.isc.org/mailman/listinfo/bind-users](https://lists.isc.org/mailman/listinfo/bind-users).
@@ -102,7 +103,7 @@ may also want to join the __BIND Workers__ mailing list, at
 ### <a name="contrib"/> Contributing to BIND
 
 ISC maintains a public git repository for BIND; details can be found
-at [http://www.isc.org/git/](http://www.isc.org/git/).
+at [https://www.isc.org/sourceaccess/](https://www.isc.org/sourceaccess/).
 
 Information for BIND contributors can be found in the following files:
 - General information: [CONTRIBUTING.md](CONTRIBUTING.md)
@@ -112,38 +113,32 @@ Information for BIND contributors can be found in the following files:
 
 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).
+on the [ISC GitLab server](https://gitlab.isc.org).
 
-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
+By default, external contributors do not have the ability to fork BIND on the
+GitLab server; 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
+[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.16 features
+### <a name="features"/> BIND 9.17 features
 
-BIND 9.16 is the current stable branch of BIND 9. It includes all
-changes from the 9.15 development branch, updating the previous stable
-branch, 9.14. New features include:
+BIND 9.17 is the newest development branch of BIND 9. It includes a
+number of changes from BIND 9.16 and earlier releases. New features include:
 
-* New `dnssec-policy` statement to configure a key and signing policy
-  for zones, enabling automatic key regeneration and rollover.
-* New network manager based on `libuv`.
-* Added support for the new GeoIP2 geolocation API, `libmaxminddb`.
-* Improved DNSSEC trust anchor configuration using the `trust-anchors`
-  statement, permitting configuration of trust anchors in DS as well as
-  DNSKEY format.
-* YAML output for `dig`, `mdig`, and `delv`.
+* The new option `max-ixfr-ratio` to limit the size of outgoing IXFR responses
+  before falling back to full zone transfers.
+* `rndc nta -d` and `rndc secroots` now include `validate-except` entries
+  when listing negative trust anchors.
 
-### <a name="build"/> Building BIND
+### <a name="build"/> Building BIND 9
 
-Minimally, BIND requires a UNIX or Linux system with an ANSI C compiler,
-basic POSIX support, and a 64-bit integer type.  BIND also requires the
+At a minimum, BIND requires a Unix or Linux system with an ANSI C compiler,
+basic POSIX support, and a 64-bit integer type. BIND also requires the
 `libuv` asynchronous I/O library, and a cryptography provider library
 such as OpenSSL or a hardware service module supporting PKCS#11. On
 Linux, BIND requires the `libcap` library to set process privileges,
@@ -153,37 +148,31 @@ for details on other libraries that may be required to support
 optional features.
 
 Successful builds have been observed on many versions of Linux and
-UNIX, including RHEL/CentOS, Fedora, Debian, Ubuntu, SLES, openSUSE,
+Unix, including RHEL/CentOS, Fedora, Debian, Ubuntu, SLES, openSUSE,
 Slackware, Alpine, FreeBSD, NetBSD, OpenBSD, macOS, Solaris,
 OpenIndiana, OmniOS CE, HP-UX, and OpenWRT.
 
-BIND is also available for Windows Server 2012 R2 and higher.  See
+BIND 9 is also available for Windows Server 2012 R2 and higher. See
 `win32utils/build.txt` for details on building for Windows
 systems.
 
-To build on a UNIX or Linux system, use:
+To build on a Unix or Linux system, use:
 
+		$ autoreconf -fi (if you are building in the git repository)
 		$ ./configure
 		$ make
 
 If you're planning on making changes to the BIND 9 source, you should run
 `make depend`.  If you're using Emacs, you might find `make tags` helpful.
 
-Several environment variables that can be set before running `configure` will
+Several environment variables, which can be set before running `configure`,
 affect compilation.  Significant ones are:
 
 |Variable|Description |
 |--------------------|-----------------------------------------------|
 |`CC`|The C compiler to use.  `configure` tries to figure out the right one for supported systems.|
 |`CFLAGS`|C compiler flags.  Defaults to include -g and/or -O2 as supported by the compiler.  Please include '-g' if you need to set `CFLAGS`. |
-|`STD_CINCLUDES`|System header file directories.  Can be used to specify where add-on thread or IPv6 support is, for example.  Defaults to empty string.|
-|`STD_CDEFINES`|Any additional preprocessor symbols you want defined.  Defaults to empty string. For a list of possible settings, see the file [OPTIONS](OPTIONS.md).|
 |`LDFLAGS`|Linker flags. Defaults to empty string.|
-|`BUILD_CC`|Needed when cross-compiling: the native C compiler to use when building for the target system.|
-|`BUILD_CFLAGS`|`CFLAGS` for the target system during cross-compiling.|
-|`BUILD_CPPFLAGS`|`CPPFLAGS` for the target system during cross-compiling.|
-|`BUILD_LDFLAGS`|`LDFLAGS` for the target system during cross-compiling.|
-|`BUILD_LIBS`|`LIBS` for the target system during cross-compiling.|
 
 Additional environment variables affecting the build are listed at the
 end of the `configure` help text, which can be obtained by running the
@@ -193,22 +182,27 @@ command:
 
 #### <a name="macos"> macOS
 
-Building on macOS assumes that the "Command Tools for Xcode" is installed.
-This can be downloaded from
+Building on macOS assumes that the "Command Tools for Xcode" are installed.
+These can be downloaded from
 [https://developer.apple.com/download/more/](https://developer.apple.com/download/more/)
-or, if you have Xcode already installed, you can run `xcode-select
---install`.  (Note that an Apple ID may be required to access the download
+or, if you have Xcode already installed, you can run
+`xcode-select--install`. (Note that an Apple ID may be required to access the download
 page.)
 
-### <a name="dependencies"/> Dependencies
+#### <a name="dependencies"> Dependencies
 
-Portions of BIND that are written in Python, including
-`dnssec-keymgr`, `dnssec-coverage`, `dnssec-checkds`, and some of the
-system tests, require the `argparse`, `ply` and `distutils.core` modules
-to be available.
-`argparse` is a standard module as of Python 2.7 and Python 3.2.
-`ply` is available from [https://pypi.python.org/pypi/ply](https://pypi.python.org/pypi/ply).
-`distutils.core` is required for installation.
+To build BIND you need to have the following packages installed:
+
+    libuv
+    pkg-config / pkgconfig / pkgconf
+
+To build BIND from the git repository, you need the following tools
+installed:
+
+    autoconf (includes autoreconf)
+    automake
+    libtool
+    libltdl-dev (Debian) / libtool-ltdl-dev (Fedora/CentOS) / libltdl (FreeBSD)
 
 #### <a name="opts"/> Compile-time options
 
@@ -218,7 +212,7 @@ To build shared libraries, specify `--with-libtool` on the `configure`
 command line.
 
 For the server to support DNSSEC, you need to build it with crypto support.
-To use OpenSSL, you should have OpenSSL 1.0.2e or newer installed.  If the
+To use OpenSSL, you should have OpenSSL 1.0.2e or newer installed. If the
 OpenSSL library is installed in a nonstandard location, specify the prefix
 using `--with-openssl=<PREFIX>` on the configure command line. To use a
 PKCS#11 hardware service module for cryptographic operations, specify the
@@ -231,15 +225,15 @@ least one of the following libraries: `libxml2`
 [https://github.com/json-c/json-c](https://github.com/json-c/json-c).
 If these are installed at a nonstandard location, then:
 
-* for `libxml2`, specify the prefix using `--with-libxml2=/prefix`,
+* for `libxml2`, specify the prefix using `--with-libxml2=/prefix`.
 * for `json-c`, adjust `PKG_CONFIG_PATH`.
 
 To support compression on the HTTP statistics channel, the server must be
-linked against `libzlib`.  If this is installed in a nonstandard location,
+linked against `libzlib`. If this is installed in a nonstandard location,
 specify the prefix using `--with-zlib=/prefix`.
 
 To support storing configuration data for runtime-added zones in an LMDB
-database, the server must be linked with liblmdb. If this is installed in a
+database, the server must be linked with `liblmdb`. If this is installed in a
 nonstandard location, specify the prefix using `with-lmdb=/prefix`.
 
 To support MaxMind GeoIP2 location-based ACLs, the server must be linked
@@ -256,8 +250,8 @@ and BIND must be configured with `--enable-dnstap`.
 
 Certain compiled-in constants and default settings can be decreased to
 values better suited to small machines, e.g. OpenWRT boxes, by specifying
-`--with-tuning=small` on the `configure` command line. This will decrease
-memory usage by using smaller structures, but will degrade performance.
+`--with-tuning=small` on the `configure` command line. This decreases
+memory usage by using smaller structures, but degrades performance.
 
 On Linux, process capabilities are managed in user space using
 the `libcap` library, which can be installed on most Linux systems via
@@ -270,53 +264,54 @@ to handle files bigger than 2GB.  This can be done by using
 
 Support for the "fixed" rrset-order option can be enabled or disabled by
 specifying `--enable-fixed-rrset` or `--disable-fixed-rrset` on the
-configure command line.  By default, fixed rrset-order is disabled to
+configure command line. By default, fixed rrset-order is disabled to
 reduce memory footprint.
 
 The `--enable-querytrace` option causes `named` to log every step of
-processing every query. This should only be enabled when debugging, because
-it has a significant negative impact on query performance.
+processing every query. The `--enable-singletrace` option turns on the
+same verbose tracing, but allows an individual query to be separately
+traced by setting its query ID to 0. These options should only be enabled
+when debugging, because they have a significant negative impact on query
+performance.
 
-`make install` will install `named` and the various BIND 9 libraries.  By
+`make install` installs `named` and the various BIND 9 libraries. By
 default, installation is into /usr/local, but this can be changed with the
 `--prefix` option when running `configure`.
 
 You may specify the option `--sysconfdir` to set the directory where
 configuration files like `named.conf` go by default, and `--localstatedir`
-to set the default parent directory of `run/named.pid`.   `--sysconfdir`
+to set the default parent directory of `run/named.pid`. `--sysconfdir`
 defaults to `$prefix/etc` and `--localstatedir` defaults to `$prefix/var`.
 
 ### <a name="testing"/> Automated testing
 
-A system test suite can be run with `make test`.  The system tests require
+A system test suite can be run with `make check`. The system tests require
 you to configure a set of virtual IP addresses on your system (this allows
-multiple servers to run locally and communicate with one another).  These
+multiple servers to run locally and communicate with each other). These
 IP addresses can be configured by running the command
 `bin/tests/system/ifconfig.sh up` as root.
 
 Some tests require Perl and the `Net::DNS` and/or `IO::Socket::INET6` modules,
-and will be skipped if these are not available. Some tests require Python
-and the `dnspython` module and will be skipped if these are not available.
+and are skipped if these are not available. Some tests require Python
+and the `dnspython` module and are skipped if these are not available.
 See bin/tests/system/README for further details.
 
-Unit tests are implemented using the [CMocka unit testing framework](https://cmocka.org/).
-To build them, use `configure --with-cmocka`. Execution of tests is done
-by the [Kyua test execution engine](https://github.com/jmmv/kyua); if the
-`kyua` command is available, then unit tests can be run via `make test`
-or `make unit`.
+Unit tests are implemented using the CMocka unit testing framework. To build
+them, use `configure --with-cmocka`. Execution of tests is done by the automake
+parallel test driver; unit tests are also run by `make check`.
 
 ### <a name="doc"/> Documentation
 
-The *BIND 9 Administrator Reference Manual* is included with the source
-distribution, in DocBook XML, HTML, and PDF format, in the `doc/arm`
-directory.
+The *BIND 9 Administrator Reference Manual* (ARM) is included with the source
+distribution, and in .rst format, in the `doc/arm`
+directory. HTML and PDF versions are automatically generated and can
+be viewed at [https://bind9.readthedocs.io/en/latest/index.html](https://bind9.readthedocs.io/en/latest/index.html).
 
-Some of the programs in the BIND 9 distribution have man pages in their
-directories.  In particular, the command line options of `named` are
-documented in `bin/named/named.8`.
+Man pages for some of the programs in the BIND 9 distribution
+are also included in the BIND ARM.
 
 Frequently (and not-so-frequently) asked questions and their answers
-can be found in the ISC Knowledge Base at
+can be found in the ISC Knowledgebase at
 [https://kb.isc.org](https://kb.isc.org).
 
 Additional information on various subjects can be found in other
@@ -325,8 +320,8 @@ Additional information on various subjects can be found in other
 ### <a name="changes"/> Change log
 
 A detailed list of all changes that have been made throughout the
-development BIND 9 is included in the file CHANGES, with the most recent
-changes listed first.  Change notes include tags indicating the category of
+development of BIND 9 is included in the file CHANGES, with the most recent
+changes listed first. Change notes include tags indicating the category of
 the change that was made; these categories are:
 
 |Category	|Description	        			|
@@ -344,12 +339,12 @@ the change that was made; these categories are:
 | [cleanup] | Minor corrections and refactoring |
 | [doc] | Documentation |
 | [contrib] | Changes to the contributed tools and libraries in the 'contrib' subdirectory |
-| [placeholder] | Used in the master development branch to reserve change numbers for use in other branches, e.g. when fixing a bug that only exists in older releases |
+| [placeholder] | Used in the master development branch to reserve change numbers for use in other branches, e.g., when fixing a bug that only exists in older releases |
 
-In general, [func] and [experimental] tags will only appear in new-feature
-releases (i.e., those with version numbers ending in zero).  Some new
+In general, [func] and [experimental] tags only appear in new-feature
+releases (i.e., those with version numbers ending in zero). Some new
 functionality may be backported to older releases on a case-by-case basis.
-All other change types may be applied to all currently-supported releases.
+All other change types may be applied to all currently supported releases.
 
 #### Bug report identifiers
 
@@ -359,7 +354,7 @@ and referred to entries in the "bind9-bugs" RT database, which was not open
 to the public. More recent entries use the form `[GL #NNN]` or, less often,
 `[GL !NNN]`, which, respectively, refer to issues or merge requests in the
 GitLab database. Most of these are publicly readable, unless they include
-information which is confidential or security sensitive.
+information which is confidential or security-sensitive.
 
 To look up a GitLab issue by its number, use the URL
 [https://gitlab.isc.org/isc-projects/bind9/issues/NNN](https://gitlab.isc.org/isc-projects/bind9/issues).
@@ -389,7 +384,7 @@ GitLab instance, which is not visible to the public.
 
 * This product includes software developed by the OpenSSL Project for use
   in the OpenSSL Toolkit.
-  [http://www.OpenSSL.org/](http://www.OpenSSL.org/)
+  [https://www.OpenSSL.org/](https://www.OpenSSL.org/)
 * This product includes cryptographic software written by Eric Young
-  (eay@cryptsoft.com)
-* This product includes software written by Tim Hudson (tjh@cryptsoft.com)
+  (eay@cryptsoft.com).
+* This product includes software written by Tim Hudson (tjh@cryptsoft.com).

aclocal.m4

@@ -1,387 +0,0 @@
-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 12 (pkg-config-0.29.2)
-
-dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl As a special exception to the GNU General Public License, if you
-dnl distribute this file as part of a program that contains a
-dnl configuration script generated by Autoconf, you may include it under
-dnl the same distribution terms that you use for the rest of that
-dnl program.
-
-dnl PKG_PREREQ(MIN-VERSION)
-dnl -----------------------
-dnl Since: 0.29
-dnl
-dnl Verify that the version of the pkg-config macros are at least
-dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-dnl installed version of pkg-config, this checks the developer's version
-dnl of pkg.m4 when generating configure.
-dnl
-dnl To ensure that this macro is defined, also add:
-dnl m4_ifndef([PKG_PREREQ],
-dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-dnl
-dnl See the "Since" comment for each macro you use to see what version
-dnl of the macros you require.
-m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.2])
-m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
-    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-])dnl PKG_PREREQ
-
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-dnl ----------------------------------
-dnl Since: 0.16
-dnl
-dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-dnl first found in the path. Checks that the version of pkg-config found
-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-dnl used since that's the first version where most current features of
-dnl pkg-config existed.
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])dnl PKG_PROG_PKG_CONFIG
-
-dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------------------------------
-dnl Since: 0.18
-dnl
-dnl Check to see whether a particular set of modules exists. Similar to
-dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-dnl
-dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
-dnl it's called might be skipped (such as if it is within an "if", you
-dnl have to call PKG_CHECK_EXISTS manually
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-dnl ---------------------------------------------
-dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-dnl pkg_failed based on the result.
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])dnl _PKG_CONFIG
-
-dnl _PKG_SHORT_ERRORS_SUPPORTED
-dnl ---------------------------
-dnl Internal check to see if pkg-config supports short errors.
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])dnl _PKG_SHORT_ERRORS_SUPPORTED
-
-
-dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl   [ACTION-IF-NOT-FOUND])
-dnl --------------------------------------------------------------
-dnl Since: 0.4.0
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $2])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-        AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])dnl PKG_CHECK_MODULES
-
-
-dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl   [ACTION-IF-NOT-FOUND])
-dnl ---------------------------------------------------------------------
-dnl Since: 0.29
-dnl
-dnl Checks for existence of MODULES and gathers its build flags with
-dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-dnl and VARIABLE-PREFIX_LIBS from --libs.
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-dnl configure.ac.
-AC_DEFUN([PKG_CHECK_MODULES_STATIC],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-_save_PKG_CONFIG=$PKG_CONFIG
-PKG_CONFIG="$PKG_CONFIG --static"
-PKG_CHECK_MODULES($@)
-PKG_CONFIG=$_save_PKG_CONFIG[]dnl
-])dnl PKG_CHECK_MODULES_STATIC
-
-
-dnl PKG_INSTALLDIR([DIRECTORY])
-dnl -------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable pkgconfigdir as the location where a module
-dnl should install pkg-config .pc files. By default the directory is
-dnl $libdir/pkgconfig, but the default can be changed by passing
-dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-dnl parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-])dnl PKG_INSTALLDIR
-
-
-dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-dnl --------------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-dnl module should install arch-independent pkg-config .pc files. By
-dnl default the directory is $datadir/pkgconfig, but the default can be
-dnl changed by passing DIRECTORY. The user can override through the
-dnl --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-])dnl PKG_NOARCH_INSTALLDIR
-
-
-dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------
-dnl Since: 0.28
-dnl
-dnl Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])dnl PKG_CHECK_VAR
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless 'enable' is passed literally.
-# For symmetry, 'disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
-      am_maintainer_other[ make rules and dependencies not useful
-      (and sometimes confusing) to the casual installer])],
-    [USE_MAINTAINER_MODE=$enableval],
-    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-m4_include([m4/ax_check_compile_flag.m4])
-m4_include([m4/ax_check_openssl.m4])
-m4_include([m4/ax_posix_shell.m4])
-m4_include([m4/ax_pthread.m4])
-m4_include([m4/ax_restore_flags.m4])
-m4_include([m4/ax_save_flags.m4])
-m4_include([m4/libtool.m4])
-m4_include([m4/ltoptions.m4])
-m4_include([m4/ltsugar.m4])
-m4_include([m4/ltversion.m4])
-m4_include([m4/lt~obsolete.m4])

bin/Makefile.am

@@ -0,0 +1,5 @@
+SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
+
+if HAVE_PKCS11
+SUBDIRS += pkcs11
+endif

bin/Makefile.in

@@ -1,18 +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@
-
-SUBDIRS =	named rndc dig delv dnssec tools nsupdate check confgen \
-		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
-TARGETS =
-
-@BIND9_MAKE_RULES@

bin/check/Makefile.am

@@ -0,0 +1,34 @@
+include $(top_srcdir)/Makefile.top
+
+AM_CPPFLAGS +=			\
+	$(LIBISC_CFLAGS)	\
+	$(LIBDNS_CFLAGS)	\
+	$(LIBNS_CFLAGS)		\
+	$(LIBISCCFG_CFLAGS)	\
+	$(LIBBIND9_CFLAGS)
+
+AM_CPPFLAGS +=						\
+	-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
+
+noinst_LTLIBRARIES = libcheck-tool.la
+
+libcheck_tool_la_SOURCES =	\
+	check-tool.h		\
+	check-tool.c
+
+LDADD =				\
+	libcheck-tool.la	\
+	$(LIBISC_LIBS)		\
+	$(LIBDNS_LIBS)		\
+	$(LIBNS_LIBS)		\
+	$(LIBISCCFG_LIBS)	\
+	$(LIBBIND9_LIBS)
+
+bin_PROGRAMS = named-checkconf named-checkzone
+
+install-exec-hook:
+	ln -f $(DESTDIR)$(bindir)/named-checkzone \
+	      $(DESTDIR)$(bindir)/named-compilezone
+
+uninstall-hook:
+	-rm -f $(DESTDIR)$(bindir)/named-compilezone

bin/check/Makefile.in

@@ -1,87 +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@
-
-VERSION=@BIND9_VERSION@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =	${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \
-		${ISC_INCLUDES} \
-		${OPENSSL_CFLAGS}
-
-CDEFINES = 	-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
-CWARNINGS =
-
-DNSLIBS =	../../lib/dns/libdns.@A@ @NO_LIBTOOL_DNSLIBS@
-ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCLIBS =	../../lib/isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@
-ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @NO_LIBTOOL_ISCLIBS@
-BIND9LIBS =	../../lib/bind9/libbind9.@A@
-NSLIBS =	../../lib/ns/libns.@A@
-
-DNSDEPLIBS =	../../lib/dns/libdns.@A@
-ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCDEPLIBS =	../../lib/isc/libisc.@A@
-BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
-NSDEPENDLIBS =	../../lib/ns/libns.@A@
-
-LIBS =		${ISCLIBS} @LIBS@
-NOSYMLIBS =	${ISCNOSYMLIBS} @LIBS@
-
-SUBDIRS =
-
-# Alphabetically
-TARGETS =	named-checkconf@EXEEXT@ named-checkzone@EXEEXT@
-
-# Alphabetically
-SRCS =		named-checkconf.c named-checkzone.c check-tool.c
-
-@BIND9_MAKE_RULES@
-
-named-checkconf.@O@: named-checkconf.c
-	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
-		-DVERSION=\"${VERSION}\" \
-		-c ${srcdir}/named-checkconf.c
-
-named-checkzone.@O@: named-checkzone.c
-	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
-		-DVERSION=\"${VERSION}\" \
-		-c ${srcdir}/named-checkzone.c
-
-named-checkconf@EXEEXT@: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} \
-		${NSDEPENDLIBS} ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${BIND9DEPLIBS}
-	export BASEOBJS="named-checkconf.@O@ check-tool.@O@"; \
-	export LIBS0="${BIND9LIBS} ${NSLIBS} ${ISCCFGLIBS} ${DNSLIBS}"; \
-	${FINALBUILDCMD}
-
-named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} \
-		${NSDEPENDLIBS} ${DNSDEPLIBS}
-	export BASEOBJS="named-checkzone.@O@ check-tool.@O@"; \
-	export LIBS0="${NSLIBS} ${ISCCFGLIBS} ${DNSLIBS}"; \
-	${FINALBUILDCMD}
-
-installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-
-install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkconf@EXEEXT@ ${DESTDIR}${sbindir}
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkzone@EXEEXT@ ${DESTDIR}${sbindir}
-	(cd ${DESTDIR}${sbindir}; rm -f named-compilezone@EXEEXT@; ${LINK_PROGRAM} named-checkzone@EXEEXT@ named-compilezone@EXEEXT@)
-
-uninstall::
-	rm -f ${DESTDIR}${sbindir}/named-compilezone@EXEEXT@
-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-checkconf@EXEEXT@
-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-checkzone@EXEEXT@
-
-clean distclean::
-	rm -f ${TARGETS} r1.htm

bin/check/check-tool.c

@@ -695,8 +695,13 @@ load_zone(isc_mem_t *mctx, const char *zonename, const char *filename,
 	CHECK(dns_name_fromtext(origin, &buffer, dns_rootname, 0, NULL));
 	CHECK(dns_zone_setorigin(zone, origin));
 	dns_zone_setdbtype(zone, 1, (const char *const *)dbtype);
-	CHECK(dns_zone_setfile(zone, filename, fileformat,
-			       &dns_master_style_default));
+	if (strcmp(filename, "-") == 0) {
+		CHECK(dns_zone_setstream(zone, stdin, fileformat,
+					 &dns_master_style_default));
+	} else {
+		CHECK(dns_zone_setfile(zone, filename, fileformat,
+				       &dns_master_style_default));
+	}
 	if (journal != NULL) {
 		CHECK(dns_zone_setjournal(zone, journal));
 	}

bin/check/named-checkconf.c

@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <isc/attributes.h>
 #include <isc/commandline.h>
 #include <isc/dir.h>
 #include <isc/hash.h>
@@ -56,8 +57,8 @@ isc_log_t *logc = NULL;
 	} while (0)
 
 /*% usage */
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
@@ -184,7 +185,7 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig,
 	const char *zname;
 	const char *zfile = NULL;
 	const cfg_obj_t *maps[4];
-	const cfg_obj_t *mastersobj = NULL;
+	const cfg_obj_t *primariesobj = NULL;
 	const cfg_obj_t *inviewobj = NULL;
 	const cfg_obj_t *zoptions = NULL;
 	const cfg_obj_t *classobj = NULL;
@@ -278,8 +279,12 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig,
 	 * Is the redirect zone configured as a slave?
 	 */
 	if (strcasecmp(cfg_obj_asstring(typeobj), "redirect") == 0) {
-		cfg_map_get(zoptions, "masters", &mastersobj);
-		if (mastersobj != NULL) {
+		cfg_map_get(zoptions, "primaries", &primariesobj);
+		if (primariesobj == NULL) {
+			cfg_map_get(zoptions, "masters", &primariesobj);
+		}
+
+		if (primariesobj != NULL) {
 			return (ISC_R_SUCCESS);
 		}
 	}
@@ -660,7 +665,7 @@ main(int argc, char **argv) {
 			break;
 
 		case 'v':
-			printf(VERSION "\n");
+			printf("%s\n", PACKAGE_VERSION);
 			exit(0);
 
 		case 'x':

bin/check/named-checkconf.rst

@@ -35,62 +35,62 @@ Description
 ~~~~~~~~~~~
 
 ``named-checkconf`` checks the syntax, but not the semantics, of a
-``named`` configuration file. The file is parsed and checked for syntax
-errors, along with all files included by it. If no file is specified,
+``named`` configuration file. The file, along with all files included by it, is parsed and checked for syntax
+errors. If no file is specified,
 ``/etc/named.conf`` is read by default.
 
 Note: files that ``named`` reads in separate parser contexts, such as
 ``rndc.key`` and ``bind.keys``, are not automatically read by
 ``named-checkconf``. Configuration errors in these files may cause
 ``named`` to fail to run, even if ``named-checkconf`` was successful.
-``named-checkconf`` can be run on these files explicitly, however.
+However, ``named-checkconf`` can be run on these files explicitly.
 
 Options
 ~~~~~~~
 
-**-h**
-   Print the usage summary and exit.
+``-h``
+   This option prints the usage summary and exits.
 
-**-j**
-   When loading a zonefile read the journal if it exists.
+``-j``
+   When loading a zonefile, this option instructs ``named`` to read the journal if it exists.
 
-**-l**
-   List all the configured zones. Each line of output contains the zone
-   name, class (e.g. IN), view, and type (e.g. master or slave).
+``-l``
+   This option lists all the configured zones. Each line of output contains the zone
+   name, class (e.g. IN), view, and type (e.g. primary or secondary).
 
-**-c**
-   Check "core" configuration only. This suppresses the loading of
+``-c``
+   This option specifies that only the "core" configuration should be checked. This suppresses the loading of
    plugin modules, and causes all parameters to ``plugin`` statements to
    be ignored.
 
-**-i**
-   Ignore warnings on deprecated options.
+``-i``
+   This option ignores warnings on deprecated options.
 
-**-p**
-   Print out the ``named.conf`` and included files in canonical form if
+``-p``
+   This option prints out the ``named.conf`` and included files in canonical form if
    no errors were detected. See also the ``-x`` option.
 
-**-t** directory
-   Chroot to ``directory`` so that include directives in the
+``-t directory``
+   This option instructs ``named`` to chroot to ``directory``, so that ``include`` directives in the
    configuration file are processed as if run by a similarly chrooted
    ``named``.
 
-**-v**
-   Print the version of the ``named-checkconf`` program and exit.
+``-v``
+   This option prints the version of the ``named-checkconf`` program and exits.
 
-**-x**
-   When printing the configuration files in canonical form, obscure
+``-x``
+   When printing the configuration files in canonical form, this option obscures
    shared secrets by replacing them with strings of question marks
-   ('?'). This allows the contents of ``named.conf`` and related files
-   to be shared MDASH for example, when submitting bug reports MDASH
+   (``?``). This allows the contents of ``named.conf`` and related files
+   to be shared - for example, when submitting bug reports -
    without compromising private data. This option cannot be used without
    ``-p``.
 
-**-z**
-   Perform a test load of all master zones found in ``named.conf``.
+``-z``
+   This option performs a test load of all zones of type ``primary`` found in ``named.conf``.
 
-filename
-   The name of the configuration file to be checked. If not specified,
+``filename``
+   This indicates the name of the configuration file to be checked. If not specified,
    it defaults to ``/etc/named.conf``.
 
 Return Values

bin/check/named-checkzone.c

@@ -16,8 +16,10 @@
 #include <stdlib.h>
 
 #include <isc/app.h>
+#include <isc/attributes.h>
 #include <isc/commandline.h>
 #include <isc/dir.h>
+#include <isc/file.h>
 #include <isc/hash.h>
 #include <isc/log.h>
 #include <isc/mem.h>
@@ -62,8 +64,8 @@ static enum { progmode_check, progmode_compile } progmode;
 		}                                                             \
 	} while (0)
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
@@ -76,7 +78,7 @@ usage(void) {
 		"[-i (full|full-sibling|local|local-sibling|none)] "
 		"[-M (ignore|warn|fail)] [-S (ignore|warn|fail)] "
 		"[-W (ignore|warn)] "
-		"%s zonename filename\n",
+		"%s zonename [ (filename|-) ]\n",
 		prog_name,
 		progmode == progmode_check ? "[-o filename]" : "-o filename");
 	exit(1);
@@ -94,7 +96,7 @@ int
 main(int argc, char **argv) {
 	int c;
 	char *origin = NULL;
-	char *filename = NULL;
+	const char *filename = NULL;
 	isc_log_t *lctx = NULL;
 	isc_result_t result;
 	char classname_in[] = "IN";
@@ -353,7 +355,7 @@ main(int argc, char **argv) {
 			break;
 
 		case 'v':
-			printf(VERSION "\n");
+			printf("%s\n", PACKAGE_VERSION);
 			exit(0);
 
 		case 'w':
@@ -512,7 +514,8 @@ main(int argc, char **argv) {
 		logdump = false;
 	}
 
-	if (isc_commandline_index + 2 != argc) {
+	if (argc - isc_commandline_index < 1 ||
+	    argc - isc_commandline_index > 2) {
 		usage();
 	}
 
@@ -529,7 +532,16 @@ main(int argc, char **argv) {
 	dns_result_register();
 
 	origin = argv[isc_commandline_index++];
-	filename = argv[isc_commandline_index++];
+
+	if (isc_commandline_index == argc) {
+		/* "-" will be interpreted as stdin */
+		filename = "-";
+	} else {
+		filename = argv[isc_commandline_index];
+	}
+
+	isc_commandline_index++;
+
 	result = load_zone(mctx, origin, filename, inputformat, classname,
 			   maxttl, &zone);
 
@@ -563,5 +575,6 @@ main(int argc, char **argv) {
 #ifdef _WIN32
 	DestroySockets();
 #endif /* ifdef _WIN32 */
+
 	return ((result == ISC_R_SUCCESS) ? 0 : 1);
 }

bin/check/named-checkzone.rst

@@ -43,163 +43,164 @@ configuring them into a name server.
 
 ``named-compilezone`` is similar to ``named-checkzone``, but it always
 dumps the zone contents to a specified file in a specified format.
-Additionally, it applies stricter check levels by default, since the
-dump output will be used as an actual zone file loaded by ``named``.
+It also applies stricter check levels by default, since the
+dump output is used as an actual zone file loaded by ``named``.
 When manually specified otherwise, the check levels must at least be as
 strict as those specified in the ``named`` configuration file.
 
 Options
 ~~~~~~~
 
-**-d**
-   Enable debugging.
+``-d``
+   This option enables debugging.
 
-**-h**
-   Print the usage summary and exit.
+``-h``
+   This option prints the usage summary and exits.
 
-**-q**
-   Quiet mode - exit code only.
+``-q``
+   This option sets quiet mode, which only sets an exit code to indicate
+   successful or failed completion.
 
-**-v**
-   Print the version of the ``named-checkzone`` program and exit.
+``-v``
+   This option prints the version of the ``named-checkzone`` program and exits.
 
-**-j**
-   When loading a zone file, read the journal if it exists. The journal
-   file name is assumed to be the zone file name appended with the
-   string ``.jnl``.
+``-j``
+   When loading a zone file, this option tells ``named`` to read the journal if it exists. The journal
+   file name is assumed to be the zone file name with the
+   string ``.jnl`` appended.
 
-**-J** filename
-   When loading the zone file read the journal from the given file, if
-   it exists. (Implies -j.)
+``-J filename``
+   When loading the zone file, this option tells ``named`` to read the journal from the given file, if
+   it exists. This implies ``-j``.
 
-**-c** class
-   Specify the class of the zone. If not specified, "IN" is assumed.
+``-c class``
+   This option specifies the class of the zone. If not specified, ``IN`` is assumed.
 
-**-i** mode
-   Perform post-load zone integrity checks. Possible modes are
-   ``"full"`` (default), ``"full-sibling"``, ``"local"``,
-   ``"local-sibling"`` and ``"none"``.
+``-i mode``
+   This option performs post-load zone integrity checks. Possible modes are
+   ``full`` (the default), ``full-sibling``, ``local``,
+   ``local-sibling``, and ``none``.
 
-   Mode ``"full"`` checks that MX records refer to A or AAAA record
-   (both in-zone and out-of-zone hostnames). Mode ``"local"`` only
+   Mode ``full`` checks that MX records refer to A or AAAA records
+   (both in-zone and out-of-zone hostnames). Mode ``local`` only
    checks MX records which refer to in-zone hostnames.
 
-   Mode ``"full"`` checks that SRV records refer to A or AAAA record
-   (both in-zone and out-of-zone hostnames). Mode ``"local"`` only
+   Mode ``full`` checks that SRV records refer to A or AAAA records
+   (both in-zone and out-of-zone hostnames). Mode ``local`` only
    checks SRV records which refer to in-zone hostnames.
 
-   Mode ``"full"`` checks that delegation NS records refer to A or AAAA
-   record (both in-zone and out-of-zone hostnames). It also checks that
+   Mode ``full`` checks that delegation NS records refer to A or AAAA
+   records (both in-zone and out-of-zone hostnames). It also checks that
    glue address records in the zone match those advertised by the child.
-   Mode ``"local"`` only checks NS records which refer to in-zone
-   hostnames or that some required glue exists, that is when the
-   nameserver is in a child zone.
+   Mode ``local`` only checks NS records which refer to in-zone
+   hostnames or verifies that some required glue exists, i.e., when the
+   name server is in a child zone.
 
-   Mode ``"full-sibling"`` and ``"local-sibling"`` disable sibling glue
-   checks but are otherwise the same as ``"full"`` and ``"local"``
+   Modes ``full-sibling`` and ``local-sibling`` disable sibling glue
+   checks, but are otherwise the same as ``full`` and ``local``,
    respectively.
 
-   Mode ``"none"`` disables the checks.
+   Mode ``none`` disables the checks.
 
-**-f** format
-   Specify the format of the zone file. Possible formats are ``"text"``
-   (default), ``"raw"``, and ``"map"``.
+``-f format``
+   This option specifies the format of the zone file. Possible formats are ``text``
+   (the default), ``raw``, and ``map``.
 
-**-F** format
-   Specify the format of the output file specified. For
-   ``named-checkzone``, this does not cause any effects unless it dumps
+``-F format``
+   This option specifies the format of the output file specified. For
+   ``named-checkzone``, this does not have any effect unless it dumps
    the zone contents.
 
-   Possible formats are ``"text"`` (default), which is the standard
-   textual representation of the zone, and ``"map"``, ``"raw"``, and
-   ``"raw=N"``, which store the zone in a binary format for rapid
-   loading by ``named``. ``"raw=N"`` specifies the format version of the
-   raw zone file: if N is 0, the raw file can be read by any version of
-   ``named``; if N is 1, the file can be read by release 9.9.0 or
-   higher; the default is 1.
+   Possible formats are ``text`` (the default), which is the standard
+   textual representation of the zone, and ``map``, ``raw``, and
+   ``raw=N``, which store the zone in a binary format for rapid
+   loading by ``named``. ``raw=N`` specifies the format version of the
+   raw zone file: if ``N`` is 0, the raw file can be read by any version of
+   ``named``; if N is 1, the file can only be read by release 9.9.0 or
+   higher. The default is 1.
 
-**-k** mode
-   Perform ``"check-names"`` checks with the specified failure mode.
-   Possible modes are ``"fail"`` (default for ``named-compilezone``),
-   ``"warn"`` (default for ``named-checkzone``) and ``"ignore"``.
+``-k mode``
+   This option performs ``check-names`` checks with the specified failure mode.
+   Possible modes are ``fail`` (the default for ``named-compilezone``),
+   ``warn`` (the default for ``named-checkzone``), and ``ignore``.
 
-**-l** ttl
-   Sets a maximum permissible TTL for the input file. Any record with a
-   TTL higher than this value will cause the zone to be rejected. This
+``-l ttl``
+   This option sets a maximum permissible TTL for the input file. Any record with a
+   TTL higher than this value causes the zone to be rejected. This
    is similar to using the ``max-zone-ttl`` option in ``named.conf``.
 
-**-L** serial
-   When compiling a zone to "raw" or "map" format, set the "source
-   serial" value in the header to the specified serial number. (This is
-   expected to be used primarily for testing purposes.)
+``-L serial``
+   When compiling a zone to ``raw`` or ``map`` format, this option sets the "source
+   serial" value in the header to the specified serial number. This is
+   expected to be used primarily for testing purposes.
 
-**-m** mode
-   Specify whether MX records should be checked to see if they are
-   addresses. Possible modes are ``"fail"``, ``"warn"`` (default) and
-   ``"ignore"``.
+``-m mode``
+   This option specifies whether MX records should be checked to see if they are
+   addresses. Possible modes are ``fail``, ``warn`` (the default), and
+   ``ignore``.
 
-**-M** mode
-   Check if a MX record refers to a CNAME. Possible modes are
-   ``"fail"``, ``"warn"`` (default) and ``"ignore"``.
+``-M mode``
+   This option checks whether a MX record refers to a CNAME. Possible modes are
+   ``fail``, ``warn`` (the default), and ``ignore``.
 
-**-n** mode
-   Specify whether NS records should be checked to see if they are
-   addresses. Possible modes are ``"fail"`` (default for
-   ``named-compilezone``), ``"warn"`` (default for ``named-checkzone``)
-   and ``"ignore"``.
+``-n mode``
+   This option specifies whether NS records should be checked to see if they are
+   addresses. Possible modes are ``fail`` (the default for
+   ``named-compilezone``), ``warn`` (the default for ``named-checkzone``),
+   and ``ignore``.
 
-**-o** filename
-   Write zone output to ``filename``. If ``filename`` is ``-`` then
-   write to standard out. This is mandatory for ``named-compilezone``.
+``-o filename``
+   This option writes the zone output to ``filename``. If ``filename`` is ``-``, then
+   the zone output is written to standard output. This is mandatory for ``named-compilezone``.
 
-**-r** mode
-   Check for records that are treated as different by DNSSEC but are
-   semantically equal in plain DNS. Possible modes are ``"fail"``,
-   ``"warn"`` (default) and ``"ignore"``.
+``-r mode``
+   This option checks for records that are treated as different by DNSSEC but are
+   semantically equal in plain DNS. Possible modes are ``fail``,
+   ``warn`` (the default), and ``ignore``.
 
-**-s** style
-   Specify the style of the dumped zone file. Possible styles are
-   ``"full"`` (default) and ``"relative"``. The full format is most
-   suitable for processing automatically by a separate script. On the
-   other hand, the relative format is more human-readable and is thus
-   suitable for editing by hand. For ``named-checkzone`` this does not
-   cause any effects unless it dumps the zone contents. It also does not
+``-s style``
+   This option specifies the style of the dumped zone file. Possible styles are
+   ``full`` (the default) and ``relative``. The ``full`` format is most
+   suitable for processing automatically by a separate script.
+   The relative format is more human-readable and is thus
+   suitable for editing by hand. For ``named-checkzone``, this does not
+   have any effect unless it dumps the zone contents. It also does not
    have any meaning if the output format is not text.
 
-**-S** mode
-   Check if a SRV record refers to a CNAME. Possible modes are
-   ``"fail"``, ``"warn"`` (default) and ``"ignore"``.
+``-S mode``
+   This option checks whether an SRV record refers to a CNAME. Possible modes are
+   ``fail``, ``warn`` (the default), and ``ignore``.
 
-**-t** directory
-   Chroot to ``directory`` so that include directives in the
+``-t directory``
+   This option tells ``named`` to chroot to ``directory``, so that ``include`` directives in the
    configuration file are processed as if run by a similarly chrooted
    ``named``.
 
-**-T** mode
-   Check if Sender Policy Framework (SPF) records exist and issues a
+``-T mode``
+   This option checks whether Sender Policy Framework (SPF) records exist and issues a
    warning if an SPF-formatted TXT record is not also present. Possible
-   modes are ``"warn"`` (default), ``"ignore"``.
+   modes are ``warn`` (the default) and ``ignore``.
 
-**-w** directory
-   chdir to ``directory`` so that relative filenames in master file
-   $INCLUDE directives work. This is similar to the directory clause in
+``-w directory``
+   This option instructs ``named`` to chdir to ``directory``, so that relative filenames in master file
+   ``$INCLUDE`` directives work. This is similar to the directory clause in
    ``named.conf``.
 
-**-D**
-   Dump zone file in canonical format. This is always enabled for
+``-D``
+   This option dumps the zone file in canonical format. This is always enabled for
    ``named-compilezone``.
 
-**-W** mode
-   Specify whether to check for non-terminal wildcards. Non-terminal
+``-W mode``
+   This option specifies whether to check for non-terminal wildcards. Non-terminal
    wildcards are almost always the result of a failure to understand the
-   wildcard matching algorithm (:rfc:`1034`). Possible modes are ``"warn"``
-   (default) and ``"ignore"``.
+   wildcard matching algorithm (:rfc:`1034`). Possible modes are ``warn``
+   (the default) and ``ignore``.
 
-zonename
-   The domain name of the zone being checked.
+``zonename``
+   This indicates the domain name of the zone being checked.
 
-filename
-   The name of the zone file.
+``filename``
+   This is the name of the zone file.
 
 Return Values
 ~~~~~~~~~~~~~

bin/check/win32/checkconf.vcxproj.in

@@ -118,6 +118,26 @@
   <ItemGroup>
     <ClCompile Include="..\named-checkconf.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\ns\win32\libns.vcxproj">
+      <Project>{82ACD33C-E75F-45B8-BB6D-42643A10D7EE}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\isccfg\win32\libisccfg.vcxproj">
+      <Project>{B2DFA58C-6347-478E-81E8-01E06999D4F1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\bind9\win32\libbind9.vcxproj">
+      <Project>{E741C10B-B075-4206-9596-46765B665E03}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\check\win32\checktool.vcxproj">
+      <Project>{2C1F7096-C5B5-48D4-846F-A7ACA454335D}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/check/win32/checktool.vcxproj.in

@@ -104,6 +104,20 @@
       <OutputFile>.\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\ns\win32\libns.vcxproj">
+      <Project>{82ACD33C-E75F-45B8-BB6D-42643A10D7EE}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\isccfg\win32\libisccfg.vcxproj">
+      <Project>{B2DFA58C-6347-478E-81E8-01E06999D4F1}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/check/win32/checkzone.vcxproj.in

@@ -129,6 +129,23 @@ copy /Y named-checkzone.exe named-compilezone.exe
   <ItemGroup>
     <ClCompile Include="..\named-checkzone.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\ns\win32\libns.vcxproj">
+      <Project>{82ACD33C-E75F-45B8-BB6D-42643A10D7EE}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\isccfg\win32\libisccfg.vcxproj">
+      <Project>{B2DFA58C-6347-478E-81E8-01E06999D4F1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\check\win32\checktool.vcxproj">
+      <Project>{2C1F7096-C5B5-48D4-846F-A7ACA454335D}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/confgen/Makefile.am

@@ -0,0 +1,30 @@
+include $(top_srcdir)/Makefile.top
+
+AM_CPPFLAGS +=			\
+	$(LIBISC_CFLAGS)	\
+	$(LIBDNS_CFLAGS)	\
+	-DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\"
+
+LDADD =				\
+	libconfgen.la		\
+	$(LIBISC_LIBS)		\
+	$(LIBDNS_LIBS)
+
+noinst_LTLIBRARIES = libconfgen.la
+
+libconfgen_la_SOURCES =		\
+	include/confgen/os.h	\
+	keygen.h		\
+	keygen.c		\
+	util.h			\
+	util.c			\
+	unix/os.c
+
+sbin_PROGRAMS = tsig-keygen rndc-confgen
+
+install-exec-hook:
+	ln -f $(DESTDIR)$(sbindir)/tsig-keygen \
+	      $(DESTDIR)$(sbindir)/ddns-confgen
+
+uninstall-hook:
+	-rm -f $(DESTDIR)$(sbindir)/ddns-confgen

bin/confgen/Makefile.in

@@ -1,95 +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@
-
-# Attempt to disable parallel processing.
-.NOTPARALLEL:
-.NO_PARALLEL:
-
-VERSION=@BIND9_VERSION@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
-	${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
-
-CDEFINES =
-CWARNINGS =
-
-ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCCCLIBS =	../../lib/isccc/libisccc.@A@
-ISCLIBS =	../../lib/isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@
-ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @NO_LIBTOOL_ISCLIBS@
-DNSLIBS =	../../lib/dns/libdns.@A@ @NO_LIBTOOL_DNSLIBS@
-BIND9LIBS =	../../lib/bind9/libbind9.@A@
-
-ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCCCDEPLIBS =	../../lib/isccc/libisccc.@A@
-ISCDEPLIBS =	../../lib/isc/libisc.@A@
-DNSDEPLIBS =	../../lib/dns/libdns.@A@
-BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
-
-RNDCLIBS =	${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@
-RNDCDEPLIBS =	${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
-
-LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
-
-NOSYMLIBS =	${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
-
-CONFDEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
-
-SRCS=		rndc-confgen.c ddns-confgen.c
-
-SUBDIRS =	unix
-
-TARGETS =	rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ tsig-keygen@EXEEXT@
-
-UOBJS =		unix/os.@O@
-
-@BIND9_MAKE_RULES@
-
-rndc-confgen.@O@: rndc-confgen.c
-	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
-		-DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \
-		-c ${srcdir}/rndc-confgen.c
-
-ddns-confgen.@O@: ddns-confgen.c
-	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c ${srcdir}/ddns-confgen.c
-
-rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS}
-	export BASEOBJS="rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \
-	${FINALBUILDCMD}
-
-ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS}
-	export BASEOBJS="ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \
-	${FINALBUILDCMD}
-
-# make a link in the build directory to assist with testing
-tsig-keygen@EXEEXT@: ddns-confgen@EXEEXT@
-	rm -f tsig-keygen@EXEEXT@
-	${LINK_PROGRAM} ddns-confgen@EXEEXT@ tsig-keygen@EXEEXT@
-
-installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-
-install:: rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} rndc-confgen@EXEEXT@ ${DESTDIR}${sbindir}
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ddns-confgen@EXEEXT@ ${DESTDIR}${sbindir}
-	(cd ${DESTDIR}${sbindir}; rm -f tsig-keygen@EXEEXT@; ${LINK_PROGRAM} ddns-confgen@EXEEXT@ tsig-keygen@EXEEXT@)
-
-uninstall::
-	rm -f ${DESTDIR}${sbindir}/tsig-keygen@EXEEXT@
-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/ddns-confgen@EXEEXT@
-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/rndc-confgen@EXEEXT@
-
-clean distclean maintainer-clean::
-	rm -f ${TARGETS}

bin/confgen/keygen.c

@@ -198,5 +198,4 @@ write_key_file(const char *keyfile, const char *user, const char *keyname,
 	if (fclose(fd)) {
 		fatal("fclose(%s) failed\n", keyfile);
 	}
-	fprintf(stderr, "wrote key file \"%s\"\n", keyfile);
 }

bin/confgen/rndc-confgen.c

@@ -25,6 +25,7 @@
 #include <stdlib.h>
 
 #include <isc/assertions.h>
+#include <isc/attributes.h>
 #include <isc/base64.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
@@ -60,8 +61,8 @@ bool verbose = false;
 
 const char *keyfile, *keydef;
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(int status) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(int status);
 
 static void
 usage(int status) {
@@ -75,6 +76,7 @@ Usage:\n\
   -c keyfile:	 specify an alternate key file (requires -a)\n\
   -k keyname:	 the name as it will be used  in named.conf and rndc.conf\n\
   -p port:	 the port named will listen on and rndc will connect to\n\
+  -q:		 suppress printing written key path\n\
   -s addr:	 the address to which rndc should connect\n\
   -t chrootdir:	 write a keyfile in chrootdir as well (requires -a)\n\
   -u user:	 set the keyfile owner to \"user\" (requires -a)\n",
@@ -103,6 +105,7 @@ main(int argc, char **argv) {
 	char *chrootdir = NULL;
 	char *user = NULL;
 	bool keyonly = false;
+	bool quiet = false;
 	int len;
 
 	keydef = keyfile = RNDC_KEYFILE;
@@ -163,6 +166,9 @@ main(int argc, char **argv) {
 				      isc_commandline_argument);
 			}
 			break;
+		case 'q':
+			quiet = true;
+			break;
 		case 'r':
 			fatal("The -r option has been deprecated.");
 			break;
@@ -226,6 +232,9 @@ main(int argc, char **argv) {
 	if (keyonly) {
 		write_key_file(keyfile, chrootdir == NULL ? user : NULL,
 			       keyname, &key_txtbuffer, alg);
+		if (!quiet) {
+			printf("wrote key file \"%s\"\n", keyfile);
+		}
 
 		if (chrootdir != NULL) {
 			char *buf;
@@ -235,6 +244,9 @@ main(int argc, char **argv) {
 				 (*keyfile != '/') ? "/" : "", keyfile);
 
 			write_key_file(buf, user, keyname, &key_txtbuffer, alg);
+			if (!quiet) {
+				printf("wrote key file \"%s\"\n", buf);
+			}
 			isc_mem_put(mctx, buf, len);
 		}
 	} else {

bin/confgen/rndc-confgen.rst

@@ -41,76 +41,75 @@ by hand. Alternatively, it can be run with the ``-a`` option to set up a
 ``rndc.key`` file and avoid the need for a ``rndc.conf`` file and a
 ``controls`` statement altogether.
 
-Arguments
-~~~~~~~~~
+Options
+~~~~~~~
 
-**-a**
-   Do automatic ``rndc`` configuration. This creates a file ``rndc.key``
-   in ``/etc`` (or whatever ``sysconfdir`` was specified as when BIND
+``-a``
+   This option sets automatic ``rndc`` configuration, which creates a file ``rndc.key``
+   in ``/etc`` (or a different ``sysconfdir`` specified when BIND
    was built) that is read by both ``rndc`` and ``named`` on startup.
    The ``rndc.key`` file defines a default command channel and
    authentication key allowing ``rndc`` to communicate with ``named`` on
    the local host with no further configuration.
 
-   Running ``rndc-confgen -a`` allows BIND 9 and ``rndc`` to be used as
-   drop-in replacements for BIND 8 and ``ndc``, with no changes to the
-   existing BIND 8 ``named.conf`` file.
-
    If a more elaborate configuration than that generated by
    ``rndc-confgen -a`` is required, for example if rndc is to be used
-   remotely, you should run ``rndc-confgen`` without the ``-a`` option
-   and set up a ``rndc.conf`` and ``named.conf`` as directed.
+   remotely, run ``rndc-confgen`` without the ``-a`` option
+   and set up ``rndc.conf`` and ``named.conf`` as directed.
 
-**-A** algorithm
-   Specifies the algorithm to use for the TSIG key. Available choices
-   are: hmac-md5, hmac-sha1, hmac-sha224, hmac-sha256, hmac-sha384 and
+``-A algorithm``
+   This option specifies the algorithm to use for the TSIG key. Available choices
+   are: hmac-md5, hmac-sha1, hmac-sha224, hmac-sha256, hmac-sha384, and
    hmac-sha512. The default is hmac-sha256.
 
-**-b** keysize
-   Specifies the size of the authentication key in bits. Must be between
+``-b keysize``
+   This option specifies the size of the authentication key in bits. The size must be between
    1 and 512 bits; the default is the hash size.
 
-**-c** keyfile
-   Used with the ``-a`` option to specify an alternate location for
+``-c keyfile``
+   This option is used with the ``-a`` option to specify an alternate location for
    ``rndc.key``.
 
-**-h**
-   Prints a short summary of the options and arguments to
+``-h``
+   This option prints a short summary of the options and arguments to
    ``rndc-confgen``.
 
-**-k** keyname
-   Specifies the key name of the rndc authentication key. This must be a
+``-k keyname``
+   This option specifies the key name of the ``rndc`` authentication key. This must be a
    valid domain name. The default is ``rndc-key``.
 
-**-p** port
-   Specifies the command channel port where ``named`` listens for
+``-p port``
+   This option specifies the command channel port where ``named`` listens for
    connections from ``rndc``. The default is 953.
 
-**-s** address
-   Specifies the IP address where ``named`` listens for command channel
+``-q``
+   This option prevets printing the written path in automatic configuration mode.
+
+``-s address``
+   This option specifies the IP address where ``named`` listens for command-channel
    connections from ``rndc``. The default is the loopback address
    127.0.0.1.
 
-**-t** chrootdir
-   Used with the ``-a`` option to specify a directory where ``named``
-   will run chrooted. An additional copy of the ``rndc.key`` will be
-   written relative to this directory so that it will be found by the
+``-t chrootdir``
+   This option is used with the ``-a`` option to specify a directory where ``named``
+   runs chrooted. An additional copy of the ``rndc.key`` is
+   written relative to this directory, so that it is found by the
    chrooted ``named``.
 
-**-u** user
-   Used with the ``-a`` option to set the owner of the ``rndc.key`` file
-   generated. If ``-t`` is also specified only the file in the chroot
+``-u user``
+   This option is used with the ``-a`` option to set the owner of the generated ``rndc.key`` file.
+   If ``-t`` is also specified, only the file in the chroot
    area has its owner changed.
 
 Examples
 ~~~~~~~~
 
-To allow ``rndc`` to be used with no manual configuration, run
+To allow ``rndc`` to be used with no manual configuration, run:
 
 ``rndc-confgen -a``
 
-To print a sample ``rndc.conf`` file and corresponding ``controls`` and
-``key`` statements to be manually inserted into ``named.conf``, run
+To print a sample ``rndc.conf`` file and the corresponding ``controls`` and
+``key`` statements to be manually inserted into ``named.conf``, run:
 
 ``rndc-confgen``
 

bin/confgen/tsig-keygen.c

@@ -12,9 +12,8 @@
 /*! \file */
 
 /**
- * ddns-confgen generates configuration files for dynamic DNS. It can
- * be used as a convenient alternative to writing the ddns.key file
- * and the corresponding key and update-policy statements in named.conf.
+ * tsig-keygen generates TSIG keys that can be used in named configuration
+ * files for dynamic DNS.
  */
 
 #include <stdarg.h>
@@ -22,6 +21,7 @@
 #include <stdlib.h>
 
 #include <isc/assertions.h>
+#include <isc/attributes.h>
 #include <isc/base64.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
@@ -57,8 +57,8 @@ const char *progname;
 static enum { progmode_keygen, progmode_confgen } progmode;
 bool verbose = false; /* needed by util.c but not used here */
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(int status) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(int status);
 
 static void
 usage(int status) {

bin/confgen/tsig-keygen.rst

@@ -21,10 +21,10 @@
 
 .. highlight: console
 
-.. _man_ddns-confgen:
+.. _man_tsig-keygen:
 
-ddns-confgen - ddns key generation tool
----------------------------------------
+tsig-keygen, ddns-confgen - TSIG key generation tool
+----------------------------------------------------
 
 Synopsis
 ~~~~~~~~
@@ -37,21 +37,22 @@ Description
 
 ``tsig-keygen`` and ``ddns-confgen`` are invocation methods for a
 utility that generates keys for use in TSIG signing. The resulting keys
-can be used, for example, to secure dynamic DNS updates to a zone or for
+can be used, for example, to secure dynamic DNS updates to a zone, or for
 the ``rndc`` command channel.
 
 When run as ``tsig-keygen``, a domain name can be specified on the
-command line which will be used as the name of the generated key. If no
+command line to be used as the name of the generated key. If no
 name is specified, the default is ``tsig-key``.
 
-When run as ``ddns-confgen``, the generated key is accompanied by
-configuration text and instructions that can be used with ``nsupdate``
+When run as ``ddns-confgen``, the key name can specified using ``-k``
+parameter and defaults to ``ddns-key``. The generated key is accompanied
+by configuration text and instructions that can be used with ``nsupdate``
 and ``named`` when setting up dynamic DNS, including an example
-``update-policy`` statement. (This usage similar to the ``rndc-confgen``
-command for setting up command channel security.)
+``update-policy`` statement. (This usage is similar to the ``rndc-confgen``
+command for setting up command-channel security.)
 
 Note that ``named`` itself can configure a local DDNS key for use with
-``nsupdate -l``: it does this when a zone is configured with
+``nsupdate -l``; it does this when a zone is configured with
 ``update-policy local;``. ``ddns-confgen`` is only needed when a more
 elaborate configuration is required: for instance, if ``nsupdate`` is to
 be used from a remote system.
@@ -59,40 +60,39 @@ be used from a remote system.
 Options
 ~~~~~~~
 
-**-a** algorithm
-   Specifies the algorithm to use for the TSIG key. Available choices
-   are: hmac-md5, hmac-sha1, hmac-sha224, hmac-sha256, hmac-sha384 and
-   hmac-sha512. The default is hmac-sha256. Options are
+``-a algorithm``
+   This option specifies the algorithm to use for the TSIG key. Available
+   choices are: hmac-md5, hmac-sha1, hmac-sha224, hmac-sha256, hmac-sha384,
+   and hmac-sha512. The default is hmac-sha256. Options are
    case-insensitive, and the "hmac-" prefix may be omitted.
 
-**-h**
-   Prints a short summary of options and arguments.
+``-h``
+   This option prints a short summary of options and arguments.
 
-**-k** keyname
-   Specifies the key name of the DDNS authentication key. The default is
-   ``ddns-key`` when neither the ``-s`` nor ``-z`` option is specified;
-   otherwise, the default is ``ddns-key`` as a separate label followed
-   by the argument of the option, e.g., ``ddns-key.example.com.`` The
-   key name must have the format of a valid domain name, consisting of
-   letters, digits, hyphens and periods.
+``-k keyname``
+   This option specifies the key name of the DDNS authentication key. The
+   default is ``ddns-key`` when neither the ``-s`` nor ``-z`` option is
+   specified; otherwise, the default is ``ddns-key`` as a separate label
+   followed by the argument of the option, e.g., ``ddns-key.example.com.``
+   The key name must have the format of a valid domain name, consisting of
+   letters, digits, hyphens, and periods.
 
-**-q**
-   (``ddns-confgen`` only.) Quiet mode: Print only the key, with no
-   explanatory text or usage examples; This is essentially identical to
+``-q`` (``ddns-confgen`` only)
+   This option enables quiet mode, which prints only the key, with no
+   explanatory text or usage examples. This is essentially identical to
    ``tsig-keygen``.
 
-**-s** name
-   (``ddns-confgen`` only.) Generate configuration example to allow
-   dynamic updates of a single hostname. The example ``named.conf`` text
-   shows how to set an update policy for the specified name using the
-   "name" nametype. The default key name is ddns-key.name. Note that the
-   "self" nametype cannot be used, since the name to be updated may
-   differ from the key name. This option cannot be used with the ``-z``
-   option.
+``-s name`` (``ddns-confgen`` only)
+   This option generates a configuration example to allow dynamic updates
+   of a single hostname. The example ``named.conf`` text shows how to set
+   an update policy for the specified name using the "name" nametype. The
+   default key name is ``ddns-key.name``. Note that the "self" nametype
+   cannot be used, since the name to be updated may differ from the key
+   name. This option cannot be used with the ``-z`` option.
 
-**-z** zone
-   (``ddns-confgen`` only.) Generate configuration example to allow
-   dynamic updates of a zone: The example ``named.conf`` text shows how
+``-z zone`` (``ddns-confgen`` only)
+   This option generates a configuration example to allow
+   dynamic updates of a zone. The example ``named.conf`` text shows how
    to set an update policy for the specified zone using the "zonesub"
    nametype, allowing updates to all subdomain names within that zone.
    This option cannot be used with the ``-s`` option.

bin/confgen/unix/Makefile.in

@@ -1,28 +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 =	-I${srcdir}/include -I${srcdir}/../include \
-		${DNS_INCLUDES} ${ISC_INCLUDES}
-
-CDEFINES =
-CWARNINGS =
-
-OBJS =		os.@O@
-
-SRCS =		os.c
-
-TARGETS =	${OBJS}
-
-@BIND9_MAKE_RULES@

bin/confgen/util.c

@@ -30,7 +30,7 @@ notify(const char *fmt, ...) {
 		va_start(ap, fmt);
 		vfprintf(stderr, fmt, ap);
 		va_end(ap);
-		fputs("\n", stderr);
+		fprintf(stderr, "\n");
 	}
 }
 

bin/confgen/util.h

@@ -14,6 +14,7 @@
 
 /*! \file */
 
+#include <isc/attributes.h>
 #include <isc/formatcheck.h>
 #include <isc/lang.h>
 #include <isc/platform.h>
@@ -35,9 +36,8 @@ ISC_LANG_BEGINDECLS
 void
 notify(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2);
 
-ISC_PLATFORM_NORETURN_PRE void
-fatal(const char *format, ...)
-	ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN void
+fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
 
 ISC_LANG_ENDDECLS
 

bin/confgen/win32/confgentool.vcxproj.in

@@ -114,6 +114,14 @@
     <ClCompile Include="..\util.c" />
     <ClCompile Include="os.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/confgen/win32/rndcconfgen.vcxproj.in

@@ -69,15 +69,15 @@
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <ForcedIncludeFiles>..\..\..\config.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -98,7 +98,7 @@
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <ForcedIncludeFiles>..\..\..\config.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
@@ -108,13 +108,24 @@
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\rndc-confgen.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\confgen\win32\confgentool.vcxproj">
+      <Project>{64964B03-4815-41F0-9057-E766A94AF197}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/confgen/win32/tsigkeygen.vcxproj.filters.in

@@ -11,8 +11,8 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\ddns-confgen.c">
+    <ClCompile Include="..\tsig-keygen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

bin/confgen/win32/tsigkeygen.vcxproj.in

@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1EA4FC64-F33B-4A50-970A-EA052BBE9CF1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ddnsconfgen</RootNamespace>
+    <RootNamespace>tsigkeygen</RootNamespace>
     @WINDOWS_TARGET_PLATFORM_VERSION@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -45,14 +45,14 @@
     <OutDir>..\..\..\Build\$(Configuration)\</OutDir>
     <IntDir>.\$(Configuration)\</IntDir>
     <IntDirSharingDetected>None</IntDirSharingDetected>
-    <TargetName>ddns-confgen</TargetName>
+    <TargetName>tsig-keygen</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\..\Build\$(Configuration)\</OutDir>
     <IntDir>.\$(Configuration)\</IntDir>
     <IntDirSharingDetected>None</IntDirSharingDetected>
-    <TargetName>ddns-confgen</TargetName>
+    <TargetName>tsig-keygen</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
     <ClCompile>
@@ -69,20 +69,20 @@
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <ForcedIncludeFiles>..\..\..\config.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>cd ..\..\..\Build\$(Configuration)
-copy /Y ddns-confgen.exe tsig-keygen.exe
-copy /Y ddns-confgen.ilk tsig-keygen.ilk
+copy /Y tsig-keygen.exe ddns-confgen.exe
+copy /Y tsig-keygen.ilk ddns-confgen.ilk
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -104,7 +104,7 @@ copy /Y ddns-confgen.ilk tsig-keygen.ilk
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <ForcedIncludeFiles>..\..\..\config.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
@@ -114,17 +114,28 @@ copy /Y ddns-confgen.ilk tsig-keygen.ilk
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>@OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>cd ..\..\..\Build\$(Configuration)
-copy /Y ddns-confgen.exe tsig-keygen.exe
+copy /Y tsig-keygen.exe ddns-confgen.exe
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\ddns-confgen.c" />
+    <ClCompile Include="..\tsig-keygen.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\confgen\win32\confgentool.vcxproj">
+      <Project>{64964B03-4815-41F0-9057-E766A94AF197}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

bin/confgen/win32/tsigkeygen.vcxproj.user

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
+</Project>

bin/delv/Makefile.am

@@ -0,0 +1,21 @@
+include $(top_srcdir)/Makefile.top
+
+AM_CPPFLAGS +=				\
+	-I$(top_builddir)/include	\
+	$(LIBISC_CFLAGS)		\
+	$(LIBDNS_CFLAGS)		\
+	$(LIBISCCFG_CFLAGS)		\
+	$(LIBIRS_CFLAGS)
+
+AM_CPPFLAGS +=				\
+	-DSYSCONFDIR=\"${sysconfdir}\"
+
+bin_PROGRAMS = delv
+
+delv_SOURCES =				\
+	delv.c
+delv_LDADD =				\
+	$(LIBISC_LIBS)			\
+	$(LIBDNS_LIBS)			\
+	$(LIBISCCFG_LIBS)		\
+	$(LIBIRS_LIBS)

bin/delv/Makefile.in

@@ -1,68 +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@
-
-VERSION=@BIND9_VERSION@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} \
-		${IRS_INCLUDES} ${ISCCFG_INCLUDES} \
-		${OPENSSL_CFLAGS}
-
-CDEFINES =	-DVERSION=\"${VERSION}\" \
-		-DSYSCONFDIR=\"${sysconfdir}\"
-CWARNINGS =
-
-ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
-DNSLIBS =	../../lib/dns/libdns.@A@ @NO_LIBTOOL_DNSLIBS@
-ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @NO_LIBTOOL_ISCLIBS@
-ISCLIBS =	../../lib/isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@
-IRSLIBS =	../../lib/irs/libirs.@A@
-
-ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
-DNSDEPLIBS =	../../lib/dns/libdns.@A@
-ISCDEPLIBS =	../../lib/isc/libisc.@A@
-IRSDEPLIBS =	../../lib/irs/libirs.@A@
-
-DEPLIBS =	${DNSDEPLIBS} ${IRSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
-
-LIBS =		${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
-NOSYMLIBS =	${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
-
-SUBDIRS =
-
-TARGETS =	delv@EXEEXT@
-
-OBJS =		delv.@O@
-
-SRCS =		delv.c
-
-@BIND9_MAKE_RULES@
-
-delv@EXEEXT@: delv.@O@ ${DEPLIBS}
-	export BASEOBJS="delv.@O@"; \
-	export LIBS0="${DNSLIBS}"; \
-	${FINALBUILDCMD}
-
-installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
-
-install:: delv@EXEEXT@ installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
-		delv@EXEEXT@ ${DESTDIR}${bindir}
-
-uninstall::
-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/delv@EXEEXT@
-
-clean distclean maintainer-clean::
-	rm -f ${TARGETS}

bin/delv/delv.c

@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include <isc/app.h>
+#include <isc/attributes.h>
 #include <isc/base64.h>
 #include <isc/buffer.h>
 #include <isc/hex.h>
@@ -71,7 +72,6 @@
 #include <isccfg/log.h>
 #include <isccfg/namedconf.h>
 
-#include <irs/netdb.h>
 #include <irs/resconf.h>
 
 #define CHECK(r)                             \
@@ -135,79 +135,88 @@ parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc);
 
 static void
 usage(void) {
-	fputs("Usage:  delv [@server] {q-opt} {d-opt} [domain] [q-type] "
-	      "[q-class]\n"
-	      "Where:  domain	  is in the Domain Name System\n"
-	      "        q-class  is one of (in,hs,ch,...) [default: in]\n"
-	      "        q-type   is one of (a,any,mx,ns,soa,hinfo,axfr,txt,...) "
-	      "[default:a]\n"
-	      "        q-opt    is one of:\n"
-	      "                 -4                  (use IPv4 query transport "
-	      "only)\n"
-	      "                 -6                  (use IPv6 query transport "
-	      "only)\n"
-	      "                 -a anchor-file      (specify root trust "
-	      "anchor)\n"
-	      "                 -b address[#port]   (bind to source "
-	      "address/port)\n"
-	      "                 -c class            (option included for "
-	      "compatibility;\n"
-	      "                 -d level            (set debugging level)\n"
-	      "                 -h                  (print help and exit)\n"
-	      "                 -i                  (disable DNSSEC "
-	      "validation)\n"
-	      "                 -m                  (enable memory usage "
-	      "debugging)\n"
-	      "                 -p port             (specify port number)\n"
-	      "                 -q name             (specify query name)\n"
-	      "                 -t type             (specify query type)\n"
-	      "                                      only IN is supported)\n"
-	      "                 -v                  (print version and exit)\n"
-	      "                 -x dot-notation     (shortcut for reverse "
-	      "lookups)\n"
-	      "        d-opt    is of the form +keyword[=value], where keyword "
-	      "is:\n"
-	      "                 +[no]all            (Set or clear all display "
-	      "flags)\n"
-	      "                 +[no]class          (Control display of "
-	      "class)\n"
-	      "                 +[no]comments       (Control display of "
-	      "comment lines)\n"
-	      "                 +[no]crypto         (Control display of "
-	      "cryptographic\n"
-	      "                                      fields in records)\n"
-	      "                 +[no]dlv            (Obsolete)\n"
-	      "                 +[no]dnssec         (Display DNSSEC records)\n"
-	      "                 +[no]mtrace         (Trace messages received)\n"
-	      "                 +[no]multiline      (Print records in an "
-	      "expanded format)\n"
-	      "                 +[no]root           (DNSSEC validation trust "
-	      "anchor)\n"
-	      "                 +[no]rrcomments     (Control display of "
-	      "per-record "
-	      "comments)\n"
-	      "                 +[no]rtrace         (Trace resolver fetches)\n"
-	      "                 +[no]short          (Short form answer)\n"
-	      "                 +[no]split=##       (Split hex/base64 fields "
-	      "into chunks)\n"
-	      "                 +[no]tcp            (TCP mode)\n"
-	      "                 +[no]ttl            (Control display of ttls "
-	      "in records)\n"
-	      "                 +[no]trust          (Control display of trust "
-	      "level)\n"
-	      "                 +[no]unknownformat  (Print RDATA in RFC 3597 "
-	      "\"unknown\" format)\n"
-	      "                 +[no]vtrace         (Trace validation "
-	      "process)\n"
-	      "                 +[no]yaml           (Present the results as "
-	      "YAML)\n",
-	      stderr);
+	fprintf(stderr,
+		"Usage:  delv [@server] {q-opt} {d-opt} [domain] [q-type] "
+		"[q-class]\n"
+		"Where:  domain	  is in the Domain Name System\n"
+		"        q-class  is one of (in,hs,ch,...) [default: in]\n"
+		"        q-type   is one of "
+		"(a,any,mx,ns,soa,hinfo,axfr,txt,...) "
+		"[default:a]\n"
+		"        q-opt    is one of:\n"
+		"                 -4                  (use IPv4 query "
+		"transport "
+		"only)\n"
+		"                 -6                  (use IPv6 query "
+		"transport "
+		"only)\n"
+		"                 -a anchor-file      (specify root trust "
+		"anchor)\n"
+		"                 -b address[#port]   (bind to source "
+		"address/port)\n"
+		"                 -c class            (option included for "
+		"compatibility;\n"
+		"                 -d level            (set debugging level)\n"
+		"                 -h                  (print help and exit)\n"
+		"                 -i                  (disable DNSSEC "
+		"validation)\n"
+		"                 -m                  (enable memory usage "
+		"debugging)\n"
+		"                 -p port             (specify port number)\n"
+		"                 -q name             (specify query name)\n"
+		"                 -t type             (specify query type)\n"
+		"                                      only IN is supported)\n"
+		"                 -v                  (print version and "
+		"exit)\n"
+		"                 -x dot-notation     (shortcut for reverse "
+		"lookups)\n"
+		"        d-opt    is of the form +keyword[=value], where "
+		"keyword "
+		"is:\n"
+		"                 +[no]all            (Set or clear all "
+		"display "
+		"flags)\n"
+		"                 +[no]class          (Control display of "
+		"class)\n"
+		"                 +[no]comments       (Control display of "
+		"comment lines)\n"
+		"                 +[no]crypto         (Control display of "
+		"cryptographic\n"
+		"                                      fields in records)\n"
+		"                 +[no]dlv            (Obsolete)\n"
+		"                 +[no]dnssec         (Display DNSSEC "
+		"records)\n"
+		"                 +[no]mtrace         (Trace messages "
+		"received)\n"
+		"                 +[no]multiline      (Print records in an "
+		"expanded format)\n"
+		"                 +[no]root           (DNSSEC validation trust "
+		"anchor)\n"
+		"                 +[no]rrcomments     (Control display of "
+		"per-record "
+		"comments)\n"
+		"                 +[no]rtrace         (Trace resolver "
+		"fetches)\n"
+		"                 +[no]short          (Short form answer)\n"
+		"                 +[no]split=##       (Split hex/base64 fields "
+		"into chunks)\n"
+		"                 +[no]tcp            (TCP mode)\n"
+		"                 +[no]ttl            (Control display of ttls "
+		"in records)\n"
+		"                 +[no]trust          (Control display of "
+		"trust "
+		"level)\n"
+		"                 +[no]unknownformat  (Print RDATA in RFC 3597 "
+		"\"unknown\" format)\n"
+		"                 +[no]vtrace         (Trace validation "
+		"process)\n"
+		"                 +[no]yaml           (Present the results as "
+		"YAML)\n");
 	exit(1);
 }
 
-ISC_PLATFORM_NORETURN_PRE static void
-fatal(const char *format, ...)
-	ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
 
 static void
 fatal(const char *format, ...) {
@@ -1337,7 +1346,7 @@ dash_option(char *option, char *next, bool *open_type_class) {
 			/* handled in preparse_args() */
 			break;
 		case 'v':
-			fputs("delv " VERSION "\n", stderr);
+			fprintf(stderr, "delv %s\n", PACKAGE_VERSION);
 			exit(0);
 		/* NOTREACHED */
 		default:
@@ -1723,7 +1732,7 @@ main(int argc, char *argv[]) {
 	char namestr[DNS_NAME_FORMATSIZE];
 	dns_rdataset_t *rdataset;
 	dns_namelist_t namelist;
-	unsigned int resopt, clopt;
+	unsigned int resopt;
 	isc_appctx_t *actx = NULL;
 	isc_taskmgr_t *taskmgr = NULL;
 	isc_socketmgr_t *socketmgr = NULL;
@@ -1770,9 +1779,8 @@ main(int argc, char *argv[]) {
 #endif /* ifndef WIN32 */
 
 	/* Create client */
-	clopt = DNS_CLIENTCREATEOPT_USECACHE;
-	result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr,
-				    clopt, &client, srcaddr4, srcaddr6);
+	result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr, 0,
+				    &client, srcaddr4, srcaddr6);
 	if (result != ISC_R_SUCCESS) {
 		delv_log(ISC_LOG_ERROR, "dns_client_create: %s",
 			 isc_result_totext(result));

bin/delv/delv.rst

@@ -43,15 +43,15 @@ Description
 ``delv`` is a tool for sending DNS queries and validating the results,
 using the same internal resolver and validator logic as ``named``.
 
-``delv`` will send to a specified name server all queries needed to
+``delv`` sends to a specified name server all queries needed to
 fetch and validate the requested data; this includes the original
-requested query, subsequent queries to follow CNAME or DNAME chains, and
+requested query, subsequent queries to follow CNAME or DNAME chains,
 queries for DNSKEY, and DS records to establish a chain of trust for
 DNSSEC validation. It does not perform iterative resolution, but
 simulates the behavior of a name server configured for DNSSEC validating
 and forwarding.
 
-By default, responses are validated using built-in DNSSEC trust anchor
+By default, responses are validated using the built-in DNSSEC trust anchor
 for the root zone ("."). Records returned by ``delv`` are either fully
 validated or were not signed. If validation fails, an explanation of the
 failure is included in the output; the validation process can be traced
@@ -59,13 +59,13 @@ in detail. Because ``delv`` does not rely on an external server to carry
 out validation, it can be used to check the validity of DNS responses in
 environments where local name servers may not be trustworthy.
 
-Unless it is told to query a specific name server, ``delv`` will try
+Unless it is told to query a specific name server, ``delv`` tries
 each of the servers listed in ``/etc/resolv.conf``. If no usable server
-addresses are found, ``delv`` will send queries to the localhost
+addresses are found, ``delv`` sends queries to the localhost
 addresses (127.0.0.1 for IPv4, ::1 for IPv6).
 
-When no command line arguments or options are given, ``delv`` will
-perform an NS query for "." (the root zone).
+When no command-line arguments or options are given, ``delv``
+performs an NS query for "." (the root zone).
 
 Simple Usage
 ~~~~~~~~~~~~
@@ -89,109 +89,109 @@ where:
    If no ``server`` argument is provided, ``delv`` consults
    ``/etc/resolv.conf``; if an address is found there, it queries the
    name server at that address. If either of the ``-4`` or ``-6``
-   options are in use, then only addresses for the corresponding
-   transport will be tried. If no usable addresses are found, ``delv``
-   will send queries to the localhost addresses (127.0.0.1 for IPv4, ::1
+   options is in use, then only addresses for the corresponding
+   transport are tried. If no usable addresses are found, ``delv``
+   sends queries to the localhost addresses (127.0.0.1 for IPv4, ::1
    for IPv6).
 
 ``name``
    is the domain name to be looked up.
 
 ``type``
-   indicates what type of query is required MDASH ANY, A, MX, etc.
+   indicates what type of query is required - ANY, A, MX, etc.
    ``type`` can be any valid query type. If no ``type`` argument is
-   supplied, ``delv`` will perform a lookup for an A record.
+   supplied, ``delv`` performs a lookup for an A record.
 
 Options
 ~~~~~~~
 
-**-a** anchor-file
-   Specifies a file from which to read DNSSEC trust anchors. The default
+``-a anchor-file``
+   This option specifies a file from which to read DNSSEC trust anchors. The default
    is ``/etc/bind.keys``, which is included with BIND 9 and contains one
    or more trust anchors for the root zone (".").
 
    Keys that do not match the root zone name are ignored. An alternate
    key name can be specified using the ``+root=NAME`` options.
 
-   Note: When reading the trust anchor file, ``delv`` treat ``trust-anchors``
-   ``initial-key`` and ``static-key`` identically. That is, for a managed key,
+   Note: When reading the trust anchor file, ``delv`` treats ``trust-anchors``,
+   ``initial-key``, and ``static-key`` identically. That is, for a managed key,
    it is the *initial* key that is trusted; :rfc:`5011` key management is not
-   supported. ``delv`` will not consult the managed-keys database maintained by
-   ``named``. This means that if either of the keys in ``/etc/bind.keys`` is
-   revoked and rolled over, it will be necessary to update ``/etc/bind.keys`` to
+   supported. ``delv`` does not consult the managed-keys database maintained by
+   ``named``, which means that if either of the keys in ``/etc/bind.keys`` is
+   revoked and rolled over, ``/etc/bind.keys`` must be updated to
    use DNSSEC validation in ``delv``.
 
-**-b** address
-   Sets the source IP address of the query to ``address``. This must be
-   a valid address on one of the host's network interfaces or "0.0.0.0"
-   or "::". An optional source port may be specified by appending
-   "#<port>"
+``-b address``
+   This option sets the source IP address of the query to ``address``. This must be
+   a valid address on one of the host's network interfaces, or ``0.0.0.0``,
+   or ``::``. An optional source port may be specified by appending
+   ``#<port>``
 
-**-c** class
-   Sets the query class for the requested data. Currently, only class
+``-c class``
+   This option sets the query class for the requested data. Currently, only class
    "IN" is supported in ``delv`` and any other value is ignored.
 
-**-d** level
-   Set the systemwide debug level to ``level``. The allowed range is
+``-d level``
+   This option sets the systemwide debug level to ``level``. The allowed range is
    from 0 to 99. The default is 0 (no debugging). Debugging traces from
    ``delv`` become more verbose as the debug level increases. See the
    ``+mtrace``, ``+rtrace``, and ``+vtrace`` options below for
    additional debugging details.
 
-**-h**
-   Display the ``delv`` help usage output and exit.
+``-h``
+   This option displays the ``delv`` help usage output and exits.
 
-**-i**
-   Insecure mode. This disables internal DNSSEC validation. (Note,
-   however, this does not set the CD bit on upstream queries. If the
-   server being queried is performing DNSSEC validation, then it will
+``-i``
+   This option sets insecure mode, which disables internal DNSSEC validation. (Note,
+   however, that this does not set the CD bit on upstream queries. If the
+   server being queried is performing DNSSEC validation, then it does
    not return invalid data; this can cause ``delv`` to time out. When it
    is necessary to examine invalid data to debug a DNSSEC problem, use
    ``dig +cd``.)
 
-**-m**
-   Enables memory usage debugging.
+``-m``
+   This option enables memory usage debugging.
 
-**-p** port#
-   Specifies a destination port to use for queries instead of the
-   standard DNS port number 53. This option would be used with a name
+``-p port#``
+   This option specifies a destination port to use for queries, instead of the
+   standard DNS port number 53. This option is used with a name
    server that has been configured to listen for queries on a
    non-standard port number.
 
-**-q** name
-   Sets the query name to ``name``. While the query name can be
-   specified without using the ``-q``, it is sometimes necessary to
+``-q name``
+   This option sets the query name to ``name``. While the query name can be
+   specified without using the ``-q`` option, it is sometimes necessary to
    disambiguate names from types or classes (for example, when looking
    up the name "ns", which could be misinterpreted as the type NS, or
    "ch", which could be misinterpreted as class CH).
 
-**-t** type
-   Sets the query type to ``type``, which can be any valid query type
+``-t type``
+   This option sets the query type to ``type``, which can be any valid query type
    supported in BIND 9 except for zone transfer types AXFR and IXFR. As
-   with ``-q``, this is useful to distinguish query name type or class
-   when they are ambiguous. it is sometimes necessary to disambiguate
+   with ``-q``, this is useful to distinguish query-name types or classes
+   when they are ambiguous. It is sometimes necessary to disambiguate
    names from types.
 
    The default query type is "A", unless the ``-x`` option is supplied
    to indicate a reverse lookup, in which case it is "PTR".
 
-**-v**
-   Print the ``delv`` version and exit.
+``-v``
+   This option prints the ``delv`` version and exits.
 
-**-x** addr
-   Performs a reverse lookup, mapping an addresses to a name. ``addr``
+``-x addr``
+   This option performs a reverse lookup, mapping an address to a name. ``addr``
    is an IPv4 address in dotted-decimal notation, or a colon-delimited
    IPv6 address. When ``-x`` is used, there is no need to provide the
-   ``name`` or ``type`` arguments. ``delv`` automatically performs a
+   ``name`` or ``type`` arguments; ``delv`` automatically performs a
    lookup for a name like ``11.12.13.10.in-addr.arpa`` and sets the
    query type to PTR. IPv6 addresses are looked up using nibble format
    under the IP6.ARPA domain.
 
-**-4**
-   Forces ``delv`` to only use IPv4.
+``-4``
+   This option forces ``delv`` to only use IPv4.
 
-**-6**
-   Forces ``delv`` to only use IPv6.
+``-6``
+   This option forces ``delv`` to only use IPv6.
 
 Query Options
 ~~~~~~~~~~~~~
@@ -206,122 +206,122 @@ assign values to options like the timeout interval. They have the form
 ``+keyword=value``. The query options are:
 
 ``+[no]cdflag``
-   Controls whether to set the CD (checking disabled) bit in queries
+   This option controls whether to set the CD (checking disabled) bit in queries
    sent by ``delv``. This may be useful when troubleshooting DNSSEC
    problems from behind a validating resolver. A validating resolver
-   will block invalid responses, making it difficult to retrieve them
-   for analysis. Setting the CD flag on queries will cause the resolver
+   blocks invalid responses, making it difficult to retrieve them
+   for analysis. Setting the CD flag on queries causes the resolver
    to return invalid responses, which ``delv`` can then validate
    internally and report the errors in detail.
 
 ``+[no]class``
-   Controls whether to display the CLASS when printing a record. The
+   This option controls whether to display the CLASS when printing a record. The
    default is to display the CLASS.
 
 ``+[no]ttl``
-   Controls whether to display the TTL when printing a record. The
+   This option controls whether to display the TTL when printing a record. The
    default is to display the TTL.
 
 ``+[no]rtrace``
-   Toggle resolver fetch logging. This reports the name and type of each
+   This option toggles resolver fetch logging. This reports the name and type of each
    query sent by ``delv`` in the process of carrying out the resolution
-   and validation process: this includes including the original query
+   and validation process, including the original query
    and all subsequent queries to follow CNAMEs and to establish a chain
    of trust for DNSSEC validation.
 
    This is equivalent to setting the debug level to 1 in the "resolver"
    logging category. Setting the systemwide debug level to 1 using the
-   ``-d`` option will product the same output (but will affect other
-   logging categories as well).
+   ``-d`` option produces the same output, but affects other
+   logging categories as well.
 
 ``+[no]mtrace``
-   Toggle message logging. This produces a detailed dump of the
+   This option toggles message logging. This produces a detailed dump of the
    responses received by ``delv`` in the process of carrying out the
    resolution and validation process.
 
    This is equivalent to setting the debug level to 10 for the "packets"
    module of the "resolver" logging category. Setting the systemwide
-   debug level to 10 using the ``-d`` option will produce the same
-   output (but will affect other logging categories as well).
+   debug level to 10 using the ``-d`` option produces the same
+   output, but affects other logging categories as well.
 
 ``+[no]vtrace``
-   Toggle validation logging. This shows the internal process of the
+   This option toggles validation logging. This shows the internal process of the
    validator as it determines whether an answer is validly signed,
    unsigned, or invalid.
 
    This is equivalent to setting the debug level to 3 for the
    "validator" module of the "dnssec" logging category. Setting the
-   systemwide debug level to 3 using the ``-d`` option will produce the
-   same output (but will affect other logging categories as well).
+   systemwide debug level to 3 using the ``-d`` option produces the
+   same output, but affects other logging categories as well.
 
 ``+[no]short``
-   Provide a terse answer. The default is to print the answer in a
+   This option toggles between verbose and terse answers. The default is to print the answer in a
    verbose form.
 
 ``+[no]comments``
-   Toggle the display of comment lines in the output. The default is to
+   This option toggles the display of comment lines in the output. The default is to
    print comments.
 
 ``+[no]rrcomments``
-   Toggle the display of per-record comments in the output (for example,
+   This option toggles the display of per-record comments in the output (for example,
    human-readable key information about DNSKEY records). The default is
    to print per-record comments.
 
 ``+[no]crypto``
-   Toggle the display of cryptographic fields in DNSSEC records. The
-   contents of these field are unnecessary to debug most DNSSEC
+   This option toggles the display of cryptographic fields in DNSSEC records. The
+   contents of these fields are unnecessary to debug most DNSSEC
    validation failures and removing them makes it easier to see the
-   common failures. The default is to display the fields. When omitted
-   they are replaced by the string "[omitted]" or in the DNSKEY case the
-   key id is displayed as the replacement, e.g. "[ key id = value ]".
+   common failures. The default is to display the fields. When omitted,
+   they are replaced by the string ``[omitted]`` or, in the DNSKEY case, the
+   key ID is displayed as the replacement, e.g. ``[ key id = value ]``.
 
 ``+[no]trust``
-   Controls whether to display the trust level when printing a record.
+   This option controls whether to display the trust level when printing a record.
    The default is to display the trust level.
 
 ``+[no]split[=W]``
-   Split long hex- or base64-formatted fields in resource records into
+   This option splits long hex- or base64-formatted fields in resource records into
    chunks of ``W`` characters (where ``W`` is rounded up to the nearest
    multiple of 4). ``+nosplit`` or ``+split=0`` causes fields not to be
    split at all. The default is 56 characters, or 44 characters when
    multiline mode is active.
 
 ``+[no]all``
-   Set or clear the display options ``+[no]comments``,
+   This option sets or clears the display options ``+[no]comments``,
    ``+[no]rrcomments``, and ``+[no]trust`` as a group.
 
 ``+[no]multiline``
-   Print long records (such as RRSIG, DNSKEY, and SOA records) in a
+   This option prints long records (such as RRSIG, DNSKEY, and SOA records) in a
    verbose multi-line format with human-readable comments. The default
    is to print each record on a single line, to facilitate machine
    parsing of the ``delv`` output.
 
 ``+[no]dnssec``
-   Indicates whether to display RRSIG records in the ``delv`` output.
+   This option indicates whether to display RRSIG records in the ``delv`` output.
    The default is to do so. Note that (unlike in ``dig``) this does
-   *not* control whether to request DNSSEC records or whether to
+   *not* control whether to request DNSSEC records or to
    validate them. DNSSEC records are always requested, and validation
-   will always occur unless suppressed by the use of ``-i`` or
+   always occurs unless suppressed by the use of ``-i`` or
    ``+noroot``.
 
 ``+[no]root[=ROOT]``
-   Indicates whether to perform conventional DNSSEC validation, and if so,
+   This option indicates whether to perform conventional DNSSEC validation, and if so,
    specifies the name of a trust anchor. The default is to validate using a
    trust anchor of "." (the root zone), for which there is a built-in key. If
    specifying a different trust anchor, then ``-a`` must be used to specify a
    file containing the key.
 
 ``+[no]tcp``
-   Controls whether to use TCP when sending queries. The default is to
+   This option controls whether to use TCP when sending queries. The default is to
    use UDP unless a truncated response has been received.
 
 ``+[no]unknownformat``
-   Print all RDATA in unknown RR type presentation format (:rfc:`3597`).
+   This option prints all RDATA in unknown RR-type presentation format (:rfc:`3597`).
    The default is to print RDATA for known types in the type's
    presentation format.
 
 ``+[no]yaml``
-   Print response data in YAML format.
+   This option prints response data in YAML format.
 
 Files
 ~~~~~

bin/delv/win32/delv.vcxproj.in

@@ -113,6 +113,20 @@
   <ItemGroup>
     <ClCompile Include="..\delv.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\isccfg\win32\libisccfg.vcxproj">
+      <Project>{B2DFA58C-6347-478E-81E8-01E06999D4F1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\irs\win32\libirs.vcxproj">
+      <Project>{A4F29CEB-7644-4A7F-BE9E-02B6A90E4919}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/dig/Makefile.am

@@ -0,0 +1,30 @@
+include $(top_srcdir)/Makefile.top
+
+AM_CPPFLAGS +=			\
+	$(LIBISC_CFLAGS)	\
+	$(LIBDNS_CFLAGS)	\
+	$(LIBISCCFG_CFLAGS)	\
+	$(LIBIRS_CFLAGS)	\
+	$(LIBBIND9_CFLAGS)	\
+	$(LIBIDN2_CFLAGS)
+
+LDADD =				\
+	libdighost.la		\
+	$(LIBISC_LIBS)		\
+	$(LIBDNS_LIBS)		\
+	$(LIBISCCFG_LIBS)	\
+	$(LIBIRS_LIBS)		\
+	$(LIBBIND9_LIBS)	\
+	$(LIBIDN2_LIBS)
+
+noinst_LTLIBRARIES = libdighost.la
+
+libdighost_la_SOURCES = \
+	dighost.h	\
+	dighost.c
+
+bin_PROGRAMS = dig host nslookup
+
+nslookup_LDADD =	\
+	$(LDADD)	\
+	$(READLINE_LIB)

bin/dig/Makefile.in

@@ -1,96 +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@
-
-VERSION=@BIND9_VERSION@
-
-@BIND9_MAKE_INCLUDES@
-
-READLINE_LIB = @READLINE_LIB@
-
-CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} \
-		${BIND9_INCLUDES} ${ISC_INCLUDES} \
-		${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ \
-		${OPENSSL_CFLAGS}
-
-CDEFINES =	-DVERSION=\"${VERSION}\"
-CWARNINGS =
-
-ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
-DNSLIBS =	../../lib/dns/libdns.@A@ @NO_LIBTOOL_DNSLIBS@
-BIND9LIBS =	../../lib/bind9/libbind9.@A@
-ISCLIBS =	../../lib/isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@
-ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @NO_LIBTOOL_ISCLIBS@
-IRSLIBS =	../../lib/irs/libirs.@A@
-
-ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
-DNSDEPLIBS =	../../lib/dns/libdns.@A@
-BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
-ISCDEPLIBS =	../../lib/isc/libisc.@A@
-IRSDEPLIBS =	../../lib/irs/libirs.@A@
-
-DEPLIBS =	${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \
-		${ISCDEPLIBS} ${ISCCFGDEPLIBS}
-
-LIBS =		${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
-		${ISCLIBS} @LIBIDN2_LIBS@ @LIBS@
-
-NOSYMLIBS =	${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
-		${ISCNOSYMLIBS} @LIBIDN2_LIBS@ @LIBS@
-
-SUBDIRS =
-
-TARGETS =	dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@
-
-OBJS =		dig.@O@ dighost.@O@ host.@O@ nslookup.@O@
-
-UOBJS =
-
-SRCS =		dig.c dighost.c host.c nslookup.c
-
-@BIND9_MAKE_RULES@
-
-LDFLAGS =	@LDFLAGS@ @LIBIDN2_LDFLAGS@
-
-dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
-	export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS}"; \
-	export LIBS0="${DNSLIBS} ${IRSLIBS}"; \
-	${FINALBUILDCMD}
-
-host@EXEEXT@: host.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
-	export BASEOBJS="host.@O@ dighost.@O@ ${UOBJS}"; \
-	export LIBS0="${DNSLIBS} ${IRSLIBS}"; \
-	${FINALBUILDCMD}
-
-nslookup@EXEEXT@: nslookup.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
-	export BASEOBJS="nslookup.@O@ dighost.@O@ ${READLINE_LIB} ${UOBJS}"; \
-	export LIBS0="${DNSLIBS} ${IRSLIBS}"; \
-	${FINALBUILDCMD}
-
-clean distclean maintainer-clean::
-	rm -f ${TARGETS}
-
-installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
-
-install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
-		dig@EXEEXT@ ${DESTDIR}${bindir}
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
-		host@EXEEXT@ ${DESTDIR}${bindir}
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
-		nslookup@EXEEXT@ ${DESTDIR}${bindir}
-
-uninstall::
-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/nslookup@EXEEXT@
-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/host@EXEEXT@
-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${bindir}/dig@EXEEXT@

bin/dig/dig.c

@@ -18,6 +18,7 @@
 #include <time.h>
 
 #include <isc/app.h>
+#include <isc/attributes.h>
 #include <isc/netaddr.h>
 #include <isc/parseint.h>
 #include <isc/platform.h>
@@ -41,12 +42,12 @@
 #include <dns/result.h>
 #include <dns/tsig.h>
 
-#include <dig/dig.h>
+#include "dighost.h"
 
 #define ADD_STRING(b, s)                                          \
 	{                                                         \
 		if (strlen(s) >= isc_buffer_availablelength(b)) { \
-			return (ISC_R_NOSPACE);                   \
+			return ((((ISC_R_NOSPACE))));             \
 		} else {                                          \
 			isc_buffer_putstr(b, s);                  \
 		}                                                 \
@@ -96,11 +97,12 @@ rcode_totext(dns_rcode_t rcode) {
 /*% print usage */
 static void
 print_usage(FILE *fp) {
-	fputs("Usage:  dig [@global-server] [domain] [q-type] [q-class] "
-	      "{q-opt}\n"
-	      "            {global-d-opt} host [@local-server] {local-d-opt}\n"
-	      "            [ host [@local-server] {local-d-opt} [...]]\n",
-	      fp);
+	fprintf(fp,
+		"Usage:  dig [@global-server] [domain] [q-type] [q-class] "
+		"{q-opt}\n"
+		"            {global-d-opt} host [@local-server] "
+		"{local-d-opt}\n"
+		"            [ host [@local-server] {local-d-opt} [...]]\n");
 }
 
 #if TARGET_OS_IPHONE
@@ -109,15 +111,14 @@ usage(void) {
 	fprintf(stderr, "Press <Help> for complete list of options\n");
 }
 #else  /* if TARGET_OS_IPHONE */
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
 	print_usage(stderr);
-	fputs("\nUse \"dig -h\" (or \"dig -h | more\") "
-	      "for complete list of options\n",
-	      stderr);
+	fprintf(stderr, "\nUse \"dig -h\" (or \"dig -h | more\") "
+			"for complete list of options\n");
 	exit(1);
 }
 #endif /* if TARGET_OS_IPHONE */
@@ -125,186 +126,194 @@ usage(void) {
 /*% version */
 static void
 version(void) {
-	fputs("DiG " VERSION "\n", stderr);
+	fprintf(stderr, "DiG %s\n", PACKAGE_VERSION);
 }
 
 /*% help */
 static void
 help(void) {
 	print_usage(stdout);
-	fputs("Where:  domain	  is in the Domain Name System\n"
-	      "        q-class  is one of (in,hs,ch,...) [default: in]\n"
-	      "        q-type   is one of (a,any,mx,ns,soa,hinfo,axfr,txt,...) "
-	      "[default:a]\n"
-	      "                 (Use ixfr=version for type ixfr)\n"
-	      "        q-opt    is one of:\n"
-	      "                 -4                  (use IPv4 query transport "
-	      "only)\n"
-	      "                 -6                  (use IPv6 query transport "
-	      "only)\n"
-	      "                 -b address[#port]   (bind to source "
-	      "address/port)\n"
-	      "                 -c class            (specify query class)\n"
-	      "                 -f filename         (batch mode)\n"
-	      "                 -k keyfile          (specify tsig key file)\n"
-	      "                 -m                  (enable memory usage "
-	      "debugging)\n"
-	      "                 -p port             (specify port number)\n"
-	      "                 -q name             (specify query name)\n"
-	      "                 -r                  (do not read ~/.digrc)\n"
-	      "                 -t type             (specify query type)\n"
-	      "                 -u                  (display times in usec "
-	      "instead of msec)\n"
-	      "                 -x dot-notation     (shortcut for reverse "
-	      "lookups)\n"
-	      "                 -y [hmac:]name:key  (specify named base64 tsig "
-	      "key)\n"
-	      "        d-opt    is of the form +keyword[=value], where keyword "
-	      "is:\n"
-	      "                 +[no]aaflag         (Set AA flag in query "
-	      "(+[no]aaflag))\n"
-	      "                 +[no]aaonly         (Set AA flag in query "
-	      "(+[no]aaflag))\n"
-	      "                 +[no]additional     (Control display of "
-	      "additional section)\n"
-	      "                 +[no]adflag         (Set AD flag in query "
-	      "(default on))\n"
-	      "                 +[no]all            (Set or clear all display "
-	      "flags)\n"
-	      "                 +[no]answer         (Control display of answer "
-	      "section)\n"
-	      "                 +[no]authority      (Control display of "
-	      "authority section)\n"
-	      "                 +[no]badcookie      (Retry BADCOOKIE "
-	      "responses)\n"
-	      "                 +[no]besteffort     (Try to parse even illegal "
-	      "messages)\n"
-	      "                 +bufsize=###        (Set EDNS0 Max UDP packet "
-	      "size)\n"
-	      "                 +[no]cdflag         (Set checking disabled "
-	      "flag in query)\n"
-	      "                 +[no]class          (Control display of class "
-	      "in records)\n"
-	      "                 +[no]cmd            (Control display of "
-	      "command line -\n"
-	      "                                      global option)\n"
-	      "                 +[no]comments       (Control display of packet "
-	      "header\n"
-	      "                                      and section name "
-	      "comments)\n"
-	      "                 +[no]cookie         (Add a COOKIE option to "
-	      "the request)\n"
-	      "                 +[no]crypto         (Control display of "
-	      "cryptographic\n"
-	      "                                      fields in records)\n"
-	      "                 +[no]defname        (Use search list "
-	      "(+[no]search))\n"
-	      "                 +[no]dnssec         (Request DNSSEC records)\n"
-	      "                 +domain=###         (Set default domainname)\n"
-	      "                 +[no]dscp[=###]     (Set the DSCP value to ### "
-	      "[0..63])\n"
-	      "                 +[no]edns[=###]     (Set EDNS version) [0]\n"
-	      "                 +ednsflags=###      (Set EDNS flag bits)\n"
-	      "                 +[no]ednsnegotiation (Set EDNS version "
-	      "negotiation)\n"
-	      "                 +ednsopt=###[:value] (Send specified EDNS "
-	      "option)\n"
-	      "                 +noednsopt          (Clear list of +ednsopt "
-	      "options)\n"
-	      "                 +[no]expandaaaa     (Expand AAAA records)\n"
-	      "                 +[no]expire         (Request time to expire)\n"
-	      "                 +[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"
+	printf("Where:  domain	  is in the Domain Name System\n"
+	       "        q-class  is one of (in,hs,ch,...) [default: in]\n"
+	       "        q-type   is one of "
+	       "(a,any,mx,ns,soa,hinfo,axfr,txt,...) "
+	       "[default:a]\n"
+	       "                 (Use ixfr=version for type ixfr)\n"
+	       "        q-opt    is one of:\n"
+	       "                 -4                  (use IPv4 query transport "
+	       "only)\n"
+	       "                 -6                  (use IPv6 query transport "
+	       "only)\n"
+	       "                 -b address[#port]   (bind to source "
+	       "address/port)\n"
+	       "                 -c class            (specify query class)\n"
+	       "                 -f filename         (batch mode)\n"
+	       "                 -k keyfile          (specify tsig key file)\n"
+	       "                 -m                  (enable memory usage "
+	       "debugging)\n"
+	       "                 -p port             (specify port number)\n"
+	       "                 -q name             (specify query name)\n"
+	       "                 -r                  (do not read ~/.digrc)\n"
+	       "                 -t type             (specify query type)\n"
+	       "                 -u                  (display times in usec "
+	       "instead of msec)\n"
+	       "                 -x dot-notation     (shortcut for reverse "
+	       "lookups)\n"
+	       "                 -y [hmac:]name:key  (specify named base64 "
+	       "tsig "
+	       "key)\n"
+	       "        d-opt    is of the form +keyword[=value], where "
+	       "keyword "
+	       "is:\n"
+	       "                 +[no]aaflag         (Set AA flag in query "
+	       "(+[no]aaflag))\n"
+	       "                 +[no]aaonly         (Set AA flag in query "
+	       "(+[no]aaflag))\n"
+	       "                 +[no]additional     (Control display of "
+	       "additional section)\n"
+	       "                 +[no]adflag         (Set AD flag in query "
+	       "(default on))\n"
+	       "                 +[no]all            (Set or clear all display "
+	       "flags)\n"
+	       "                 +[no]answer         (Control display of "
+	       "answer "
+	       "section)\n"
+	       "                 +[no]authority      (Control display of "
+	       "authority section)\n"
+	       "                 +[no]badcookie      (Retry BADCOOKIE "
+	       "responses)\n"
+	       "                 +[no]besteffort     (Try to parse even "
+	       "illegal "
+	       "messages)\n"
+	       "                 +bufsize=###        (Set EDNS0 Max UDP packet "
+	       "size)\n"
+	       "                 +[no]cdflag         (Set checking disabled "
+	       "flag in query)\n"
+	       "                 +[no]class          (Control display of class "
+	       "in records)\n"
+	       "                 +[no]cmd            (Control display of "
+	       "command line -\n"
+	       "                                      global option)\n"
+	       "                 +[no]comments       (Control display of "
+	       "packet "
+	       "header\n"
+	       "                                      and section name "
+	       "comments)\n"
+	       "                 +[no]cookie         (Add a COOKIE option to "
+	       "the request)\n"
+	       "                 +[no]crypto         (Control display of "
+	       "cryptographic\n"
+	       "                                      fields in records)\n"
+	       "                 +[no]defname        (Use search list "
+	       "(+[no]search))\n"
+	       "                 +[no]dnssec         (Request DNSSEC records)\n"
+	       "                 +domain=###         (Set default domainname)\n"
+	       "                 +[no]dscp[=###]     (Set the DSCP value to "
+	       "### "
+	       "[0..63])\n"
+	       "                 +[no]edns[=###]     (Set EDNS version) [0]\n"
+	       "                 +ednsflags=###      (Set EDNS flag bits)\n"
+	       "                 +[no]ednsnegotiation (Set EDNS version "
+	       "negotiation)\n"
+	       "                 +ednsopt=###[:value] (Send specified EDNS "
+	       "option)\n"
+	       "                 +noednsopt          (Clear list of +ednsopt "
+	       "options)\n"
+	       "                 +[no]expandaaaa     (Expand AAAA records)\n"
+	       "                 +[no]expire         (Request time to expire)\n"
+	       "                 +[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"
 #ifdef HAVE_LIBIDN2
-	      "                 +[no]idnin          (Parse IDN names "
-	      "[default=on on tty])\n"
-	      "                 +[no]idnout         (Convert IDN response "
-	      "[default=on on tty])\n"
+	       "                 +[no]idnin          (Parse IDN names "
+	       "[default=on on tty])\n"
+	       "                 +[no]idnout         (Convert IDN response "
+	       "[default=on on tty])\n"
 #endif /* ifdef HAVE_LIBIDN2 */
-	      "                 +[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"
-	      "                 +[no]mapped         (Allow mapped IPv4 over "
-	      "IPv6)\n"
-	      "                 +[no]multiline      (Print records in an "
-	      "expanded format)\n"
-	      "                 +ndots=###          (Set search NDOTS value)\n"
-	      "                 +[no]nsid           (Request Name Server ID)\n"
-	      "                 +[no]nssearch       (Search all authoritative "
-	      "nameservers)\n"
-	      "                 +[no]onesoa         (AXFR prints only one soa "
-	      "record)\n"
-	      "                 +[no]opcode=###     (Set the opcode of the "
-	      "request)\n"
-	      "                 +padding=###        (Set padding block size "
-	      "[0])\n"
-	      "                 +[no]qr             (Print question before "
-	      "sending)\n"
-	      "                 +[no]question       (Control display of "
-	      "question section)\n"
-	      "                 +[no]raflag         (Set RA flag in query "
-	      "(+[no]raflag))\n"
-	      "                 +[no]rdflag         (Recursive mode "
-	      "(+[no]recurse))\n"
-	      "                 +[no]recurse        (Recursive mode "
-	      "(+[no]rdflag))\n"
-	      "                 +retry=###          (Set number of UDP "
-	      "retries) [2]\n"
-	      "                 +[no]rrcomments     (Control display of "
-	      "per-record "
-	      "comments)\n"
-	      "                 +[no]search         (Set whether to use "
-	      "searchlist)\n"
-	      "                 +[no]short          (Display nothing except "
-	      "short\n"
-	      "                                      form of answers - global "
-	      "option)\n"
-	      "                 +[no]showsearch     (Search with intermediate "
-	      "results)\n"
-	      "                 +[no]split=##       (Split hex/base64 fields "
-	      "into chunks)\n"
-	      "                 +[no]stats          (Control display of "
-	      "statistics)\n"
-	      "                 +subnet=addr        (Set edns-client-subnet "
-	      "option)\n"
-	      "                 +[no]tcflag         (Set TC flag in query "
-	      "(+[no]tcflag))\n"
-	      "                 +[no]tcp            (TCP mode (+[no]vc))\n"
-	      "                 +timeout=###        (Set query timeout) [5]\n"
-	      "                 +[no]trace          (Trace delegation down "
-	      "from root "
-	      "[+dnssec])\n"
-	      "                 +tries=###          (Set number of UDP "
-	      "attempts) [3]\n"
-	      "                 +[no]ttlid          (Control display of ttls "
-	      "in records)\n"
-	      "                 +[no]ttlunits       (Display TTLs in "
-	      "human-readable units)\n"
-	      "                 +[no]unexpected     (Print replies from "
-	      "unexpected sources\n"
-	      "                                      default=off)\n"
-	      "                 +[no]unknownformat  (Print RDATA in RFC 3597 "
-	      "\"unknown\" "
-	      "format)\n"
-	      "                 +[no]vc             (TCP mode (+[no]tcp))\n"
-	      "                 +[no]yaml           (Present the results as "
-	      "YAML)\n"
-	      "                 +[no]zflag          (Set Z flag in query)\n"
-	      "        global d-opts and servers (before host name) affect all "
-	      "queries.\n"
-	      "        local d-opts and servers (after host name) affect only "
-	      "that lookup.\n"
-	      "        -h                           (print help and exit)\n"
-	      "        -v                           (print version and exit)\n",
-	      stdout);
+	       "                 +[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"
+	       "                 +[no]mapped         (Allow mapped IPv4 over "
+	       "IPv6)\n"
+	       "                 +[no]multiline      (Print records in an "
+	       "expanded format)\n"
+	       "                 +ndots=###          (Set search NDOTS value)\n"
+	       "                 +[no]nsid           (Request Name Server ID)\n"
+	       "                 +[no]nssearch       (Search all authoritative "
+	       "nameservers)\n"
+	       "                 +[no]onesoa         (AXFR prints only one soa "
+	       "record)\n"
+	       "                 +[no]opcode=###     (Set the opcode of the "
+	       "request)\n"
+	       "                 +padding=###        (Set padding block size "
+	       "[0])\n"
+	       "                 +[no]qr             (Print question before "
+	       "sending)\n"
+	       "                 +[no]question       (Control display of "
+	       "question section)\n"
+	       "                 +[no]raflag         (Set RA flag in query "
+	       "(+[no]raflag))\n"
+	       "                 +[no]rdflag         (Recursive mode "
+	       "(+[no]recurse))\n"
+	       "                 +[no]recurse        (Recursive mode "
+	       "(+[no]rdflag))\n"
+	       "                 +retry=###          (Set number of UDP "
+	       "retries) [2]\n"
+	       "                 +[no]rrcomments     (Control display of "
+	       "per-record "
+	       "comments)\n"
+	       "                 +[no]search         (Set whether to use "
+	       "searchlist)\n"
+	       "                 +[no]short          (Display nothing except "
+	       "short\n"
+	       "                                      form of answers - global "
+	       "option)\n"
+	       "                 +[no]showsearch     (Search with intermediate "
+	       "results)\n"
+	       "                 +[no]split=##       (Split hex/base64 fields "
+	       "into chunks)\n"
+	       "                 +[no]stats          (Control display of "
+	       "statistics)\n"
+	       "                 +subnet=addr        (Set edns-client-subnet "
+	       "option)\n"
+	       "                 +[no]tcflag         (Set TC flag in query "
+	       "(+[no]tcflag))\n"
+	       "                 +[no]tcp            (TCP mode (+[no]vc))\n"
+	       "                 +timeout=###        (Set query timeout) [5]\n"
+	       "                 +[no]trace          (Trace delegation down "
+	       "from root "
+	       "[+dnssec])\n"
+	       "                 +tries=###          (Set number of UDP "
+	       "attempts) [3]\n"
+	       "                 +[no]ttlid          (Control display of ttls "
+	       "in records)\n"
+	       "                 +[no]ttlunits       (Display TTLs in "
+	       "human-readable units)\n"
+	       "                 +[no]unexpected     (Print replies from "
+	       "unexpected sources\n"
+	       "                                      default=off)\n"
+	       "                 +[no]unknownformat  (Print RDATA in RFC 3597 "
+	       "\"unknown\" "
+	       "format)\n"
+	       "                 +[no]vc             (TCP mode (+[no]tcp))\n"
+	       "                 +[no]yaml           (Present the results as "
+	       "YAML)\n"
+	       "                 +[no]zflag          (Set Z flag in query)\n"
+	       "        global d-opts and servers (before host name) affect "
+	       "all "
+	       "queries.\n"
+	       "        local d-opts and servers (after host name) affect only "
+	       "that lookup.\n"
+	       "        -h                           (print help and exit)\n"
+	       "        -v                           (print version "
+	       "and exit)\n");
 }
 
 /*%
@@ -606,7 +615,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg,
 
 	if (query->lookup->cmdline[0] != 0) {
 		if (!short_form && printcmd) {
-			fputs(query->lookup->cmdline, stdout);
+			printf("%s", query->lookup->cmdline);
 		}
 		query->lookup->cmdline[0] = '\0';
 	}
@@ -912,7 +921,8 @@ printgreeting(int argc, char **argv, dig_lookup_t *lookup) {
 
 	if (printcmd) {
 		snprintf(lookup->cmdline, sizeof(lookup->cmdline),
-			 "%s; <<>> DiG " VERSION " <<>>", first ? "\n" : "");
+			 "%s; <<>> DiG %s <<>>", first ? "\n" : "",
+			 PACKAGE_VERSION);
 		i = 1;
 		while (i < argc) {
 			snprintf(append, sizeof(append), " %s", argv[i++]);
@@ -1479,6 +1489,24 @@ plus_option(char *option, bool is_batchfile, dig_lookup_t *lookup) {
 		break;
 	case 'q':
 		switch (cmd[1]) {
+		case 'i': /* qid */
+			FULLCHECK("qid");
+			if (!state) {
+				lookup->setqid = false;
+				lookup->qid = 0;
+				break;
+			}
+			if (value == NULL) {
+				goto need_value;
+			}
+			result = parse_uint(&num, value, MAXQID, "qid");
+			if (result != ISC_R_SUCCESS) {
+				warn("Couldn't parse qid");
+				goto exit_or_usage;
+			}
+			lookup->setqid = true;
+			lookup->qid = num;
+			break;
 		case 'r': /* qr */
 			FULLCHECK("qr");
 			lookup->qr = state;
@@ -2658,7 +2686,7 @@ dig_query_setup(bool is_batchfile, bool config_only, int argc, char **argv) {
 }
 
 void
-dig_startup() {
+dig_startup(void) {
 	isc_result_t result;
 
 	debug("dig_startup()");
@@ -2669,12 +2697,12 @@ dig_startup() {
 }
 
 void
-dig_query_start() {
+dig_query_start(void) {
 	start_lookup();
 }
 
 void
-dig_shutdown() {
+dig_shutdown(void) {
 	destroy_lookup(default_lookup);
 	if (atomic_load(&batchname) != 0) {
 		if (batchfp != stdin) {

bin/dig/dig.rst

@@ -40,33 +40,33 @@ Description
 ``dig`` is a flexible tool for interrogating DNS name servers. It
 performs DNS lookups and displays the answers that are returned from the
 name server(s) that were queried. Most DNS administrators use ``dig`` to
-troubleshoot DNS problems because of its flexibility, ease of use and
+troubleshoot DNS problems because of its flexibility, ease of use, and
 clarity of output. Other lookup tools tend to have less functionality
 than ``dig``.
 
 Although ``dig`` is normally used with command-line arguments, it also
 has a batch mode of operation for reading lookup requests from a file. A
 brief summary of its command-line arguments and options is printed when
-the ``-h`` option is given. Unlike earlier versions, the BIND 9
+the ``-h`` option is given. The BIND 9
 implementation of ``dig`` allows multiple lookups to be issued from the
 command line.
 
-Unless it is told to query a specific name server, ``dig`` will try each
+Unless it is told to query a specific name server, ``dig`` tries each
 of the servers listed in ``/etc/resolv.conf``. If no usable server
-addresses are found, ``dig`` will send the query to the local host.
+addresses are found, ``dig`` sends the query to the local host.
 
-When no command line arguments or options are given, ``dig`` will
-perform an NS query for "." (the root).
+When no command-line arguments or options are given, ``dig``
+performs an NS query for "." (the root).
 
 It is possible to set per-user defaults for ``dig`` via
 ``${HOME}/.digrc``. This file is read and any options in it are applied
-before the command line arguments. The ``-r`` option disables this
-feature, for scripts that need predictable behaviour.
+before the command-line arguments. The ``-r`` option disables this
+feature, for scripts that need predictable behavior.
 
-The IN and CH class names overlap with the IN and CH top level domain
+The IN and CH class names overlap with the IN and CH top-level domain
 names. Either use the ``-t`` and ``-c`` options to specify the type and
-class, use the ``-q`` the specify the domain name, or use "IN." and
-"CH." when looking up these top level domains.
+class, use the ``-q`` to specify the domain name, or use "IN." and
+"CH." when looking up these top-level domains.
 
 Simple Usage
 ~~~~~~~~~~~~
@@ -90,110 +90,110 @@ where:
    ``/etc/resolv.conf``; if an address is found there, it queries the
    name server at that address. If either of the ``-4`` or ``-6``
    options are in use, then only addresses for the corresponding
-   transport will be tried. If no usable addresses are found, ``dig``
-   will send the query to the local host. The reply from the name server
+   transport are tried. If no usable addresses are found, ``dig``
+   sends the query to the local host. The reply from the name server
    that responds is displayed.
 
 ``name``
    is the name of the resource record that is to be looked up.
 
 ``type``
-   indicates what type of query is required MDASH ANY, A, MX, SIG, etc.
+   indicates what type of query is required - ANY, A, MX, SIG, etc.
    ``type`` can be any valid query type. If no ``type`` argument is
-   supplied, ``dig`` will perform a lookup for an A record.
+   supplied, ``dig`` performs a lookup for an A record.
 
 Options
 ~~~~~~~
 
-**-4**
-   Use IPv4 only.
+``-4``
+   This option indicates that only IPv4 should be used.
 
-**-6**
-   Use IPv6 only.
+``-6``
+   This option indicates that only IPv6 should be used.
 
-**-b** address[#port]
-   Set the source IP address of the query. The ``address`` must be a
+``-b address[#port]``
+   This option sets the source IP address of the query. The ``address`` must be a
    valid address on one of the host's network interfaces, or "0.0.0.0"
-   or "::". An optional port may be specified by appending "#<port>"
+   or "::". An optional port may be specified by appending ``#port``.
 
-**-c** class
-   Set the query class. The default ``class`` is IN; other classes are
+``-c class``
+   This option sets the query class. The default ``class`` is IN; other classes are
    HS for Hesiod records or CH for Chaosnet records.
 
-**-f** file
-   Batch mode: ``dig`` reads a list of lookup requests to process from
+``-f file``
+   This option sets batch mode, in which ``dig`` reads a list of lookup requests to process from
    the given ``file``. Each line in the file should be organized in the
-   same way they would be presented as queries to ``dig`` using the
+   same way it would be presented as a query to ``dig`` using the
    command-line interface.
 
-**-k** keyfile
-   Sign queries using TSIG using a key read from the given file. Key
-   files can be generated using tsig-keygen8. When using TSIG
+``-k keyfile``
+   This option tells ``named`` to sign queries using TSIG using a key read from the given file. Key
+   files can be generated using ``tsig-keygen``. When using TSIG
    authentication with ``dig``, the name server that is queried needs to
    know the key and algorithm that is being used. In BIND, this is done
    by providing appropriate ``key`` and ``server`` statements in
    ``named.conf``.
 
-**-m**
-   Enable memory usage debugging.
+``-m``
+   This option enables memory usage debugging.
 
-**-p** port
-   Send the query to a non-standard port on the server, instead of the
-   default port 53. This option would be used to test a name server that
+``-p port``
+   This option sends the query to a non-standard port on the server, instead of the
+   default port 53. This option is used to test a name server that
    has been configured to listen for queries on a non-standard port
    number.
 
-**-q** name
-   The domain name to query. This is useful to distinguish the ``name``
+``-q name``
+   This option specifies the domain name to query. This is useful to distinguish the ``name``
    from other arguments.
 
-**-r**
-   Do not read options from ``${HOME}/.digrc``. This is useful for
-   scripts that need predictable behaviour.
+``-r``
+   This option indicates that options from ``${HOME}/.digrc`` should not be read. This is useful for
+   scripts that need predictable behavior.
 
-**-t** type
-   The resource record type to query. It can be any valid query type. If
+``-t type``
+   This option indicates the resource record type to query, which can be any valid query type. If
    it is a resource record type supported in BIND 9, it can be given by
-   the type mnemonic (such as "NS" or "AAAA"). The default query type is
-   "A", unless the ``-x`` option is supplied to indicate a reverse
+   the type mnemonic (such as ``NS`` or ``AAAA``). The default query type is
+   ``A``, unless the ``-x`` option is supplied to indicate a reverse
    lookup. A zone transfer can be requested by specifying a type of
    AXFR. When an incremental zone transfer (IXFR) is required, set the
-   ``type`` to ``ixfr=N``. The incremental zone transfer will contain
-   the changes made to the zone since the serial number in the zone's
+   ``type`` to ``ixfr=N``. The incremental zone transfer contains
+   all changes made to the zone since the serial number in the zone's
    SOA record was ``N``.
 
-   All resource record types can be expressed as "TYPEnn", where "nn" is
+   All resource record types can be expressed as ``TYPEnn``, where ``nn`` is
    the number of the type. If the resource record type is not supported
-   in BIND 9, the result will be displayed as described in :rfc:`3597`.
+   in BIND 9, the result is displayed as described in :rfc:`3597`.
 
-**-u**
-   Print query times in microseconds instead of milliseconds.
+``-u``
+   This option indicates that print query times should be provided in microseconds instead of milliseconds.
 
-**-v**
-   Print the version number and exit.
+``-v``
+   This option prints the version number and exits.
 
-**-x** addr
-   Simplified reverse lookups, for mapping addresses to names. The
+``-x addr``
+   This option sets simplified reverse lookups, for mapping addresses to names. The
    ``addr`` is an IPv4 address in dotted-decimal notation, or a
-   colon-delimited IPv6 address. When the ``-x`` is used, there is no
-   need to provide the ``name``, ``class`` and ``type`` arguments.
+   colon-delimited IPv6 address. When the ``-x`` option is used, there is no
+   need to provide the ``name``, ``class``, and ``type`` arguments.
    ``dig`` automatically performs a lookup for a name like
    ``94.2.0.192.in-addr.arpa`` and sets the query type and class to PTR
    and IN respectively. IPv6 addresses are looked up using nibble format
    under the IP6.ARPA domain.
 
-**-y** [hmac:]keyname:secret
-   Sign queries using TSIG with the given authentication key.
-   ``keyname`` is the name of the key, and ``secret`` is the base64
-   encoded shared secret. ``hmac`` is the name of the key algorithm;
+``-y [hmac:]keyname:secret``
+   This option signs queries using TSIG with the given authentication key.
+   ``keyname`` is the name of the key, and ``secret`` is the
+   base64-encoded shared secret. ``hmac`` is the name of the key algorithm;
    valid choices are ``hmac-md5``, ``hmac-sha1``, ``hmac-sha224``,
    ``hmac-sha256``, ``hmac-sha384``, or ``hmac-sha512``. If ``hmac`` is
-   not specified, the default is ``hmac-md5`` or if MD5 was disabled
+   not specified, the default is ``hmac-md5``; if MD5 was disabled, the default is
    ``hmac-sha256``.
 
-.. note:: You should use the ``-k`` option and avoid the ``-y`` option,
-   because with ``-y`` the shared secret is supplied as a command line
-   argument in clear text. This may be visible in the output from ps1 or
+.. note:: Only the ``-k`` option should be used, rather than the ``-y`` option,
+   because with ``-y`` the shared secret is supplied as a command-line
+   argument in clear text. This may be visible in the output from ``ps1`` or
    in a history file maintained by the user's shell.
 
 Query Options
@@ -206,293 +206,296 @@ answer get printed, and others determine the timeout and retry
 strategies.
 
 Each query option is identified by a keyword preceded by a plus sign
-(``+``). Some keywords set or reset an option. These may be preceded by
+(``+``). Some keywords set or reset an option; these may be preceded by
 the string ``no`` to negate the meaning of that keyword. Other keywords
-assign values to options like the timeout interval. They have the form
+assign values to options, like the timeout interval. They have the form
 ``+keyword=value``. Keywords may be abbreviated, provided the
 abbreviation is unambiguous; for example, ``+cd`` is equivalent to
 ``+cdflag``. The query options are:
 
 ``+[no]aaflag``
-   A synonym for ``+[no]aaonly``.
+   This option is a synonym for ``+[no]aaonly``.
 
 ``+[no]aaonly``
-   Sets the "aa" flag in the query.
+   This option sets the ``aa`` flag in the query.
 
 ``+[no]additional``
-   Display [do not display] the additional section of a reply. The
+   This option displays [or does not display] the additional section of a reply. The
    default is to display it.
 
 ``+[no]adflag``
-   Set [do not set] the AD (authentic data) bit in the query. This
+   This option sets [or does not set] the AD (authentic data) bit in the query. This
    requests the server to return whether all of the answer and authority
-   sections have all been validated as secure according to the security
-   policy of the server. AD=1 indicates that all records have been
-   validated as secure and the answer is not from a OPT-OUT range. AD=0
-   indicate that some part of the answer was insecure or not validated.
+   sections have been validated as secure, according to the security
+   policy of the server. ``AD=1`` indicates that all records have been
+   validated as secure and the answer is not from a OPT-OUT range. ``AD=0``
+   indicates that some part of the answer was insecure or not validated.
    This bit is set by default.
 
 ``+[no]all``
-   Set or clear all display flags.
+   This option sets or clears all display flags.
 
 ``+[no]answer``
-   Display [do not display] the answer section of a reply. The default
+   This option displays [or does not display] the answer section of a reply. The default
    is to display it.
 
 ``+[no]authority``
-   Display [do not display] the authority section of a reply. The
+   This option displays [or does not display] the authority section of a reply. The
    default is to display it.
 
 ``+[no]badcookie``
-   Retry lookup with the new server cookie if a BADCOOKIE response is
+   This option retries the lookup with a new server cookie if a BADCOOKIE response is
    received.
 
 ``+[no]besteffort``
-   Attempt to display the contents of messages which are malformed. The
+   This option attempts to display the contents of messages which are malformed. The
    default is to not display malformed answers.
 
 ``+bufsize=B``
-   Set the UDP message buffer size advertised using EDNS0 to ``B``
-   bytes. The maximum and minimum sizes of this buffer are 65535 and 0
+   This option sets the UDP message buffer size advertised using EDNS0 to ``B``
+   bytes. The maximum and minimum sizes of this buffer are 65535 and 0,
    respectively. Values outside this range are rounded up or down
-   appropriately. Values other than zero will cause a EDNS query to be
+   appropriately. Values other than zero cause an EDNS query to be
    sent.
 
 ``+[no]cdflag``
-   Set [do not set] the CD (checking disabled) bit in the query. This
+   This option sets [or does not set] the CD (checking disabled) bit in the query. This
    requests the server to not perform DNSSEC validation of responses.
 
 ``+[no]class``
-   Display [do not display] the CLASS when printing the record.
+   This option displays [or does not display] the CLASS when printing the record.
 
 ``+[no]cmd``
-   Toggles the printing of the initial comment in the output, identifying the
-   version of ``dig`` and the query options that have been applied.  This option
-   always has global effect; it cannot be set globally and then overridden on a
-   per-lookup basis.  The default is to print this comment.
+   This option toggles the printing of the initial comment in the output, identifying the
+   version of ``dig`` and the query options that have been applied. This option
+   always has a global effect; it cannot be set globally and then overridden on a
+   per-lookup basis. The default is to print this comment.
 
 ``+[no]comments``
-   Toggles the display of some comment lines in the output, containing
+   This option toggles the display of some comment lines in the output, with
    information about the packet header and OPT pseudosection, and the names of
-   the response section.  The default is to print these comments.
+   the response section. The default is to print these comments.
 
    Other types of comments in the output are not affected by this option, but
-   can be controlled using other command line switches. These include
+   can be controlled using other command-line switches. These include
    ``+[no]cmd``, ``+[no]question``, ``+[no]stats``, and ``+[no]rrcomments``.
 
 ``+[no]cookie=####``
-   Send a COOKIE EDNS option, with optional value. Replaying a COOKIE
-   from a previous response will allow the server to identify a previous
+   This option sends [or does not send] a COOKIE EDNS option, with an optional value. Replaying a COOKIE
+   from a previous response allows the server to identify a previous
    client. The default is ``+cookie``.
 
-   ``+cookie`` is also set when +trace is set to better emulate the
+   ``+cookie`` is also set when ``+trace`` is set to better emulate the
    default queries from a nameserver.
 
 ``+[no]crypto``
-   Toggle the display of cryptographic fields in DNSSEC records. The
-   contents of these field are unnecessary to debug most DNSSEC
+   This option toggles the display of cryptographic fields in DNSSEC records. The
+   contents of these fields are unnecessary for debugging most DNSSEC
    validation failures and removing them makes it easier to see the
-   common failures. The default is to display the fields. When omitted
-   they are replaced by the string "[omitted]" or in the DNSKEY case the
-   key id is displayed as the replacement, e.g. "[ key id = value ]".
+   common failures. The default is to display the fields. When omitted,
+   they are replaced by the string ``[omitted]`` or, in the DNSKEY case, the
+   key ID is displayed as the replacement, e.g. ``[ key id = value ]``.
 
 ``+[no]defname``
-   Deprecated, treated as a synonym for ``+[no]search``
+   This option, which is deprecated, is treated as a synonym for ``+[no]search``.
 
 ``+[no]dnssec``
-   Requests DNSSEC records be sent by setting the DNSSEC OK bit (DO) in
+   This option requests that DNSSEC records be sent by setting the DNSSEC OK (DO) bit in
    the OPT record in the additional section of the query.
 
 ``+domain=somename``
-   Set the search list to contain the single domain ``somename``, as if
+   This option sets the search list to contain the single domain ``somename``, as if
    specified in a ``domain`` directive in ``/etc/resolv.conf``, and
-   enable search list processing as if the ``+search`` option were
+   enables search list processing as if the ``+search`` option were
    given.
 
 ``+dscp=value``
-   Set the DSCP code point to be used when sending the query. Valid DSCP
-   code points are in the range [0..63]. By default no code point is
+   This option sets the DSCP code point to be used when sending the query. Valid DSCP
+   code points are in the range [0...63]. By default no code point is
    explicitly set.
 
 ``+[no]edns[=#]``
-   Specify the EDNS version to query with. Valid values are 0 to 255.
-   Setting the EDNS version will cause a EDNS query to be sent.
+   This option specifies the EDNS version to query with. Valid values are 0 to 255.
+   Setting the EDNS version causes an EDNS query to be sent.
    ``+noedns`` clears the remembered EDNS version. EDNS is set to 0 by
    default.
 
 ``+[no]ednsflags[=#]``
-   Set the must-be-zero EDNS flags bits (Z bits) to the specified value.
-   Decimal, hex and octal encodings are accepted. Setting a named flag
-   (e.g. DO) will silently be ignored. By default, no Z bits are set.
+   This option sets the must-be-zero EDNS flags bits (Z bits) to the specified value.
+   Decimal, hex, and octal encodings are accepted. Setting a named flag
+   (e.g., DO) is silently ignored. By default, no Z bits are set.
 
 ``+[no]ednsnegotiation``
-   Enable / disable EDNS version negotiation. By default EDNS version
+   This option enables/disables EDNS version negotiation. By default, EDNS version
    negotiation is enabled.
 
 ``+[no]ednsopt[=code[:value]]``
-   Specify EDNS option with code point ``code`` and optionally payload
+   This option specifies the EDNS option with code point ``code`` and an optional payload
    of ``value`` as a hexadecimal string. ``code`` can be either an EDNS
-   option name (for example, ``NSID`` or ``ECS``), or an arbitrary
+   option name (for example, ``NSID`` or ``ECS``) or an arbitrary
    numeric value. ``+noednsopt`` clears the EDNS options to be sent.
 
 ``+[no]expire``
-   Send an EDNS Expire option.
+   This option sends an EDNS Expire option.
 
 ``+[no]fail``
-   Do not try the next server if you receive a SERVFAIL. The default is
-   to not try the next server which is the reverse of normal stub
+   This option indicates that ``named`` should try [or not try] the next server if a SERVFAIL is received. The default is
+   to not try the next server, which is the reverse of normal stub
    resolver behavior.
 
 ``+[no]header-only``
-   Send a query with a DNS header without a question section. The
+   This option sends a query with a DNS header without a question section. The
    default is to add a question section. The query type and query name
    are ignored when this is set.
 
 ``+[no]identify``
-   Show [or do not show] the IP address and port number that supplied
-   the answer when the ``+short`` option is enabled. If short form
+   This option shows [or does not show] the IP address and port number that supplied
+   the answer, when the ``+short`` option is enabled. If short form
    answers are requested, the default is not to show the source address
    and port number of the server that provided the answer.
 
 ``+[no]idnin``
-   Process [do not process] IDN domain names on input. This requires IDN
-   SUPPORT to have been enabled at compile time.
+   This option processes [or does 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 when standard output is a tty.
-   The IDN processing on input is disabled when dig output is redirected
+   The IDN processing on input is disabled when ``dig`` output is redirected
    to files, pipes, and other non-tty file descriptors.
 
 ``+[no]idnout``
-   Convert [do not convert] puny code on output. This requires IDN
-   SUPPORT to have been enabled at compile time.
+   This option converts [or does not convert] puny code on output. This requires
+   ``IDN SUPPORT`` to have been enabled at compile time.
 
    The default is to process puny code on output when standard output is
-   a tty. The puny code processing on output is disabled when dig output
+   a tty. The puny code processing on output is disabled when ``dig`` output
    is redirected to files, pipes, and other non-tty file descriptors.
 
 ``+[no]ignore``
-   Ignore truncation in UDP responses instead of retrying with TCP. By
+   This option ignores [or does not ignore] truncation in UDP responses instead of retrying with TCP. By
    default, TCP retries are performed.
 
 ``+[no]keepalive``
-   Send [or do not send] an EDNS Keepalive option.
+   This option sends [or does not send] an EDNS Keepalive option.
 
 ``+[no]keepopen``
-   Keep the TCP socket open between queries and reuse it rather than
+   This option keeps [or does not keep] the TCP socket open between queries, and reuses it rather than
    creating a new TCP socket for each lookup. The default is
    ``+nokeepopen``.
 
 ``+[no]mapped``
-   Allow mapped IPv4 over IPv6 addresses to be used. The default is
+   This option allows [or does not allow] mapped IPv4-over-IPv6 addresses to be used. The default is
    ``+mapped``.
 
 ``+[no]multiline``
-   Print records like the SOA records in a verbose multi-line format
+   This option prints [or does not print] records, like the SOA records, in a verbose multi-line format
    with human-readable comments. The default is to print each record on
-   a single line, to facilitate machine parsing of the ``dig`` output.
+   a single line to facilitate machine parsing of the ``dig`` output.
 
 ``+ndots=D``
-   Set the number of dots that have to appear in ``name`` to ``D`` for
+   This option sets the number of dots (``D``) that must appear in ``name`` for
    it to be considered absolute. The default value is that defined using
-   the ndots statement in ``/etc/resolv.conf``, or 1 if no ndots
+   the ``ndots`` statement in ``/etc/resolv.conf``, or 1 if no ``ndots``
    statement is present. Names with fewer dots are interpreted as
-   relative names and will be searched for in the domains listed in the
+   relative names, and are searched for in the domains listed in the
    ``search`` or ``domain`` directive in ``/etc/resolv.conf`` if
    ``+search`` is set.
 
 ``+[no]nsid``
-   Include an EDNS name server ID request when sending a query.
+   When enabled, this option includes an EDNS name server ID request when sending a query.
 
 ``+[no]nssearch``
    When this option is set, ``dig`` attempts to find the authoritative
-   name servers for the zone containing the name being looked up and
+   name servers for the zone containing the name being looked up, and
    display the SOA record that each name server has for the zone.
-   Addresses of servers that that did not respond are also printed.
+   Addresses of servers that did not respond are also printed.
 
 ``+[no]onesoa``
-   Print only one (starting) SOA record when performing an AXFR. The
+   When enabled, this option prints only one (starting) SOA record when performing an AXFR. The
    default is to print both the starting and ending SOA records.
 
 ``+[no]opcode=value``
-   Set [restore] the DNS message opcode to the specified value. The
+   When enabled, this option sets (restores) the DNS message opcode to the specified value. The
    default value is QUERY (0).
 
 ``+padding=value``
-   Pad the size of the query packet using the EDNS Padding option to
-   blocks of ``value`` bytes. For example, ``+padding=32`` would cause a
+   This option pads the size of the query packet using the EDNS Padding option to
+   blocks of ``value`` bytes. For example, ``+padding=32`` causes a
    48-byte query to be padded to 64 bytes. The default block size is 0,
-   which disables padding. The maximum is 512. Values are ordinarily
+   which disables padding; the maximum is 512. Values are ordinarily
    expected to be powers of two, such as 128; however, this is not
    mandatory. Responses to padded queries may also be padded, but only
    if the query uses TCP or DNS COOKIE.
 
+``+qid=value``
+   This option specifies the query ID to use when sending queries.
+
 ``+[no]qr``
-   Toggles the display of the query message as it is sent. By default, the query
+   This option toggles the display of the query message as it is sent. By default, the query
    is not printed.
 
 ``+[no]question``
-   Toggles the display of the question section of a query when an answer is
-   returned.  The default is to print the question section as a comment.
+   This option toggles the display of the question section of a query when an answer is
+   returned. The default is to print the question section as a comment.
 
 ``+[no]raflag``
-   Set [do not set] the RA (Recursion Available) bit in the query. The
-   default is +noraflag. This bit should be ignored by the server for
+   This option sets [or does not set] the RA (Recursion Available) bit in the query. The
+   default is ``+noraflag``. This bit is ignored by the server for
    QUERY.
 
 ``+[no]rdflag``
-   A synonym for ``+[no]recurse``.
+   This option is a synonym for ``+[no]recurse``.
 
 ``+[no]recurse``
-   Toggle the setting of the RD (recursion desired) bit in the query.
+   This option toggles the setting of the RD (recursion desired) bit in the query.
    This bit is set by default, which means ``dig`` normally sends
    recursive queries. Recursion is automatically disabled when the
-   ``+nssearch`` or ``+trace`` query options are used.
+   ``+nssearch`` or ``+trace`` query option is used.
 
 ``+retry=T``
-   Sets the number of times to retry UDP queries to server to ``T``
+   This option sets the number of times to retry UDP queries to server to ``T``
    instead of the default, 2. Unlike ``+tries``, this does not include
    the initial query.
 
 ``+[no]rrcomments``
-   Toggle the display of per-record comments in the output (for example,
+   This option toggles the display of per-record comments in the output (for example,
    human-readable key information about DNSKEY records). The default is
    not to print record comments unless multiline mode is active.
 
 ``+[no]search``
-   Use [do not use] the search list defined by the searchlist or domain
-   directive in ``resolv.conf`` (if any). The search list is not used by
+   This option uses [or does not use] the search list defined by the searchlist or domain
+   directive in ``resolv.conf``, if any. The search list is not used by
    default.
 
-   'ndots' from ``resolv.conf`` (default 1) which may be overridden by
-   ``+ndots`` determines if the name will be treated as relative or not
-   and hence whether a search is eventually performed or not.
+   ``ndots`` from ``resolv.conf`` (default 1), which may be overridden by
+   ``+ndots``, determines whether the name is treated as relative
+   and hence whether a search is eventually performed.
 
 ``+[no]short``
-   Provide a terse answer.  The default is to print the answer in a verbose
-   form.  This option always has global effect; it cannot be set globally and
+   This option toggles whether a terse answer is provided. The default is to print the answer in a verbose
+   form. This option always has a global effect; it cannot be set globally and
    then overridden on a per-lookup basis.
 
 ``+[no]showsearch``
-   Perform [do not perform] a search showing intermediate results.
+   This option performs [or does not perform] a search showing intermediate results.
 
 ``+[no]sigchase``
    This feature is now obsolete and has been removed; use ``delv``
    instead.
 
 ``+split=W``
-   Split long hex- or base64-formatted fields in resource records into
+   This option splits long hex- or base64-formatted fields in resource records into
    chunks of ``W`` characters (where ``W`` is rounded up to the nearest
    multiple of 4). ``+nosplit`` or ``+split=0`` causes fields not to be
    split at all. The default is 56 characters, or 44 characters when
    multiline mode is active.
 
 ``+[no]stats``
-   Toggles the printing of statistics: when the query was made, the size of the
-   reply and so on.  The default behavior is to print the query statistics as a
+   This option toggles the printing of statistics: when the query was made, the size of the
+   reply, etc. The default behavior is to print the query statistics as a
    comment after each lookup.
 
 ``+[no]subnet=addr[/prefix-length]``
-   Send (don't send) an EDNS Client Subnet option with the specified IP
+   This option sends [or does not send] an EDNS CLIENT-SUBNET option with the specified IP
    address or network prefix.
 
    ``dig +subnet=0.0.0.0/0``, or simply ``dig +subnet=0`` for short,
@@ -501,75 +504,74 @@ abbreviation is unambiguous; for example, ``+cd`` is equivalent to
    address information must *not* be used when resolving this query.
 
 ``+[no]tcflag``
-   Set [do not set] the TC (TrunCation) bit in the query. The default is
-   +notcflag. This bit should be ignored by the server for QUERY.
+   This option sets [or does not set] the TC (TrunCation) bit in the query. The default is
+   ``+notcflag``. This bit is ignored by the server for QUERY.
 
 ``+[no]tcp``
-   Use [do not use] TCP when querying name servers. The default behavior
+   This option uses [or does not use] TCP when querying name servers. The default behavior
    is to use UDP unless a type ``any`` or ``ixfr=N`` query is requested,
    in which case the default is TCP. AXFR queries always use TCP.
 
 ``+timeout=T``
-   Sets the timeout for a query to ``T`` seconds. The default timeout is
-   5 seconds. An attempt to set ``T`` to less than 1 will result in a
-   query timeout of 1 second being applied.
+   This option sets the timeout for a query to ``T`` seconds. The default timeout is
+   5 seconds. An attempt to set ``T`` to less than 1 is silently set to 1.
 
 ``+[no]topdown``
    This feature is related to ``dig +sigchase``, which is obsolete and
    has been removed. Use ``delv`` instead.
 
 ``+[no]trace``
-   Toggle tracing of the delegation path from the root name servers for
+   This option toggles tracing of the delegation path from the root name servers for
    the name being looked up. Tracing is disabled by default. When
    tracing is enabled, ``dig`` makes iterative queries to resolve the
-   name being looked up. It will follow referrals from the root servers,
+   name being looked up. It follows referrals from the root servers,
    showing the answer from each server that was used to resolve the
    lookup.
 
-   If @server is also specified, it affects only the initial query for
+   If ``@server`` is also specified, it affects only the initial query for
    the root zone name servers.
 
-   ``+dnssec`` is also set when +trace is set to better emulate the
-   default queries from a nameserver.
+   ``+dnssec`` is also set when ``+trace`` is set, to better emulate the
+   default queries from a name server.
 
 ``+tries=T``
-   Sets the number of times to try UDP queries to server to ``T``
+   This option sets the number of times to try UDP queries to server to ``T``
    instead of the default, 3. If ``T`` is less than or equal to zero,
    the number of tries is silently rounded up to 1.
 
 ``+trusted-key=####``
-   Formerly specified trusted keys for use with ``dig +sigchase``. This
+   This option formerly specified trusted keys for use with ``dig +sigchase``. This
    feature is now obsolete and has been removed; use ``delv`` instead.
 
 ``+[no]ttlid``
-   Display [do not display] the TTL when printing the record.
+   This option displays [or does not display] the TTL when printing the record.
 
 ``+[no]ttlunits``
-   Display [do not display] the TTL in friendly human-readable time
-   units of "s", "m", "h", "d", and "w", representing seconds, minutes,
-   hours, days and weeks. Implies +ttlid.
+   This option displays [or does not display] the TTL in friendly human-readable time
+   units of ``s``, ``m``, ``h``, ``d``, and ``w``, representing seconds, minutes,
+   hours, days, and weeks. This implies ``+ttlid``.
 
 ``+[no]unexpected``
-   Accept [do not accept] answers from unexpected sources.  By default, ``dig``
-   won't accept a reply from a source other than the one to which it sent the
+   This option accepts [or does not accept] answers from unexpected sources.  By default, ``dig``
+   will not accept a reply from a source other than the one to which it sent the
    query.
 
 ``+[no]unknownformat``
-   Print all RDATA in unknown RR type presentation format (:rfc:`3597`).
+   This option prints all RDATA in unknown RR type presentation format (:rfc:`3597`).
    The default is to print RDATA for known types in the type's
    presentation format.
 
 ``+[no]vc``
-   Use [do not use] TCP when querying name servers. This alternate
+   This option uses [or does not use] TCP when querying name servers. This alternate
    syntax to ``+[no]tcp`` is provided for backwards compatibility. The
-   "vc" stands for "virtual circuit".
+   ``vc`` stands for "virtual circuit."
 
 ``+[no]yaml``
-   Print the responses (and, if <option>+qr</option> is in use, also the
+   When enabled, this option prints the responses (and, if ``+qr`` is in use, also the
    outgoing queries) in a detailed YAML format.
 
 ``+[no]zflag``
-   Set [do not set] the last unassigned DNS header flag in a DNS query.
+   This option sets [or does not set] the last unassigned DNS header flag in a DNS query.
    This flag is off by default.
 
 Multiple Queries
@@ -578,12 +580,12 @@ Multiple Queries
 The BIND 9 implementation of ``dig`` supports specifying multiple
 queries on the command line (in addition to supporting the ``-f`` batch
 file option). Each of those queries can be supplied with its own set of
-flags, options and query options.
+flags, options, and query options.
 
-In this case, each ``query`` argument represent an individual query in
+In this case, each ``query`` argument represents an individual query in
 the command-line syntax described above. Each consists of any of the
 standard options and flags, the name to be looked up, an optional query
-type and class and any query options that should be applied to that
+type and class, and any query options that should be applied to that
 query.
 
 A global set of query options, which should be applied to all queries,
@@ -597,12 +599,12 @@ query options. For example:
 
    dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
 
-shows how ``dig`` could be used from the command line to make three
-lookups: an ANY query for ``www.isc.org``, a reverse lookup of 127.0.0.1
+shows how ``dig`` can be used from the command line to make three
+lookups: an ANY query for ``www.isc.org``, a reverse lookup of 127.0.0.1,
 and a query for the NS records of ``isc.org``. A global query option of
 ``+qr`` is applied, so that ``dig`` shows the initial query it made for
 each lookup. The final query has a local query option of ``+noqr`` which
-means that ``dig`` will not print the initial query when it looks up the
+means that ``dig`` does not print the initial query when it looks up the
 NS records for ``isc.org``.
 
 IDN Support
@@ -610,10 +612,10 @@ IDN Support
 
 If ``dig`` has been built with IDN (internationalized domain name)
 support, it can accept and display non-ASCII domain names. ``dig``
-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, use parameters
-``+noidnin`` and ``+noidnout`` or define the IDN_DISABLE environment
+appropriately converts character encoding of a domain name before sending
+a request to a DNS server or displaying a reply from the server.
+To turn off IDN support, use the parameters
+``+noidnin`` and ``+noidnout``, or define the ``IDN_DISABLE`` environment
 variable.
 
 Files

bin/dig/dighost.c

@@ -84,7 +84,7 @@
 
 #include <bind9/getaddresses.h>
 
-#include <dig/dig.h>
+#include "dighost.h"
 
 #if USE_PKCS11
 #include <pk11/result.h>
@@ -281,7 +281,7 @@ hex_dump(isc_buffer_t *b) {
 	for (len = 0; len < r.length; len++) {
 		printf("%02x ", r.base[len]);
 		if (len % 16 == 15) {
-			fputs("         ", stdout);
+			printf("         ");
 			for (i = len - 15; i <= len; i++) {
 				if (r.base[i] >= '!' && r.base[i] <= '}') {
 					putchar(r.base[i]);
@@ -294,9 +294,9 @@ hex_dump(isc_buffer_t *b) {
 	}
 	if (len % 16 != 0) {
 		for (i = len; (i % 16) != 0; i++) {
-			fputs("   ", stdout);
+			printf("   ");
 		}
-		fputs("         ", stdout);
+		printf("         ");
 		for (i = ((len >> 4) << 4); i < len; i++) {
 			if (r.base[i] >= '!' && r.base[i] <= '}') {
 				putchar(r.base[i]);
@@ -677,6 +677,8 @@ make_empty_lookup(void) {
 	looknew->tcflag = false;
 	looknew->print_unknown_format = false;
 	looknew->zflag = false;
+	looknew->setqid = false;
+	looknew->qid = 0;
 	looknew->ns_search_only = false;
 	looknew->origin = NULL;
 	looknew->tsigctx = NULL;
@@ -820,6 +822,8 @@ clone_lookup(dig_lookup_t *lookold, bool servers) {
 	looknew->tcflag = lookold->tcflag;
 	looknew->print_unknown_format = lookold->print_unknown_format;
 	looknew->zflag = lookold->zflag;
+	looknew->setqid = lookold->setqid;
+	looknew->qid = lookold->qid;
 	looknew->ns_search_only = lookold->ns_search_only;
 	looknew->tcp_mode = lookold->tcp_mode;
 	looknew->tcp_mode_set = lookold->tcp_mode_set;
@@ -1490,6 +1494,7 @@ save_opt(dig_lookup_t *lookup, char *code, char *value) {
 	if (lookup->ednsopts == NULL) {
 		cloneopts(lookup, NULL);
 	}
+	INSIST(lookup->ednsopts != NULL);
 
 	if (lookup->ednsopts[lookup->ednsoptscnt].value != NULL) {
 		isc_mem_free(mctx, lookup->ednsopts[lookup->ednsoptscnt].value);
@@ -2298,6 +2303,11 @@ setup_lookup(dig_lookup_t *lookup) {
 		lookup->sendmsg->flags |= 0x0040U;
 	}
 
+	if (lookup->setqid) {
+		debug("set QID");
+		lookup->sendmsg->id = lookup->qid;
+	}
+
 	dns_message_addname(lookup->sendmsg, lookup->name,
 			    DNS_SECTION_QUESTION);
 
@@ -3059,7 +3069,7 @@ connect_timeout(isc_task_t *task, isc_event_t *event) {
 
 			dighost_error("no response from %s\n", buf);
 		} else {
-			fputs(l->cmdline, stdout);
+			printf("%s", l->cmdline);
 			dighost_error("connection timed out; "
 				      "no servers could be reached\n");
 		}

bin/dig/dighost.h

@@ -17,6 +17,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
+#include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/bufferlist.h>
 #include <isc/formatcheck.h>
@@ -59,6 +60,8 @@
 #define MAXPORT 0xffff
 /*% Max serial number */
 #define MAXSERIAL 0xffffffff
+/*% Max query ID */
+#define MAXQID 0xffff
 
 /*% Default TCP Timeout */
 #define TCP_TIMEOUT 10
@@ -77,7 +80,7 @@
 ISC_LANG_BEGINDECLS
 
 typedef struct dig_lookup dig_lookup_t;
-typedef struct dig_query  dig_query_t;
+typedef struct dig_query dig_query_t;
 typedef struct dig_server dig_server_t;
 typedef ISC_LIST(dig_server_t) dig_serverlist_t;
 typedef struct dig_searchlist dig_searchlist_t;
@@ -107,81 +110,83 @@ struct dig_lookup {
 		tcp_keepalive, header_only, ednsneg, mapped,
 		print_unknown_format, multiline, nottl, noclass, onesoa,
 		use_usec, nocrypto, ttlunits, idnin, idnout, expandaaaa, qr,
-		accept_reply_unexpected_src; /*%  print replies from
+		accept_reply_unexpected_src, /*%  print replies from
 					      * unexpected
 					      *   sources. */
+		setqid;			     /*% use a speciied query ID */
 	char textname[MXNAME];		     /*% Name we're going to be
 					      * looking up */
-	char		 cmdline[MXNAME];
-	dns_rdatatype_t	 rdtype;
-	dns_rdatatype_t	 qrdtype;
+	char cmdline[MXNAME];
+	dns_rdatatype_t rdtype;
+	dns_rdatatype_t qrdtype;
 	dns_rdataclass_t rdclass;
-	bool		 rdtypeset;
-	bool		 rdclassset;
-	char		 name_space[BUFSIZE];
-	char		 oname_space[BUFSIZE];
-	isc_buffer_t	 namebuf;
-	isc_buffer_t	 onamebuf;
-	isc_buffer_t	 renderbuf;
-	char *		 sendspace;
-	dns_name_t *	 name;
-	isc_interval_t	 interval;
-	dns_message_t *	 sendmsg;
-	dns_name_t *	 oname;
+	bool rdtypeset;
+	bool rdclassset;
+	char name_space[BUFSIZE];
+	char oname_space[BUFSIZE];
+	isc_buffer_t namebuf;
+	isc_buffer_t onamebuf;
+	isc_buffer_t renderbuf;
+	char *sendspace;
+	dns_name_t *name;
+	isc_interval_t interval;
+	dns_message_t *sendmsg;
+	dns_name_t *oname;
 	ISC_LINK(dig_lookup_t) link;
 	ISC_LIST(dig_query_t) q;
 	ISC_LIST(dig_query_t) connecting;
-	dig_query_t *	  current_query;
-	dig_serverlist_t  my_server_list;
+	dig_query_t *current_query;
+	dig_serverlist_t my_server_list;
 	dig_searchlist_t *origin;
-	dig_query_t *	  xfr_q;
-	uint32_t	  retries;
-	int		  nsfound;
-	uint16_t	  udpsize;
-	int16_t		  edns;
-	int16_t		  padding;
-	uint32_t	  ixfr_serial;
-	isc_buffer_t	  rdatabuf;
-	char		  rdatastore[MXNAME];
-	dst_context_t *	  tsigctx;
-	isc_buffer_t *	  querysig;
-	uint32_t	  msgcounter;
-	dns_fixedname_t	  fdomain;
-	isc_sockaddr_t *  ecs_addr;
-	char *		  cookie;
-	dns_ednsopt_t *	  ednsopts;
-	unsigned int	  ednsoptscnt;
-	isc_dscp_t	  dscp;
-	unsigned int	  ednsflags;
-	dns_opcode_t	  opcode;
-	int		  rrcomments;
-	unsigned int	  eoferr;
+	dig_query_t *xfr_q;
+	uint32_t retries;
+	int nsfound;
+	uint16_t udpsize;
+	int16_t edns;
+	int16_t padding;
+	uint32_t ixfr_serial;
+	isc_buffer_t rdatabuf;
+	char rdatastore[MXNAME];
+	dst_context_t *tsigctx;
+	isc_buffer_t *querysig;
+	uint32_t msgcounter;
+	dns_fixedname_t fdomain;
+	isc_sockaddr_t *ecs_addr;
+	char *cookie;
+	dns_ednsopt_t *ednsopts;
+	unsigned int ednsoptscnt;
+	isc_dscp_t dscp;
+	unsigned int ednsflags;
+	dns_opcode_t opcode;
+	int rrcomments;
+	unsigned int eoferr;
+	uint16_t qid;
 };
 
 /*% The dig_query structure */
 struct dig_query {
-	unsigned int  magic;
+	unsigned int magic;
 	dig_lookup_t *lookup;
 	bool waiting_connect, pending_free, waiting_senddone, first_pass,
 		first_soa_rcvd, second_rr_rcvd, first_repeat_rcvd, recv_made,
 		warn_id, timedout;
-	uint32_t      first_rr_serial;
-	uint32_t      second_rr_serial;
-	uint32_t      msg_count;
-	uint32_t      rr_count;
-	bool	      ixfr_axfr;
-	char *	      servname;
-	char *	      userarg;
-	isc_buffer_t  recvbuf, lengthbuf, tmpsendbuf, sendbuf;
-	char *	      recvspace, *tmpsendspace, lengthspace[4];
+	uint32_t first_rr_serial;
+	uint32_t second_rr_serial;
+	uint32_t msg_count;
+	uint32_t rr_count;
+	bool ixfr_axfr;
+	char *servname;
+	char *userarg;
+	isc_buffer_t recvbuf, lengthbuf, tmpsendbuf, sendbuf;
+	char *recvspace, *tmpsendspace, lengthspace[4];
 	isc_socket_t *sock;
 	ISC_LINK(dig_query_t) link;
 	ISC_LINK(dig_query_t) clink;
 	isc_sockaddr_t sockaddr;
-	isc_time_t     time_sent;
-	isc_time_t     time_recv;
-	uint64_t       byte_count;
-	isc_timer_t *  timer;
+	isc_time_t time_sent;
+	isc_time_t time_recv;
+	uint64_t byte_count;
+	isc_timer_t *timer;
 };
 
 struct dig_server {
@@ -202,38 +207,38 @@ typedef ISC_LIST(dig_lookup_t) dig_lookuplist_t;
  * Externals from dighost.c
  */
 
-extern dig_lookuplist_t	    lookup_list;
-extern dig_serverlist_t	    server_list;
+extern dig_lookuplist_t lookup_list;
+extern dig_serverlist_t server_list;
 extern dig_searchlistlist_t search_list;
-extern unsigned int	    extrabytes;
+extern unsigned int extrabytes;
 
 extern bool check_ra, have_ipv4, have_ipv6, specified_source, usesearch,
 	showsearch, yaml;
-extern in_port_t	 port;
-extern unsigned int	 timeout;
-extern isc_mem_t *	 mctx;
-extern int		 sendcount;
-extern int		 ndots;
-extern int		 lookup_counter;
-extern int		 exitcode;
-extern isc_sockaddr_t	 bind_address;
-extern char		 keynametext[MXNAME];
-extern char		 keyfile[MXNAME];
-extern char		 keysecret[MXNAME];
+extern in_port_t port;
+extern unsigned int timeout;
+extern isc_mem_t *mctx;
+extern int sendcount;
+extern int ndots;
+extern int lookup_counter;
+extern int exitcode;
+extern isc_sockaddr_t bind_address;
+extern char keynametext[MXNAME];
+extern char keyfile[MXNAME];
+extern char keysecret[MXNAME];
 extern const dns_name_t *hmacname;
-extern unsigned int	 digestbits;
-extern dns_tsigkey_t *	 tsigkey;
-extern bool		 validated;
-extern isc_taskmgr_t *	 taskmgr;
-extern isc_task_t *	 global_task;
-extern bool		 free_now;
-extern bool		 debugging, debugtiming, memdebugging;
-extern bool		 keep_open;
+extern unsigned int digestbits;
+extern dns_tsigkey_t *tsigkey;
+extern bool validated;
+extern isc_taskmgr_t *taskmgr;
+extern isc_task_t *global_task;
+extern bool free_now;
+extern bool debugging, debugtiming, memdebugging;
+extern bool keep_open;
 
 extern char *progname;
-extern int   tries;
-extern int   fatalexit;
-extern bool  verbose;
+extern int tries;
+extern int fatalexit;
+extern bool verbose;
 
 /*
  * Routines in dighost.c.
@@ -247,15 +252,14 @@ getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp);
 isc_result_t
 get_reverse(char *reverse, size_t len, char *value, bool strict);
 
-ISC_PLATFORM_NORETURN_PRE void
-fatal(const char *format, ...)
-	ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN void
+fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
 
 void
 warn(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
 
-ISC_PLATFORM_NORETURN_PRE void
-digexit(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN void
+digexit(void);
 
 void
 debug(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
@@ -333,7 +337,7 @@ set_search_domain(char *domain);
  * Routines to be defined in dig.c, host.c, and nslookup.c. and
  * then assigned to the appropriate function pointer
  */
-extern isc_result_t (*dighost_printmessage)(dig_query_t *	query,
+extern isc_result_t (*dighost_printmessage)(dig_query_t *query,
 					    const isc_buffer_t *msgbuf,
 					    dns_message_t *msg, bool headers);
 

bin/dig/host.c

@@ -21,6 +21,7 @@
 #endif /* ifdef HAVE_LOCALE_H */
 
 #include <isc/app.h>
+#include <isc/attributes.h>
 #include <isc/commandline.h>
 #include <isc/netaddr.h>
 #include <isc/print.h>
@@ -38,7 +39,7 @@
 #include <dns/rdatastruct.h>
 #include <dns/rdatatype.h>
 
-#include <dig/dig.h>
+#include "dighost.h"
 
 static bool short_form = true, listed_server = false;
 static bool default_lookups = true;
@@ -101,37 +102,39 @@ rcode_totext(dns_rcode_t rcode) {
 	return (totext.deconsttext);
 }
 
-ISC_PLATFORM_NORETURN_PRE static void
-show_usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+show_usage(void);
 
 static void
 show_usage(void) {
-	fputs("Usage: host [-aCdilrTvVw] [-c class] [-N ndots] [-t type] [-W "
-	      "time]\n"
-	      "            [-R number] [-m flag] [-p port] hostname [server]\n"
-	      "       -a is equivalent to -v -t ANY\n"
-	      "       -A is like -a but omits RRSIG, NSEC, NSEC3\n"
-	      "       -c specifies query class for non-IN data\n"
-	      "       -C compares SOA records on authoritative nameservers\n"
-	      "       -d is equivalent to -v\n"
-	      "       -l lists all hosts in a domain, using AXFR\n"
-	      "       -m set memory debugging flag (trace|record|usage)\n"
-	      "       -N changes the number of dots allowed before root lookup "
-	      "is done\n"
-	      "       -p specifies the port on the server to query\n"
-	      "       -r disables recursive processing\n"
-	      "       -R specifies number of retries for UDP packets\n"
-	      "       -s a SERVFAIL response should stop query\n"
-	      "       -t specifies the query type\n"
-	      "       -T enables TCP/IP mode\n"
-	      "       -U enables UDP mode\n"
-	      "       -v enables verbose output\n"
-	      "       -V print version number and exit\n"
-	      "       -w specifies to wait forever for a reply\n"
-	      "       -W specifies how long to wait for a reply\n"
-	      "       -4 use IPv4 query transport only\n"
-	      "       -6 use IPv6 query transport only\n",
-	      stderr);
+	fprintf(stderr,
+		"Usage: host [-aCdilrTvVw] [-c class] [-N ndots] [-t type] [-W "
+		"time]\n"
+		"            [-R number] [-m flag] [-p port] hostname "
+		"[server]\n"
+		"       -a is equivalent to -v -t ANY\n"
+		"       -A is like -a but omits RRSIG, NSEC, NSEC3\n"
+		"       -c specifies query class for non-IN data\n"
+		"       -C compares SOA records on authoritative nameservers\n"
+		"       -d is equivalent to -v\n"
+		"       -l lists all hosts in a domain, using AXFR\n"
+		"       -m set memory debugging flag (trace|record|usage)\n"
+		"       -N changes the number of dots allowed before root "
+		"lookup "
+		"is done\n"
+		"       -p specifies the port on the server to query\n"
+		"       -r disables recursive processing\n"
+		"       -R specifies number of retries for UDP packets\n"
+		"       -s a SERVFAIL response should stop query\n"
+		"       -t specifies the query type\n"
+		"       -T enables TCP/IP mode\n"
+		"       -U enables UDP mode\n"
+		"       -v enables verbose output\n"
+		"       -V print version number and exit\n"
+		"       -w specifies to wait forever for a reply\n"
+		"       -W specifies how long to wait for a reply\n"
+		"       -4 use IPv4 query transport only\n"
+		"       -6 use IPv6 query transport only\n");
 	exit(1);
 }
 
@@ -581,7 +584,7 @@ static const char *optstring = "46aAc:dilnm:p:rst:vVwCDN:R:TUW:";
 /*% version */
 static void
 version(void) {
-	fputs("host " VERSION "\n", stderr);
+	fprintf(stderr, "host %s\n", PACKAGE_VERSION);
 }
 
 static void

bin/dig/host.rst

@@ -36,12 +36,12 @@ Description
 
 ``host`` is a simple utility for performing DNS lookups. It is normally
 used to convert names to IP addresses and vice versa. When no arguments
-or options are given, ``host`` prints a short summary of its command
-line arguments and options.
+or options are given, ``host`` prints a short summary of its
+command-line arguments and options.
 
 ``name`` is the domain name that is to be looked up. It can also be a
 dotted-decimal IPv4 address or a colon-delimited IPv6 address, in which
-case ``host`` will by default perform a reverse lookup for that address.
+case ``host`` by default performs a reverse lookup for that address.
 ``server`` is an optional argument which is either the name or IP
 address of the name server that ``host`` should query instead of the
 server or servers listed in ``/etc/resolv.conf``.
@@ -49,111 +49,111 @@ server or servers listed in ``/etc/resolv.conf``.
 Options
 ~~~~~~~
 
-**-4**
-   Use IPv4 only for query transport. See also the ``-6`` option.
+``-4``
+   This option specifies that only IPv4 should be used for query transport. See also the ``-6`` option.
 
-**-6**
-   Use IPv6 only for query transport. See also the ``-4`` option.
+``-6``
+   This option specifies that only IPv6 should be used for query transport. See also the ``-4`` option.
 
-**-a**
-   "All". The ``-a`` option is normally equivalent to ``-v -t ANY``. It
-   also affects the behaviour of the ``-l`` list zone option.
+``-a``
+   The ``-a`` ("all") option is normally equivalent to ``-v -t ANY``. It
+   also affects the behavior of the ``-l`` list zone option.
 
-**-A**
-   "Almost all". The ``-A`` option is equivalent to ``-a`` except RRSIG,
+``-A``
+   The ``-A`` ("almost all") option is equivalent to ``-a``, except that RRSIG,
    NSEC, and NSEC3 records are omitted from the output.
 
-**-c** class
-   Query class: This can be used to lookup HS (Hesiod) or CH (Chaosnet)
+``-c class``
+   This option specifies the query class, which can be used to lookup HS (Hesiod) or CH (Chaosnet)
    class resource records. The default class is IN (Internet).
 
-**-C**
-   Check consistency: ``host`` will query the SOA records for zone
+``-C``
+   This option indicates that ``named`` should check consistency, meaning that ``host`` queries the SOA records for zone
    ``name`` from all the listed authoritative name servers for that
    zone. The list of name servers is defined by the NS records that are
    found for the zone.
 
-**-d**
-   Print debugging traces. Equivalent to the ``-v`` verbose option.
+``-d``
+   This option prints debugging traces, and is equivalent to the ``-v`` verbose option.
 
-**-l**
-   List zone: The ``host`` command performs a zone transfer of zone
-   ``name`` and prints out the NS, PTR and address records (A/AAAA).
+``-l``
+   This option tells ``named` to list the zone, meaning the ``host`` command performs a zone transfer of zone
+   ``name`` and prints out the NS, PTR, and address records (A/AAAA).
 
    Together, the ``-l -a`` options print all records in the zone.
 
-**-N** ndots
-   The number of dots that have to be in ``name`` for it to be
+``-N ndots``
+   This option specifies the number of dots (``ndots``) that have to be in ``name`` for it to be
    considered absolute. The default value is that defined using the
-   ndots statement in ``/etc/resolv.conf``, or 1 if no ndots statement
-   is present. Names with fewer dots are interpreted as relative names
-   and will be searched for in the domains listed in the ``search`` or
+   ``ndots`` statement in ``/etc/resolv.conf``, or 1 if no ``ndots`` statement
+   is present. Names with fewer dots are interpreted as relative names,
+   and are searched for in the domains listed in the ``search`` or
    ``domain`` directive in ``/etc/resolv.conf``.
 
-**-p** port
-   Specify the port on the server to query. The default is 53.
+``-p port``
+   This option specifies the port to query on the server. The default is 53.
 
-**-r**
-   Non-recursive query: Setting this option clears the RD (recursion
-   desired) bit in the query. This should mean that the name server
-   receiving the query will not attempt to resolve ``name``. The ``-r``
+``-r``
+   This option specifies a non-recursive query; setting this option clears the RD (recursion
+   desired) bit in the query. This means that the name server
+   receiving the query does not attempt to resolve ``name``. The ``-r``
    option enables ``host`` to mimic the behavior of a name server by
-   making non-recursive queries and expecting to receive answers to
+   making non-recursive queries, and expecting to receive answers to
    those queries that can be referrals to other name servers.
 
-**-R** number
-   Number of retries for UDP queries: If ``number`` is negative or zero,
-   the number of retries will default to 1. The default value is 1, or
+``-R number``
+   This option specifies the number of retries for UDP queries. If ``number`` is negative or zero,
+   the number of retries is silently set to 1. The default value is 1, or
    the value of the ``attempts`` option in ``/etc/resolv.conf``, if set.
 
-**-s**
-   Do *not* send the query to the next nameserver if any server responds
+``-s``
+   This option tells ``named`` *not* to send the query to the next nameserver if any server responds
    with a SERVFAIL response, which is the reverse of normal stub
    resolver behavior.
 
-**-t** type
-   Query type: The ``type`` argument can be any recognized query type:
+``-t type``
+   This option specifies the query type. The ``type`` argument can be any recognized query type:
    CNAME, NS, SOA, TXT, DNSKEY, AXFR, etc.
 
    When no query type is specified, ``host`` automatically selects an
    appropriate query type. By default, it looks for A, AAAA, and MX
-   records. If the ``-C`` option is given, queries will be made for SOA
+   records. If the ``-C`` option is given, queries are made for SOA
    records. If ``name`` is a dotted-decimal IPv4 address or
-   colon-delimited IPv6 address, ``host`` will query for PTR records.
+   colon-delimited IPv6 address, ``host`` queries for PTR records.
 
-   If a query type of IXFR is chosen the starting serial number can be
-   specified by appending an equal followed by the starting serial
-   number (like ``-t IXFR=12345678``).
+   If a query type of IXFR is chosen, the starting serial number can be
+   specified by appending an equals sign (=), followed by the starting serial
+   number, e.g., ``-t IXFR=12345678``.
 
-**-T**; **-U**
-   TCP/UDP: By default, ``host`` uses UDP when making queries. The
+``-T``; ``-U``
+   This option specifies TCP or UDP. By default, ``host`` uses UDP when making queries; the
    ``-T`` option makes it use a TCP connection when querying the name
-   server. TCP will be automatically selected for queries that require
-   it, such as zone transfer (AXFR) requests. Type ANY queries default
-   to TCP but can be forced to UDP initially using ``-U``.
+   server. TCP is automatically selected for queries that require
+   it, such as zone transfer (AXFR) requests. Type ``ANY`` queries default
+   to TCP, but can be forced to use UDP initially via ``-U``.
 
-**-m** flag
-   Memory usage debugging: the flag can be ``record``, ``usage``, or
-   ``trace``. You can specify the ``-m`` option more than once to set
+``-m flag``
+   This option sets memory usage debugging: the flag can be ``record``, ``usage``, or
+   ``trace``. The ``-m`` option can be specified more than once to set
    multiple flags.
 
-**-v**
-   Verbose output. Equivalent to the ``-d`` debug option. Verbose output
+``-v``
+   This option sets verbose output, and is equivalent to the ``-d`` debug option. Verbose output
    can also be enabled by setting the ``debug`` option in
    ``/etc/resolv.conf``.
 
-**-V**
-   Print the version number and exit.
+``-V``
+   This option prints the version number and exits.
 
-**-w**
-   Wait forever: The query timeout is set to the maximum possible. See
+``-w``
+   This option sets "wait forever": the query timeout is set to the maximum possible. See
    also the ``-W`` option.
 
-**-W** wait
-   Timeout: Wait for up to ``wait`` seconds for a reply. If ``wait`` is
-   less than one, the wait interval is set to one second.
+``-W wait``
+   This options sets the length of the wait timeout, indicating that ``named`` should wait for up to ``wait`` seconds for a reply. If ``wait`` is
+   less than 1, the wait interval is set to 1 second.
 
-   By default, ``host`` will wait for 5 seconds for UDP responses and 10
+   By default, ``host`` waits for 5 seconds for UDP responses and 10
    seconds for TCP connections. These defaults can be overridden by the
    ``timeout`` option in ``/etc/resolv.conf``.
 
@@ -164,10 +164,10 @@ IDN Support
 
 If ``host`` has been built with IDN (internationalized domain name)
 support, it can accept and display non-ASCII domain names. ``host``
-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, define the IDN_DISABLE
-environment variable. The IDN support is disabled if the variable is set
+appropriately converts character encoding of a domain name before sending
+a request to a DNS server or displaying a reply from the server.
+To turn off IDN support, define the ``IDN_DISABLE``
+environment variable. IDN support is disabled if the variable is set
 when ``host`` runs.
 
 Files

bin/dig/nslookup.c

@@ -15,6 +15,7 @@
 #include <unistd.h>
 
 #include <isc/app.h>
+#include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/event.h>
@@ -35,7 +36,7 @@
 #include <dns/rdatastruct.h>
 #include <dns/rdatatype.h>
 
-#include <dig/dig.h>
+#include "dighost.h"
 
 #if defined(HAVE_READLINE)
 #if defined(HAVE_EDIT_READLINE_READLINE_H)
@@ -629,7 +630,7 @@ set_ndots(const char *value) {
 
 static void
 version(void) {
-	fputs("nslookup " VERSION "\n", stderr);
+	fprintf(stderr, "nslookup %s\n", PACKAGE_VERSION);
 }
 
 static void
@@ -787,6 +788,8 @@ addlookup(char *opt) {
 	lookup->aaonly = aaonly;
 	lookup->retries = tries;
 	lookup->udpsize = 0;
+	lookup->setqid = false;
+	lookup->qid = 0;
 	lookup->comments = comments;
 	if (lookup->rdtype == dns_rdatatype_any && !tcpmode_set) {
 		lookup->tcp_mode = true;
@@ -858,7 +861,7 @@ get_next_command(void) {
 			add_history(ptr);
 		}
 #else  /* ifdef HAVE_READLINE */
-		fputs("> ", stderr);
+		fprintf(stderr, "> ");
 		fflush(stderr);
 		ptr = fgets(buf, COMMSIZE, stdin);
 #endif /* ifdef HAVE_READLINE */
@@ -879,8 +882,8 @@ get_next_command(void) {
 	isc_mem_free(mctx, buf);
 }
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {

bin/dig/nslookup.rst

@@ -34,11 +34,11 @@ Synopsis
 Description
 ~~~~~~~~~~~
 
-``Nslookup`` is a program to query Internet domain name servers.
-``Nslookup`` has two modes: interactive and non-interactive. Interactive
+``nslookup`` is a program to query Internet domain name servers.
+``nslookup`` has two modes: interactive and non-interactive. Interactive
 mode allows the user to query name servers for information about various
 hosts and domains or to print a list of hosts in a domain.
-Non-interactive mode is used to print just the name and requested
+Non-interactive mode prints just the name and requested
 information for a host or domain.
 
 Arguments
@@ -46,7 +46,7 @@ Arguments
 
 Interactive mode is entered in the following cases:
 
-a. when no arguments are given (the default name server will be used)
+a. when no arguments are given (the default name server is used);
 
 b. when the first argument is a hyphen (-) and the second argument is
    the host name or Internet address of a name server.
@@ -57,7 +57,7 @@ argument specifies the host name or address of a name server.
 
 Options can also be specified on the command line if they precede the
 arguments and are prefixed with a hyphen. For example, to change the
-default query type to host information, and the initial timeout to 10
+default query type to host information, with an initial timeout of 10
 seconds, type:
 
 ::
@@ -65,59 +65,59 @@ seconds, type:
    nslookup -query=hinfo  -timeout=10
 
 The ``-version`` option causes ``nslookup`` to print the version number
-and immediately exits.
+and immediately exit.
 
 Interactive Commands
 ~~~~~~~~~~~~~~~~~~~~
 
-``host`` [server]
-   Look up information for host using the current default server or
-   using server, if specified. If host is an Internet address and the
-   query type is A or PTR, the name of the host is returned. If host is
-   a name and does not have a trailing period, the search list is used
+``host [server]``
+   This command looks up information for ``host`` using the current default server or
+   using ``server``, if specified. If ``host`` is an Internet address and the
+   query type is A or PTR, the name of the host is returned. If ``host`` is
+   a name and does not have a trailing period (``.``), the search list is used
    to qualify the name.
 
    To look up a host not in the current domain, append a period to the
    name.
 
-``server`` domain | ``lserver`` domain
-   Change the default server to domain; ``lserver`` uses the initial
-   server to look up information about domain, while ``server`` uses the
-   current default server. If an authoritative answer can't be found,
+``server domain`` | ``lserver domain``
+   These commands change the default server to ``domain``; ``lserver`` uses the initial
+   server to look up information about ``domain``, while ``server`` uses the
+   current default server. If an authoritative answer cannot be found,
    the names of servers that might have the answer are returned.
 
 ``root``
-   not implemented
+   This command is not implemented.
 
 ``finger``
-   not implemented
+   This command is not implemented.
 
 ``ls``
-   not implemented
+   This command is not implemented.
 
 ``view``
-   not implemented
+   This command is not implemented.
 
 ``help``
-   not implemented
+   This command is not implemented.
 
 ``?``
-   not implemented
+   This command is not implemented.
 
 ``exit``
-   Exits the program.
+   This command exits the program.
 
-``set`` keyword[=value]
+``set keyword[=value]``
    This command is used to change state information that affects the
    lookups. Valid keywords are:
 
    ``all``
-      Prints the current values of the frequently used options to
+      This keyword prints the current values of the frequently used options to
       ``set``. Information about the current default server and host is
       also printed.
 
-   ``class=``\ value
-      Change the query class to one of:
+   ``class=value``
+      This keyword changes the query class to one of:
 
       ``IN``
          the Internet class
@@ -131,72 +131,62 @@ Interactive Commands
       ``ANY``
          wildcard
 
-      The class specifies the protocol group of the information.
-
-      (Default = IN; abbreviation = cl)
+      The class specifies the protocol group of the information. The default
+      is ``IN``; the abbreviation for this keyword is ``cl``.
 
    ``nodebug``
-      Turn on or off the display of the full response packet and any
-      intermediate response packets when searching.
-
-      (Default = nodebug; abbreviation = [no]deb)
+      This keyword turns on or off the display of the full response packet, and any
+      intermediate response packets, when searching. The default for this keyword is
+      ``nodebug``; the abbreviation for this keyword is ``[no]deb``.
 
    ``nod2``
-      Turn debugging mode on or off. This displays more about what
-      nslookup is doing.
+      This keyword turns debugging mode on or off. This displays more about what
+      nslookup is doing. The default is ``nod2``.
 
-      (Default = nod2)
-
-   ``domain=``\ name
-      Sets the search list to name.
+   ``domain=name``
+      This keyword sets the search list to ``name``.
 
    ``nosearch``
-      If the lookup request contains at least one period but doesn't end
-      with a trailing period, append the domain names in the domain
-      search list to the request until an answer is received.
+      If the lookup request contains at least one period, but does not end
+      with a trailing period, this keyword appends the domain names in the domain
+      search list to the request until an answer is received. The default is ``search``.
 
-      (Default = search)
+   ``port=value``
+      This keyword changes the default TCP/UDP name server port to ``value`` from
+      its default, port 53. The abbreviation for this keyword is ``po``.
 
-   ``port=``\ value
-      Change the default TCP/UDP name server port to value.
+   ``querytype=value`` | ``type=value``
+      This keyword changes the type of the information query to ``value``. The
+      defaults are A and then AAAA; the abbreviations for these keywords are
+      ``q`` and ``ty``.
 
-      (Default = 53; abbreviation = po)
-
-   ``querytype=``\ value | ``type=``\ value
-      Change the type of the information query.
-
-      (Default = A and then AAAA; abbreviations = q, ty)
-
-      **Note:** It is only possible to specify one query type, only the default
-        behavior looks up both when an alternative is not specified.
+      Please note that it is only possible to specify one query type. Only the default
+      behavior looks up both when an alternative is not specified.
 
    ``norecurse``
-      Tell the name server to query other servers if it does not have
-      the information.
+      This keyword tells the name server to query other servers if it does not have
+      the information. The default is ``recurse``; the abbreviation for this
+      keyword is ``[no]rec``.
 
-      (Default = recurse; abbreviation = [no]rec)
+   ``ndots=number``
+      This keyword sets the number of dots (label separators) in a domain that
+      disables searching. Absolute names always stop searching.
 
-   ``ndots=``\ number
-      Set the number of dots (label separators) in a domain that will
-      disable searching. Absolute names always stop searching.
+   ``retry=number``
+      This keyword sets the number of retries to ``number``.
 
-   ``retry=``\ number
-      Set the number of retries to number.
-
-   ``timeout=``\ number
-      Change the initial timeout interval for waiting for a reply to
-      number seconds.
+   ``timeout=number``
+      This keyword changes the initial timeout interval to wait for a reply to
+      ``number``, in seconds.
 
    ``novc``
-      Always use a virtual circuit when sending requests to the server.
-
-      (Default = novc)
+      This keyword indicates that a virtual circuit should always be used when sending requests to the server.
+      ``novc`` is the default.
 
    ``nofail``
-      Try the next nameserver if a nameserver responds with SERVFAIL or
-      a referral (nofail) or terminate query (fail) on such a response.
-
-      (Default = nofail)
+      This keyword tries the next nameserver if a nameserver responds with SERVFAIL or
+      a referral (nofail), or terminates the query (fail) on such a response. The
+      default is ``nofail``.
 
 Return Values
 ~~~~~~~~~~~~~
@@ -209,11 +199,11 @@ IDN Support
 
 If ``nslookup`` has been built with IDN (internationalized domain name)
 support, it can accept and display non-ASCII domain names. ``nslookup``
-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, define the IDN_DISABLE
-environment variable. The IDN support is disabled if the variable is set
-when ``nslookup`` runs or when the standard output is not a tty.
+appropriately converts character encoding of a domain name before sending
+a request to a DNS server or displaying a reply from the server.
+To turn off IDN support, define the ``IDN_DISABLE``
+environment variable. IDN support is disabled if the variable is set
+when ``nslookup`` runs, or when the standard output is not a tty.
 
 Files
 ~~~~~

bin/dig/win32/dig.vcxproj.in

@@ -116,6 +116,26 @@
   <ItemGroup>
     <ClCompile Include="..\dig.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\isccfg\win32\libisccfg.vcxproj">
+      <Project>{B2DFA58C-6347-478E-81E8-01E06999D4F1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\irs\win32\libirs.vcxproj">
+      <Project>{A4F29CEB-7644-4A7F-BE9E-02B6A90E4919}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\bind9\win32\libbind9.vcxproj">
+      <Project>{E741C10B-B075-4206-9596-46765B665E03}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\dig\win32\dighost.vcxproj">
+      <Project>{140DE800-E552-43CC-B0C7-A33A92E368CA}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/dig/win32/dighost.vcxproj.in

@@ -109,6 +109,23 @@
   <ItemGroup>
     <ClCompile Include="..\dighost.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\isccfg\win32\libisccfg.vcxproj">
+      <Project>{B2DFA58C-6347-478E-81E8-01E06999D4F1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\irs\win32\libirs.vcxproj">
+      <Project>{A4F29CEB-7644-4A7F-BE9E-02B6A90E4919}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\bind9\win32\libbind9.vcxproj">
+      <Project>{E741C10B-B075-4206-9596-46765B665E03}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/dig/win32/host.vcxproj.in

@@ -113,6 +113,26 @@
   <ItemGroup>
     <ClCompile Include="..\host.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\isccfg\win32\libisccfg.vcxproj">
+      <Project>{B2DFA58C-6347-478E-81E8-01E06999D4F1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\irs\win32\libirs.vcxproj">
+      <Project>{A4F29CEB-7644-4A7F-BE9E-02B6A90E4919}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\bind9\win32\libbind9.vcxproj">
+      <Project>{E741C10B-B075-4206-9596-46765B665E03}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\dig\win32\dighost.vcxproj">
+      <Project>{140DE800-E552-43CC-B0C7-A33A92E368CA}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/dig/win32/nslookup.vcxproj.in

@@ -114,6 +114,26 @@
     <ClCompile Include="..\dighost.c" />
     <ClCompile Include="..\nslookup.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\isccfg\win32\libisccfg.vcxproj">
+      <Project>{B2DFA58C-6347-478E-81E8-01E06999D4F1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\irs\win32\libirs.vcxproj">
+      <Project>{A4F29CEB-7644-4A7F-BE9E-02B6A90E4919}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\bind9\win32\libbind9.vcxproj">
+      <Project>{E741C10B-B075-4206-9596-46765B665E03}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\dig\win32\dighost.vcxproj">
+      <Project>{140DE800-E552-43CC-B0C7-A33A92E368CA}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/dnssec/Makefile.am

@@ -0,0 +1,38 @@
+include $(top_srcdir)/Makefile.top
+
+AM_CPPFLAGS +=			\
+	$(LIBISC_CFLAGS)	\
+	$(LIBDNS_CFLAGS)
+
+AM_CPPFLAGS +=						\
+	-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
+
+noinst_LTLIBRARIES = libdnssectool.la
+
+LDADD =				\
+	libdnssectool.la	\
+	$(LIBISC_LIBS)		\
+	$(LIBDNS_LIBS)
+
+bin_PROGRAMS = \
+	dnssec-cds		\
+	dnssec-dsfromkey	\
+	dnssec-importkey	\
+	dnssec-keyfromlabel	\
+	dnssec-keygen		\
+	dnssec-revoke		\
+	dnssec-settime		\
+	dnssec-signzone		\
+	dnssec-verify
+
+libdnssectool_la_SOURCES =	\
+	dnssectool.h		\
+	dnssectool.c
+
+dnssec_keygen_CPPFLAGS =	\
+	$(AM_CPPFLAGS)		\
+	$(LIBISCCFG_CFLAGS)
+
+dnssec_keygen_LDADD =		\
+	$(LDADD)		\
+	$(LIBISCCFG_LIBS)

bin/dnssec/Makefile.in

@@ -1,110 +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@
-
-VERSION=@BIND9_VERSION@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
-		${OPENSSL_CFLAGS}
-
-CDEFINES =	-DVERSION=\"${VERSION}\" -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
-CWARNINGS =
-
-DNSLIBS =	../../lib/dns/libdns.@A@ @NO_LIBTOOL_DNSLIBS@
-ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCLIBS =	../../lib/isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@
-ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @NO_LIBTOOL_ISCLIBS@
-
-DNSDEPLIBS =	../../lib/dns/libdns.@A@
-ISCDEPLIBS =	../../lib/isc/libisc.@A@
-ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
-
-DEPLIBS =	${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
-
-LIBS =		${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
-
-NOSYMLIBS =	${DNSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
-
-# Alphabetically
-TARGETS =	dnssec-cds@EXEEXT@ dnssec-dsfromkey@EXEEXT@ \
-		dnssec-importkey@EXEEXT@ dnssec-keyfromlabel@EXEEXT@ \
-		dnssec-keygen@EXEEXT@ dnssec-revoke@EXEEXT@ \
-		dnssec-settime@EXEEXT@ dnssec-signzone@EXEEXT@ \
-		dnssec-verify@EXEEXT@
-
-OBJS =		dnssectool.@O@
-
-SRCS =		dnssec-cds.c dnssec-dsfromkey.c dnssec-importkey.c \
-		dnssec-keyfromlabel.c dnssec-keygen.c dnssec-revoke.c \
-		dnssec-settime.c dnssec-signzone.c dnssec-verify.c \
-		dnssectool.c
-
-@BIND9_MAKE_RULES@
-
-dnssec-cds@EXEEXT@: dnssec-cds.@O@ ${OBJS} ${DEPLIBS}
-	export BASEOBJS="dnssec-cds.@O@ ${OBJS}"; \
-	${FINALBUILDCMD}
-
-dnssec-dsfromkey@EXEEXT@: dnssec-dsfromkey.@O@ ${OBJS} ${DEPLIBS}
-	export BASEOBJS="dnssec-dsfromkey.@O@ ${OBJS}"; \
-	${FINALBUILDCMD}
-
-dnssec-keyfromlabel@EXEEXT@: dnssec-keyfromlabel.@O@ ${OBJS} ${DEPLIBS}
-	export BASEOBJS="dnssec-keyfromlabel.@O@ ${OBJS}"; \
-	${FINALBUILDCMD}
-
-dnssec-keygen@EXEEXT@: dnssec-keygen.@O@ ${OBJS} ${DEPLIBS}
-	export BASEOBJS="dnssec-keygen.@O@ ${OBJS}"; \
-	${FINALBUILDCMD}
-
-dnssec-signzone.@O@: dnssec-signzone.c
-	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
-		-c ${srcdir}/dnssec-signzone.c
-
-dnssec-signzone@EXEEXT@: dnssec-signzone.@O@ ${OBJS} ${DEPLIBS}
-	export BASEOBJS="dnssec-signzone.@O@ ${OBJS}"; \
-	${FINALBUILDCMD}
-
-dnssec-verify.@O@: dnssec-verify.c
-	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
-		-c ${srcdir}/dnssec-verify.c
-
-dnssec-verify@EXEEXT@: dnssec-verify.@O@ ${OBJS} ${DEPLIBS}
-	export BASEOBJS="dnssec-verify.@O@ ${OBJS}"; \
-	${FINALBUILDCMD}
-
-dnssec-revoke@EXEEXT@: dnssec-revoke.@O@ ${OBJS} ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-	dnssec-revoke.@O@ ${OBJS} ${LIBS}
-
-dnssec-settime@EXEEXT@: dnssec-settime.@O@ ${OBJS} ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-	dnssec-settime.@O@ ${OBJS} ${LIBS}
-
-dnssec-importkey@EXEEXT@: dnssec-importkey.@O@ ${OBJS} ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-	dnssec-importkey.@O@ ${OBJS} ${LIBS}
-
-installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
-
-install:: ${TARGETS} installdirs
-	for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir} || exit 1; done
-
-uninstall::
-	for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t || exit 1; done
-
-clean distclean::
-	rm -f ${TARGETS}

bin/dnssec/dnssec-cds.c

@@ -21,6 +21,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/file.h>
@@ -1020,8 +1021,8 @@ nsdiff(uint32_t ttl, dns_rdataset_t *oldset, dns_rdataset_t *newset) {
 	}
 }
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
@@ -1029,7 +1030,7 @@ usage(void) {
 	fprintf(stderr,
 		"    %s options [options] -f <file> -d <path> <domain>\n",
 		program);
-	fprintf(stderr, "Version: %s\n", VERSION);
+	fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
 	fprintf(stderr, "Options:\n"
 			"    -a <algorithm>     digest algorithm (SHA-1 / "
 			"SHA-256 / SHA-384)\n"

bin/dnssec/dnssec-cds.rst

@@ -29,7 +29,7 @@ dnssec-cds - change DS records for a child zone based on CDS/CDNSKEY
 Synopsis
 ~~~~~~~~
 
-:program:`dnssec-cds` [**-a** alg...] [**-c** class] [**-D**] {**-d** dsset-file} {**-f** child-file} [**-i** [extension]] [**-s** start-time] [**-T** ttl] [**-u**] [**-v** level] [**-V**] {domain}
+:program:`dnssec-cds` [**-a** alg...] [**-c** class] [**-D**] {**-d** dsset-file} {**-f** child-file} [**-i**[extension]] [**-s** start-time] [**-T** ttl] [**-u**] [**-v** level] [**-V**] {domain}
 
 Description
 ~~~~~~~~~~~
@@ -38,8 +38,8 @@ The ``dnssec-cds`` command changes DS records at a delegation point
 based on CDS or CDNSKEY records published in the child zone. If both CDS
 and CDNSKEY records are present in the child zone, the CDS is preferred.
 This enables a child zone to inform its parent of upcoming changes to
-its key-signing keys; by polling periodically with ``dnssec-cds``, the
-parent can keep the DS records up to date and enable automatic rolling
+its key-signing keys (KSKs); by polling periodically with ``dnssec-cds``, the
+parent can keep the DS records up-to-date and enable automatic rolling
 of KSKs.
 
 Two input files are required. The ``-f child-file`` option specifies a
@@ -52,12 +52,12 @@ output of a previous run of ``dnssec-cds``.
 
 The ``dnssec-cds`` command uses special DNSSEC validation logic
 specified by :rfc:`7344`. It requires that the CDS and/or CDNSKEY records
-are validly signed by a key represented in the existing DS records. This
-will typically be the pre-existing key-signing key (KSK).
+be validly signed by a key represented in the existing DS records. This
+is typically the pre-existing KSK.
 
 For protection against replay attacks, the signatures on the child
 records must not be older than they were on a previous run of
-``dnssec-cds``. This time is obtained from the modification time of the
+``dnssec-cds``. Their age is obtained from the modification time of the
 ``dsset-`` file, or from the ``-s`` option.
 
 To protect against breaking the delegation, ``dnssec-cds`` ensures that
@@ -67,103 +67,104 @@ type.
 
 By default, replacement DS records are written to the standard output;
 with the ``-i`` option the input file is overwritten in place. The
-replacement DS records will be the same as the existing records when no
-change is required. The output can be empty if the CDS / CDNSKEY records
-specify that the child zone wants to go insecure.
+replacement DS records are the same as the existing records, when no
+change is required. The output can be empty if the CDS/CDNSKEY records
+specify that the child zone wants to be insecure.
 
-Warning: Be careful not to delete the DS records when ``dnssec-cds``
-fails!
+.. warning::
+
+   Be careful not to delete the DS records when ``dnssec-cds`` fails!
 
 Alternatively, ``dnssec-cds -u`` writes an ``nsupdate`` script to the
-standard output. You can use the ``-u`` and ``-i`` options together to
+standard output. The ``-u`` and ``-i`` options can be used together to
 maintain a ``dsset-`` file as well as emit an ``nsupdate`` script.
 
 Options
 ~~~~~~~
 
-**-a** algorithm
-   Specify a digest algorithm to use when converting CDNSKEY records to
+``-a algorithm``
+   This option specifies a digest algorithm to use when converting CDNSKEY records to
    DS records. This option can be repeated, so that multiple DS records
    are created for each CDNSKEY record. This option has no effect when
    using CDS records.
 
    The algorithm must be one of SHA-1, SHA-256, or SHA-384. These values
-   are case insensitive, and the hyphen may be omitted. If no algorithm
+   are case-insensitive, and the hyphen may be omitted. If no algorithm
    is specified, the default is SHA-256.
 
-**-c** class
-   Specifies the DNS class of the zones.
+``-c class``
+   This option specifies the DNS class of the zones.
 
-**-D**
-   Generate DS records from CDNSKEY records if both CDS and CDNSKEY
+``-D``
+   This option generates DS records from CDNSKEY records if both CDS and CDNSKEY
    records are present in the child zone. By default CDS records are
    preferred.
 
-**-d** path
-   Location of the parent DS records. The path can be the name of a file
-   containing the DS records, or if it is a directory, ``dnssec-cds``
+``-d path``
+   This specifies the location of the parent DS records. The path can be the name of a file
+   containing the DS records; if it is a directory, ``dnssec-cds``
    looks for a ``dsset-`` file for the domain inside the directory.
 
    To protect against replay attacks, child records are rejected if they
    were signed earlier than the modification time of the ``dsset-``
    file. This can be adjusted with the ``-s`` option.
 
-**-f** child-file
-   File containing the child's CDS and/or CDNSKEY records, plus its
-   DNSKEY records and the covering RRSIG records so that they can be
+``-f child-file``
+   This option specifies the file containing the child's CDS and/or CDNSKEY records, plus its
+   DNSKEY records and the covering RRSIG records, so that they can be
    authenticated.
 
-   The EXAMPLES below describe how to generate this file.
+   The examples below describe how to generate this file.
 
-**-iextension**
-   Update the ``dsset-`` file in place, instead of writing DS records to
+``-iextension``
+   This option updates the ``dsset-`` file in place, instead of writing DS records to
    the standard output.
 
-   There must be no space between the ``-i`` and the extension. If you
-   provide no extension then the old ``dsset-`` is discarded. If an
+   There must be no space between the ``-i`` and the extension. If
+   no extension is provided, the old ``dsset-`` is discarded. If an
    extension is present, a backup of the old ``dsset-`` file is kept
    with the extension appended to its filename.
 
    To protect against replay attacks, the modification time of the
    ``dsset-`` file is set to match the signature inception time of the
-   child records, provided that is later than the file's current
+   child records, provided that it is later than the file's current
    modification time.
 
-**-s** start-time
-   Specify the date and time after which RRSIG records become
-   acceptable. This can be either an absolute or relative time. An
+``-s start-time``
+   This option specifies the date and time after which RRSIG records become
+   acceptable. This can be either an absolute or a relative time. An
    absolute start time is indicated by a number in YYYYMMDDHHMMSS
    notation; 20170827133700 denotes 13:37:00 UTC on August 27th, 2017. A
-   time relative to the ``dsset-`` file is indicated with -N, which is N
+   time relative to the ``dsset-`` file is indicated with ``-N``, which is N
    seconds before the file modification time. A time relative to the
-   current time is indicated with now+N.
+   current time is indicated with ``now+N``.
 
    If no start-time is specified, the modification time of the
    ``dsset-`` file is used.
 
-**-T** ttl
-   Specifies a TTL to be used for new DS records. If not specified, the
-   default is the TTL of the old DS records. If they had no explicit TTL
-   then the new DS records also have no explicit TTL.
+``-T ttl``
+   This option specifies a TTL to be used for new DS records. If not specified, the
+   default is the TTL of the old DS records. If they had no explicit TTL,
+   the new DS records also have no explicit TTL.
 
-**-u**
-   Write an ``nsupdate`` script to the standard output, instead of
-   printing the new DS reords. The output will be empty if no change is
+``-u``
+   This option writes an ``nsupdate`` script to the standard output, instead of
+   printing the new DS reords. The output is empty if no change is
    needed.
 
-   Note: The TTL of new records needs to be specified, either in the
-   original ``dsset-`` file, or with the ``-T`` option, or using the
+   Note: The TTL of new records needs to be specified: it can be done in the
+   original ``dsset-`` file, with the ``-T`` option, or using the
    ``nsupdate`` ``ttl`` command.
 
-**-V**
-   Print version information.
+``-V``
+   This option prints version information.
 
-**-v** level
-   Sets the debugging level. Level 1 is intended to be usefully verbose
+``-v level``
+   This option sets the debugging level. Level 1 is intended to be usefully verbose
    for general users; higher levels are intended for developers.
 
-domain
-   The name of the delegation point / child zone apex.
+``domain``
+   This indicates the name of the delegation point/child zone apex.
 
 Exit Status
 ~~~~~~~~~~~
@@ -171,17 +172,17 @@ Exit Status
 The ``dnssec-cds`` command exits 0 on success, or non-zero if an error
 occurred.
 
-In the success case, the DS records might or might not need to be
+If successful, the DS records may or may not need to be
 changed.
 
 Examples
 ~~~~~~~~
 
-Before running ``dnssec-signzone``, you can ensure that the delegations
+Before running ``dnssec-signzone``, ensure that the delegations
 are up-to-date by running ``dnssec-cds`` on every ``dsset-`` file.
 
-To fetch the child records required by ``dnssec-cds`` you can invoke
-``dig`` as in the script below. It's okay if the ``dig`` fails since
+To fetch the child records required by ``dnssec-cds``, invoke
+``dig`` as in the script below. It is acceptable if the ``dig`` fails, since
 ``dnssec-cds`` performs all the necessary checking.
 
 ::
@@ -193,10 +194,10 @@ To fetch the child records required by ``dnssec-cds`` you can invoke
        dnssec-cds -i -f /dev/stdin -d $f $d
    done
 
-When the parent zone is automatically signed by ``named``, you can use
-``dnssec-cds`` with ``nsupdate`` to maintain a delegation as follows.
+When the parent zone is automatically signed by ``named``,
+``dnssec-cds`` can be used with ``nsupdate`` to maintain a delegation as follows.
 The ``dsset-`` file allows the script to avoid having to fetch and
-validate the parent DS records, and it keeps the replay attack
+validate the parent DS records, and it maintains the replay attack
 protection time.
 
 ::

bin/dnssec/dnssec-dsfromkey.c

@@ -15,6 +15,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/hash.h>
@@ -320,8 +321,8 @@ emits(bool showall, bool cds, dns_rdata_t *rdata) {
 	}
 }
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
@@ -330,7 +331,7 @@ usage(void) {
 	fprintf(stderr, "    %s [options] -f zonefile [zonename]\n\n", program);
 	fprintf(stderr, "    %s [options] -s dnsname\n\n", program);
 	fprintf(stderr, "    %s [-h|-V]\n\n", program);
-	fprintf(stderr, "Version: %s\n", VERSION);
+	fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
 	fprintf(stderr, "Options:\n"
 			"    -1: digest algorithm SHA-1\n"
 			"    -2: digest algorithm SHA-256\n"

bin/dnssec/dnssec-dsfromkey.rst

@@ -45,7 +45,7 @@ The ``dnssec-dsfromkey`` command outputs DS (Delegation Signer) resource records
 
 The input keys can be specified in a number of ways:
 
-By default, ``dnssec-dsfromkey`` reads a key file named like
+By default, ``dnssec-dsfromkey`` reads a key file named in the format
 ``Knnnn.+aaa+iiiii.key``, as generated by ``dnssec-keygen``.
 
 With the ``-f file`` option, ``dnssec-dsfromkey`` reads keys from a zone
@@ -57,73 +57,73 @@ as generated by ``dnssec-keygen`` ``-C``.
 Options
 ~~~~~~~
 
-**-1**
-   An abbreviation for ``-a SHA1``
+``-1``
+   This option is an abbreviation for ``-a SHA1``.
 
-**-2**
-   An abbreviation for ``-a SHA-256``
+``-2``
+   This option is an abbreviation for ``-a SHA-256``.
 
-**-a** algorithm
-   Specify a digest algorithm to use when converting DNSKEY records to
+``-a algorithm``
+   This option specifies a digest algorithm to use when converting DNSKEY records to
    DS records. This option can be repeated, so that multiple DS records
    are created for each DNSKEY record.
 
    The algorithm must be one of SHA-1, SHA-256, or SHA-384. These values
-   are case insensitive, and the hyphen may be omitted. If no algorithm
+   are case-insensitive, and the hyphen may be omitted. If no algorithm
    is specified, the default is SHA-256.
 
-**-A**
-   Include ZSKs when generating DS records. Without this option, only
-   keys which have the KSK flag set will be converted to DS records and
-   printed. Useful only in ``-f`` zone file mode.
+``-A``
+   This option indicates that ZSKs are to be included when generating DS records. Without this option, only
+   keys which have the KSK flag set are converted to DS records and
+   printed. This option is only useful in ``-f`` zone file mode.
 
-**-c** class
-   Specifies the DNS class (default is IN). Useful only in ``-s`` keyset
+``-c class``
+   This option specifies the DNS class; the default is IN. This option is only useful in ``-s`` keyset
    or ``-f`` zone file mode.
 
-**-C**
-   Generate CDS records rather than DS records.
+``-C``
+   This option generates CDS records rather than DS records.
 
-**-f** file
-   Zone file mode: ``dnssec-dsfromkey``'s final dnsname argument is the
+``-f file``
+   This option sets zone file mode, in which the final dnsname argument of ``dnssec-dsfromkey`` is the
    DNS domain name of a zone whose master file can be read from
    ``file``. If the zone name is the same as ``file``, then it may be
    omitted.
 
-   If file is ``"-"``, then the zone data is read from the standard
+   If ``file`` is ``-``, then the zone data is read from the standard
    input. This makes it possible to use the output of the ``dig``
    command as input, as in:
 
    ``dig dnskey example.com | dnssec-dsfromkey -f - example.com``
 
-**-h**
-   Prints usage information.
+``-h``
+   This option prints usage information.
 
-**-K** directory
-   Look for key files or ``keyset-`` files in ``directory``.
+``-K directory``
+   This option tells BIND 9 to look for key files or ``keyset-`` files in ``directory``.
 
-**-s**
-   Keyset mode: ``dnssec-dsfromkey``'s final dnsname argument is the DNS
+``-s``
+   This option enables keyset mode, in which the final dnsname argument from ``dnssec-dsfromkey`` is the DNS
    domain name used to locate a ``keyset-`` file.
 
-**-T** TTL
-   Specifies the TTL of the DS records. By default the TTL is omitted.
+``-T TTL``
+   This option specifies the TTL of the DS records. By default the TTL is omitted.
 
-**-v** level
-   Sets the debugging level.
+``-v level``
+   This option sets the debugging level.
 
-**-V**
-   Prints version information.
+``-V``
+   This option prints version information.
 
 Example
 ~~~~~~~
 
-To build the SHA-256 DS RR from the ``Kexample.com.+003+26160`` keyfile
-name, you can issue the following command:
+To build the SHA-256 DS RR from the ``Kexample.com.+003+26160`` keyfile,
+issue the following command:
 
 ``dnssec-dsfromkey -2 Kexample.com.+003+26160``
 
-The command would print something like:
+The command returns something similar to:
 
 ``example.com. IN DS 26160 5 2 3A1EADA7A74B8D0BA86726B0C227AA85AB8BBD2B2004F41A868A54F0C5EA0B94``
 
@@ -131,16 +131,16 @@ Files
 ~~~~~
 
 The keyfile can be designated by the key identification
-``Knnnn.+aaa+iiiii`` or the full file name ``Knnnn.+aaa+iiiii.key`` as
-generated by dnssec-keygen8.
+``Knnnn.+aaa+iiiii`` or the full file name ``Knnnn.+aaa+iiiii.key``, as
+generated by ``dnssec-keygen``.
 
 The keyset file name is built from the ``directory``, the string
-``keyset-`` and the ``dnsname``.
+``keyset-``, and the ``dnsname``.
 
 Caveat
 ~~~~~~
 
-A keyfile error can give a "file not found" even if the file exists.
+A keyfile error may return "file not found," even if the file exists.
 
 See Also
 ~~~~~~~~

bin/dnssec/dnssec-importkey.c

@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/hash.h>
@@ -264,15 +265,15 @@ emit(const char *dir, dns_rdata_t *rdata) {
 	dst_key_free(&key);
 }
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
 	fprintf(stderr, "Usage:\n");
 	fprintf(stderr, "    %s options [-K dir] keyfile\n\n", program);
 	fprintf(stderr, "    %s options -f file [keyname]\n\n", program);
-	fprintf(stderr, "Version: %s\n", VERSION);
+	fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
 	fprintf(stderr, "Options:\n");
 	fprintf(stderr, "    -f file: read key from zone file\n");
 	fprintf(stderr, "    -K <directory>: directory in which to store "

bin/dnssec/dnssec-importkey.rst

@@ -38,11 +38,11 @@ Description
 
 ``dnssec-importkey`` reads a public DNSKEY record and generates a pair
 of .key/.private files. The DNSKEY record may be read from an existing
-.key file, in which case a corresponding .private file will be
+.key file, in which case a corresponding .private file is
 generated, or it may be read from any other file or from the standard
-input, in which case both .key and .private files will be generated.
+input, in which case both .key and .private files are generated.
 
-The newly-created .private file does *not* contain private key data, and
+The newly created .private file does *not* contain private key data, and
 cannot be used for signing. However, having a .private file makes it
 possible to set publication (``-P``) and deletion (``-D``) times for the
 key, which means the public key can be added to and removed from the
@@ -51,70 +51,70 @@ DNSKEY RRset on schedule even if the true private key is stored offline.
 Options
 ~~~~~~~
 
-**-f** filename
-   Zone file mode: instead of a public keyfile name, the argument is the
+``-f filename``
+   This option indicates the zone file mode. Instead of a public keyfile name, the argument is the
    DNS domain name of a zone master file, which can be read from
-   ``file``. If the domain name is the same as ``file``, then it may be
+   ``filename``. If the domain name is the same as ``filename``, then it may be
    omitted.
 
-   If ``file`` is set to ``"-"``, then the zone data is read from the
+   If ``filename`` is set to ``"-"``, then the zone data is read from the
    standard input.
 
-**-K** directory
-   Sets the directory in which the key files are to reside.
+``-K directory``
+   This option sets the directory in which the key files are to reside.
 
-**-L** ttl
-   Sets the default TTL to use for this key when it is converted into a
-   DNSKEY RR. If the key is imported into a zone, this is the TTL that
-   will be used for it, unless there was already a DNSKEY RRset in
-   place, in which case the existing TTL would take precedence. Setting
-   the default TTL to ``0`` or ``none`` removes it.
+``-L ttl``
+   This option sets the default TTL to use for this key when it is converted into a
+   DNSKEY RR. This is the TTL used when the key is imported into a zone,
+   unless there was already a DNSKEY RRset in
+   place, in which case the existing TTL takes precedence. Setting the default TTL to ``0`` or ``none``
+   removes it from the key.
 
-**-h**
-   Emit usage message and exit.
+``-h``
+   This option emits a usage message and exits.
 
-**-v** level
-   Sets the debugging level.
+``-v level``
+   This option sets the debugging level.
 
-**-V**
-   Prints version information.
+``-V``
+   This option prints version information.
 
 Timing Options
 ~~~~~~~~~~~~~~
 
 Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS. If the
-argument begins with a '+' or '-', it is interpreted as an offset from
+argument begins with a ``+`` or ``-``, it is interpreted as an offset from
 the present time. For convenience, if such an offset is followed by one
-of the suffixes 'y', 'mo', 'w', 'd', 'h', or 'mi', then the offset is
+of the suffixes ``y``, ``mo``, ``w``, ``d``, ``h``, or ``mi``, then the offset is
 computed in years (defined as 365 24-hour days, ignoring leap years),
 months (defined as 30 24-hour days), weeks, days, hours, or minutes,
 respectively. Without a suffix, the offset is computed in seconds. To
-explicitly prevent a date from being set, use 'none' or 'never'.
+explicitly prevent a date from being set, use ``none`` or ``never``.
 
-**-P** date/offset
-   Sets the date on which a key is to be published to the zone. After
-   that date, the key will be included in the zone but will not be used
+``-P date/offset``
+   This option sets the date on which a key is to be published to the zone. After
+   that date, the key is included in the zone but is not used
    to sign it.
 
-**-P** sync date/offset
-   Sets the date on which CDS and CDNSKEY records that match this key
+``-P sync date/offset``
+   This option sets the date on which CDS and CDNSKEY records that match this key
    are to be published to the zone.
 
-**-D** date/offset
-   Sets the date on which the key is to be deleted. After that date, the
-   key will no longer be included in the zone. (It may remain in the key
-   repository, however.)
+``-D date/offset``
+   This option sets the date on which the key is to be deleted. After that date, the
+   key is no longer included in the zone. (However, it may remain in the key
+   repository.)
 
-**-D** sync date/offset
-   Sets the date on which the CDS and CDNSKEY records that match this
+``-D sync date/offset``
+   This option sets the date on which the CDS and CDNSKEY records that match this
    key are to be deleted.
 
 Files
 ~~~~~
 
 A keyfile can be designed by the key identification ``Knnnn.+aaa+iiiii``
-or the full file name ``Knnnn.+aaa+iiiii.key`` as generated by
-dnssec-keygen8.
+or the full file name ``Knnnn.+aaa+iiiii.key``, as generated by
+``dnssec-keygen``.
 
 See Also
 ~~~~~~~~

bin/dnssec/dnssec-keyfromlabel.c

@@ -16,6 +16,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/mem.h>
@@ -47,14 +48,14 @@
 
 const char *program = "dnssec-keyfromlabel";
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
 	fprintf(stderr, "Usage:\n");
 	fprintf(stderr, "    %s -l label [options] name\n\n", program);
-	fprintf(stderr, "Version: %s\n", VERSION);
+	fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
 	fprintf(stderr, "Required options:\n");
 	fprintf(stderr, "    -l label: label of the key pair\n");
 	fprintf(stderr, "    name: owner of the key\n");
@@ -361,6 +362,7 @@ main(int argc, char **argv) {
 	setup_logging(mctx, &log);
 
 	if (predecessor == NULL) {
+		/* cppcheck-suppress nullPointerRedundantCheck */
 		if (label == NULL) {
 			fatal("the key label was not specified");
 		}
@@ -382,6 +384,7 @@ main(int argc, char **argv) {
 			      isc_result_totext(ret));
 		}
 
+		/* cppcheck-suppress nullPointerRedundantCheck */
 		if (strchr(label, ':') == NULL) {
 			char *l;
 			int len;
@@ -393,11 +396,13 @@ main(int argc, char **argv) {
 			label = l;
 		}
 
+		/* cppcheck-suppress nullPointerRedundantCheck */
 		if (algname == NULL) {
 			fatal("no algorithm specified");
 		}
 
 		r.base = algname;
+		/* cppcheck-suppress nullPointerRedundantCheck */
 		r.length = strlen(algname);
 		ret = dns_secalg_fromtext(&alg, &r);
 		if (ret != ISC_R_SUCCESS) {

bin/dnssec/dnssec-keyfromlabel.rst

@@ -34,11 +34,11 @@ Synopsis
 Description
 ~~~~~~~~~~~
 
-``dnssec-keyfromlabel`` generates a key pair of files that referencing a
+``dnssec-keyfromlabel`` generates a pair of key files that reference a
 key object stored in a cryptographic hardware service module (HSM). The
 private key file can be used for DNSSEC signing of zone data as if it
 were a conventional signing key created by ``dnssec-keygen``, but the
-key material is stored within the HSM, and the actual signing takes
+key material is stored within the HSM and the actual signing takes
 place there.
 
 The ``name`` of the key is specified on the command line. This must
@@ -47,194 +47,194 @@ match the name of the zone for which the key is being generated.
 Options
 ~~~~~~~
 
-**-a** algorithm
-   Selects the cryptographic algorithm. The value of ``algorithm`` must
+``-a algorithm``
+   This option selects the cryptographic algorithm. The value of ``algorithm`` must
    be one of RSASHA1, NSEC3RSASHA1, RSASHA256, RSASHA512,
-   ECDSAP256SHA256, ECDSAP384SHA384, ED25519 or ED448.
+   ECDSAP256SHA256, ECDSAP384SHA384, ED25519, or ED448.
 
-   If no algorithm is specified, then RSASHA1 will be used by default,
+   If no algorithm is specified, RSASHA1 is used by default
    unless the ``-3`` option is specified, in which case NSEC3RSASHA1
-   will be used instead. (If ``-3`` is used and an algorithm is
-   specified, that algorithm will be checked for compatibility with
+   is used instead. (If ``-3`` is used and an algorithm is
+   specified, that algorithm is checked for compatibility with
    NSEC3.)
 
-   These values are case insensitive. In some cases, abbreviations are
+   These values are case-insensitive. In some cases, abbreviations are
    supported, such as ECDSA256 for ECDSAP256SHA256 and ECDSA384 for
    ECDSAP384SHA384. If RSASHA1 is specified along with the ``-3``
-   option, then NSEC3RSASHA1 will be used instead.
+   option, then NSEC3RSASHA1 is used instead.
 
-   As of BIND 9.12.0, this option is mandatory except when using the
-   ``-S`` option (which copies the algorithm from the predecessory key).
+   Since BIND 9.12.0, this option is mandatory except when using the
+   ``-S`` option, which copies the algorithm from the predecessory key.
    Previously, the default for newly generated keys was RSASHA1.
 
-**-3**
-   Use an NSEC3-capable algorithm to generate a DNSSEC key. If this
+``-3``
+   This option uses an NSEC3-capable algorithm to generate a DNSSEC key. If this
    option is used with an algorithm that has both NSEC and NSEC3
-   versions, then the NSEC3 version will be used; for example,
+   versions, then the NSEC3 version is used; for example,
    ``dnssec-keygen -3a RSASHA1`` specifies the NSEC3RSASHA1 algorithm.
 
-**-E** engine
-   Specifies the cryptographic hardware to use.
+``-E engine``
+   This option specifies the cryptographic hardware to use.
 
-   When BIND is built with OpenSSL PKCS#11 support, this defaults to the
-   string "pkcs11", which identifies an OpenSSL engine that can drive a
+   When BIND 9 is built with OpenSSL PKCS#11 support, this defaults to the
+   string ``pkcs11``, which identifies an OpenSSL engine that can drive a
    cryptographic accelerator or hardware service module. When BIND is
-   built with native PKCS#11 cryptography (--enable-native-pkcs11), it
+   built with native PKCS#11 cryptography (``--enable-native-pkcs11``), it
    defaults to the path of the PKCS#11 provider library specified via
-   "--with-pkcs11".
+   ``--with-pkcs11``.
 
-**-l** label
-   Specifies the label for a key pair in the crypto hardware.
+``-l label``
+   This option specifies the label for a key pair in the crypto hardware.
 
    When BIND 9 is built with OpenSSL-based PKCS#11 support, the label is
    an arbitrary string that identifies a particular key. It may be
    preceded by an optional OpenSSL engine name, followed by a colon, as
-   in "pkcs11:keylabel".
+   in ``pkcs11:keylabel``.
 
    When BIND 9 is built with native PKCS#11 support, the label is a
    PKCS#11 URI string in the format
-   "pkcs11:``keyword``\ =value[;\ ``keyword``\ =value;...]" Keywords
-   include "token", which identifies the HSM; "object", which identifies
-   the key; and "pin-source", which identifies a file from which the
-   HSM's PIN code can be obtained. The label will be stored in the
-   on-disk "private" file.
+   ``pkcs11:keyword\ =value[;\ keyword\ =value;...]``. Keywords
+   include ``token``, which identifies the HSM; ``object``, which identifies
+   the key; and ``pin-source``, which identifies a file from which the
+   HSM's PIN code can be obtained. The label is stored in the
+   on-disk ``private`` file.
 
    If the label contains a ``pin-source`` field, tools using the
-   generated key files will be able to use the HSM for signing and other
+   generated key files are able to use the HSM for signing and other
    operations without any need for an operator to manually enter a PIN.
    Note: Making the HSM's PIN accessible in this manner may reduce the
-   security advantage of using an HSM; be sure this is what you want to
-   do before making use of this feature.
+   security advantage of using an HSM; use caution
+   with this feature.
 
-**-n** nametype
-   Specifies the owner type of the key. The value of ``nametype`` must
+``-n nametype``
+   This option specifies the owner type of the key. The value of ``nametype`` must
    either be ZONE (for a DNSSEC zone key (KEY/DNSKEY)), HOST or ENTITY
    (for a key associated with a host (KEY)), USER (for a key associated
-   with a user(KEY)) or OTHER (DNSKEY). These values are case
-   insensitive.
+   with a user (KEY)), or OTHER (DNSKEY). These values are
+   case-insensitive.
 
-**-C**
-   Compatibility mode: generates an old-style key, without any metadata.
-   By default, ``dnssec-keyfromlabel`` will include the key's creation
-   date in the metadata stored with the private key, and other dates may
-   be set there as well (publication date, activation date, etc). Keys
+``-C``
+   This option enables compatibility mode, which generates an old-style key, without any metadata.
+   By default, ``dnssec-keyfromlabel`` includes the key's creation
+   date in the metadata stored with the private key; other dates may
+   be set there as well, including publication date, activation date, etc. Keys
    that include this data may be incompatible with older versions of
    BIND; the ``-C`` option suppresses them.
 
-**-c** class
-   Indicates that the DNS record containing the key should have the
+``-c class``
+   This option indicates that the DNS record containing the key should have the
    specified class. If not specified, class IN is used.
 
-**-f** flag
-   Set the specified flag in the flag field of the KEY/DNSKEY record.
-   The only recognized flags are KSK (Key Signing Key) and REVOKE.
+``-f flag``
+   This option sets the specified flag in the ``flag`` field of the KEY/DNSKEY record.
+   The only recognized flags are KSK (Key-Signing Key) and REVOKE.
 
-**-G**
-   Generate a key, but do not publish it or sign with it. This option is
-   incompatible with -P and -A.
+``-G``
+   This option generates a key, but does not publish it or sign with it. This option is
+   incompatible with ``-P`` and ``-A``.
 
-**-h**
-   Prints a short summary of the options and arguments to
+``-h``
+   This option prints a short summary of the options and arguments to
    ``dnssec-keyfromlabel``.
 
-**-K** directory
-   Sets the directory in which the key files are to be written.
+``-K directory``
+   This option sets the directory in which the key files are to be written.
 
-**-k**
-   Generate KEY records rather than DNSKEY records.
+``-k``
+   This option generates KEY records rather than DNSKEY records.
 
-**-L** ttl
-   Sets the default TTL to use for this key when it is converted into a
-   DNSKEY RR. If the key is imported into a zone, this is the TTL that
-   will be used for it, unless there was already a DNSKEY RRset in
+``-L`` ttl
+   This option sets the default TTL to use for this key when it is converted into a
+   DNSKEY RR. This is the TTL used when the key is imported into a zone,
+   unless there was already a DNSKEY RRset in
    place, in which case the existing TTL would take precedence. Setting
    the default TTL to ``0`` or ``none`` removes it.
 
-**-p** protocol
-   Sets the protocol value for the key. The protocol is a number between
+``-p protocol``
+   This option sets the protocol value for the key. The protocol is a number between
    0 and 255. The default is 3 (DNSSEC). Other possible values for this
    argument are listed in :rfc:`2535` and its successors.
 
-**-S** key
-   Generate a key as an explicit successor to an existing key. The name,
-   algorithm, size, and type of the key will be set to match the
-   predecessor. The activation date of the new key will be set to the
-   inactivation date of the existing one. The publication date will be
+``-S key``
+   This option generates a key as an explicit successor to an existing key. The name,
+   algorithm, size, and type of the key are set to match the
+   predecessor. The activation date of the new key is set to the
+   inactivation date of the existing one. The publication date is
    set to the activation date minus the prepublication interval, which
    defaults to 30 days.
 
-**-t** type
-   Indicates the use of the key. ``type`` must be one of AUTHCONF,
+``-t type``
+   This option indicates the type of the key. ``type`` must be one of AUTHCONF,
    NOAUTHCONF, NOAUTH, or NOCONF. The default is AUTHCONF. AUTH refers
-   to the ability to authenticate data, and CONF the ability to encrypt
+   to the ability to authenticate data, and CONF to the ability to encrypt
    data.
 
-**-v** level
-   Sets the debugging level.
+``-v level``
+   This option sets the debugging level.
 
-**-V**
-   Prints version information.
+``-V``
+   This option prints version information.
 
-**-y**
-   Allows DNSSEC key files to be generated even if the key ID would
+``-y``
+   This option allows DNSSEC key files to be generated even if the key ID would
    collide with that of an existing key, in the event of either key
-   being revoked. (This is only safe to use if you are sure you won't be
-   using :rfc:`5011` trust anchor maintenance with either of the keys
+   being revoked. (This is only safe to enable if
+   :rfc:`5011` trust anchor maintenance is not used with either of the keys
    involved.)
 
 Timing Options
 ~~~~~~~~~~~~~~
 
 Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS. If the
-argument begins with a '+' or '-', it is interpreted as an offset from
+argument begins with a ``+`` or ``-``, it is interpreted as an offset from
 the present time. For convenience, if such an offset is followed by one
-of the suffixes 'y', 'mo', 'w', 'd', 'h', or 'mi', then the offset is
+of the suffixes ``y``, ``mo``, ``w``, ``d``, ``h``, or ``mi``, then the offset is
 computed in years (defined as 365 24-hour days, ignoring leap years),
 months (defined as 30 24-hour days), weeks, days, hours, or minutes,
 respectively. Without a suffix, the offset is computed in seconds. To
-explicitly prevent a date from being set, use 'none' or 'never'.
+explicitly prevent a date from being set, use ``none`` or ``never``.
 
-**-P** date/offset
-   Sets the date on which a key is to be published to the zone. After
-   that date, the key will be included in the zone but will not be used
-   to sign it. If not set, and if the -G option has not been used, the
-   default is "now".
+``-P date/offset``
+   This option sets the date on which a key is to be published to the zone. After
+   that date, the key is included in the zone but is not used
+   to sign it. If not set, and if the ``-G`` option has not been used, the
+   default is the current date.
 
-**-P** sync date/offset
-   Sets the date on which the CDS and CDNSKEY records which match this
-   key are to be published to the zone.
+``-P sync date/offset``
+   This option sets the date on which CDS and CDNSKEY records that match this key
+   are to be published to the zone.
 
-**-A** date/offset
-   Sets the date on which the key is to be activated. After that date,
-   the key will be included in the zone and used to sign it. If not set,
-   and if the -G option has not been used, the default is "now".
+``-A date/offset``
+   This option sets the date on which the key is to be activated. After that date,
+   the key is included in the zone and used to sign it. If not set,
+   and if the ``-G`` option has not been used, the default is the current date.
 
-**-R** date/offset
-   Sets the date on which the key is to be revoked. After that date, the
-   key will be flagged as revoked. It will be included in the zone and
-   will be used to sign it.
+``-R date/offset``
+   This option sets the date on which the key is to be revoked. After that date, the
+   key is flagged as revoked. It is included in the zone and
+   is used to sign it.
 
-**-I** date/offset
-   Sets the date on which the key is to be retired. After that date, the
-   key will still be included in the zone, but it will not be used to
+``-I date/offset``
+   This option sets the date on which the key is to be retired. After that date, the
+   key is still included in the zone, but it is not used to
    sign it.
 
-**-D** date/offset
-   Sets the date on which the key is to be deleted. After that date, the
-   key will no longer be included in the zone. (It may remain in the key
-   repository, however.)
+``-D date/offset``
+   This option sets the date on which the key is to be deleted. After that date, the
+   key is no longer included in the zone. (However, it may remain in the key
+   repository.)
 
-**-D** sync date/offset
-   Sets the date on which the CDS and CDNSKEY records which match this
+``-D sync date/offset``
+   This option sets the date on which the CDS and CDNSKEY records that match this
    key are to be deleted.
 
-**-i** interval
-   Sets the prepublication interval for a key. If set, then the
+``-i interval``
+   This option sets the prepublication interval for a key. If set, then the
    publication and activation dates must be separated by at least this
    much time. If the activation date is specified but the publication
-   date isn't, then the publication date will default to this much time
+   date is not, the publication date defaults to this much time
    before the activation date; conversely, if the publication date is
-   specified but activation date isn't, then activation will be set to
+   specified but not the activation date, activation is set to
    this much time after publication.
 
    If the key is being created as an explicit successor to another key,
@@ -242,7 +242,7 @@ explicitly prevent a date from being set, use 'none' or 'never'.
    zero.
 
    As with date offsets, if the argument is followed by one of the
-   suffixes 'y', 'mo', 'w', 'd', 'h', or 'mi', then the interval is
+   suffixes ``y``, ``mo``, ``w``, ``d``, ``h``, or ``mi``, the interval is
    measured in years, months, weeks, days, hours, or minutes,
    respectively. Without a suffix, the interval is measured in seconds.
 
@@ -264,7 +264,7 @@ printed string. ``Knnnn.+aaa+iiiii.key`` contains the public key, and
 ``Knnnn.+aaa+iiiii.private`` contains the private key.
 
 The ``.key`` file contains a DNS KEY record that can be inserted into a
-zone file (directly or with a $INCLUDE statement).
+zone file (directly or with an $INCLUDE statement).
 
 The ``.private`` file contains algorithm-specific fields. For obvious
 security reasons, this file does not have general read permission.
@@ -273,4 +273,4 @@ See Also
 ~~~~~~~~
 
 :manpage:`dnssec-keygen(8)`, :manpage:`dnssec-signzone(8)`, BIND 9 Administrator Reference Manual,
-:rfc:`4034`, The PKCS#11 URI Scheme (draft-pechanec-pkcs11uri-13).
+:rfc:`4034`, :rfc:`7512`.

bin/dnssec/dnssec-keygen.c

@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/mem.h>
@@ -70,8 +71,8 @@ const char *program = "dnssec-keygen";
 
 isc_log_t *lctx = NULL;
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 progress(int p);
@@ -136,7 +137,7 @@ static void
 usage(void) {
 	fprintf(stderr, "Usage:\n");
 	fprintf(stderr, "    %s [options] name\n\n", program);
-	fprintf(stderr, "Version: %s\n", VERSION);
+	fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
 	fprintf(stderr, "    name: owner of the key\n");
 	fprintf(stderr, "Options:\n");
 	fprintf(stderr, "    -K <directory>: write keys into directory\n");
@@ -1179,10 +1180,12 @@ main(int argc, char **argv) {
 	}
 
 	if (ctx.predecessor == NULL && ctx.policy == NULL) {
+		/* cppcheck-suppress nullPointerRedundantCheck */
 		if (algname == NULL) {
 			fatal("no algorithm specified");
 		}
 		r.base = algname;
+		/* cppcheck-suppress nullPointerRedundantCheck */
 		r.length = strlen(algname);
 		ret = dns_secalg_fromtext(&ctx.alg, &r);
 		if (ret != ISC_R_SUCCESS) {

bin/dnssec/dnssec-keygen.rst

@@ -43,229 +43,223 @@ The ``name`` of the key is specified on the command line. For DNSSEC
 keys, this must match the name of the zone for which the key is being
 generated.
 
-The ``dnssec-keymgr`` command acts as a wrapper
-around ``dnssec-keygen``, generating and updating keys
-as needed to enforce defined security policies such as key rollover
-scheduling. Using ``dnssec-keymgr`` may be preferable
-to direct use of ``dnssec-keygen``.
-
 Options
 ~~~~~~~
 
-**-3**
-   Use an NSEC3-capable algorithm to generate a DNSSEC key. If this
+``-3``
+   This option uses an NSEC3-capable algorithm to generate a DNSSEC key. If this
    option is used with an algorithm that has both NSEC and NSEC3
-   versions, then the NSEC3 version will be used; for example,
+   versions, then the NSEC3 version is selected; for example,
    ``dnssec-keygen -3a RSASHA1`` specifies the NSEC3RSASHA1 algorithm.
 
-**-a** algorithm
-   Selects the cryptographic algorithm. For DNSSEC keys, the value of
+``-a algorithm``
+   This option selects the cryptographic algorithm. For DNSSEC keys, the value of
    ``algorithm`` must be one of RSASHA1, NSEC3RSASHA1, RSASHA256,
-   RSASHA512, ECDSAP256SHA256, ECDSAP384SHA384, ED25519 or ED448. For
-   TKEY, the value must be DH (Diffie Hellman); specifying his value
-   will automatically set the ``-T KEY`` option as well.
+   RSASHA512, ECDSAP256SHA256, ECDSAP384SHA384, ED25519, or ED448. For
+   TKEY, the value must be DH (Diffie-Hellman); specifying this value
+   automatically sets the ``-T KEY`` option as well.
 
-   These values are case insensitive. In some cases, abbreviations are
+   These values are case-insensitive. In some cases, abbreviations are
    supported, such as ECDSA256 for ECDSAP256SHA256 and ECDSA384 for
    ECDSAP384SHA384. If RSASHA1 is specified along with the ``-3``
-   option, then NSEC3RSASHA1 will be used instead.
+   option, NSEC3RSASHA1 is used instead.
 
    This parameter *must* be specified except when using the ``-S``
    option, which copies the algorithm from the predecessor key.
 
    In prior releases, HMAC algorithms could be generated for use as TSIG
-   keys, but that feature has been removed as of BIND 9.13.0. Use
+   keys, but that feature was removed in BIND 9.13.0. Use
    ``tsig-keygen`` to generate TSIG keys.
 
-**-b** keysize
-   Specifies the number of bits in the key. The choice of key size
-   depends on the algorithm used. RSA keys must be between 1024 and 4096
-   bits. Diffie Hellman keys must be between 128 and 4096 bits. Elliptic
-   curve algorithms don't need this parameter.
+``-b keysize``
+   This option specifies the number of bits in the key. The choice of key size
+   depends on the algorithm used: RSA keys must be between 1024 and 4096
+   bits; Diffie-Hellman keys must be between 128 and 4096 bits. Elliptic
+   curve algorithms do not need this parameter.
 
    If the key size is not specified, some algorithms have pre-defined
-   defaults. For example, RSA keys for use as DNSSEC zone signing keys
-   have a default size of 1024 bits; RSA keys for use as key signing
+   defaults. For example, RSA keys for use as DNSSEC zone-signing keys
+   have a default size of 1024 bits; RSA keys for use as key-signing
    keys (KSKs, generated with ``-f KSK``) default to 2048 bits.
 
-**-C**
-   Compatibility mode: generates an old-style key, without any timing
-   metadata. By default, ``dnssec-keygen`` will include the key's
-   creation date in the metadata stored with the private key, and other
-   dates may be set there as well (publication date, activation date,
-   etc). Keys that include this data may be incompatible with older
+``-C``
+   This option enables compatibility mode, which generates an old-style key, without any timing
+   metadata. By default, ``dnssec-keygen`` includes the key's
+   creation date in the metadata stored with the private key; other
+   dates may be set there as well, including publication date, activation date,
+   etc. Keys that include this data may be incompatible with older
    versions of BIND; the ``-C`` option suppresses them.
 
-**-c** class
-   Indicates that the DNS record containing the key should have the
+``-c class``
+   This option indicates that the DNS record containing the key should have the
    specified class. If not specified, class IN is used.
 
-**-d** bits
-   Key size in bits. For the algorithms RSASHA1, NSEC3RSASA1, RSASHA256 and
-   RSASHA512 the key size must be in range 1024-4096.  DH size is between 128
-   and 4096. This option is ignored for algorithms ECDSAP256SHA256,
-   ECDSAP384SHA384, ED25519 and ED448.
+``-d bits``
+   This option specifies the key size in bits. For the algorithms RSASHA1, NSEC3RSASA1, RSASHA256, and
+   RSASHA512 the key size must be between 1024 and 4096 bits; DH size is between 128
+   and 4096 bits. This option is ignored for algorithms ECDSAP256SHA256,
+   ECDSAP384SHA384, ED25519, and ED448.
 
-**-E** engine
-   Specifies the cryptographic hardware to use, when applicable.
+``-E engine``
+   This option specifies the cryptographic hardware to use, when applicable.
 
    When BIND is built with OpenSSL PKCS#11 support, this defaults to the
-   string "pkcs11", which identifies an OpenSSL engine that can drive a
+   string ``pkcs11``, which identifies an OpenSSL engine that can drive a
    cryptographic accelerator or hardware service module. When BIND is
-   built with native PKCS#11 cryptography (--enable-native-pkcs11), it
+   built with native PKCS#11 cryptography (``--enable-native-pkcs11``), it
    defaults to the path of the PKCS#11 provider library specified via
-   "--with-pkcs11".
+   ``--with-pkcs11``.
 
-**-f** flag
-   Set the specified flag in the flag field of the KEY/DNSKEY record.
-   The only recognized flags are KSK (Key Signing Key) and REVOKE.
+``-f flag``
+   This option sets the specified flag in the flag field of the KEY/DNSKEY record.
+   The only recognized flags are KSK (Key-Signing Key) and REVOKE.
 
-**-G**
-   Generate a key, but do not publish it or sign with it. This option is
-   incompatible with -P and -A.
+``-G``
+   This option generates a key, but does not publish it or sign with it. This option is
+   incompatible with ``-P`` and ``-A``.
 
-**-g** generator
-   If generating a Diffie Hellman key, use this generator. Allowed
+``-g generator``
+   This option indicates the generator to use if generating a Diffie-Hellman key. Allowed
    values are 2 and 5. If no generator is specified, a known prime from
-   :rfc:`2539` will be used if possible; otherwise the default is 2.
+   :rfc:`2539` is used if possible; otherwise the default is 2.
 
-**-h**
-   Prints a short summary of the options and arguments to
+``-h``
+   This option prints a short summary of the options and arguments to
    ``dnssec-keygen``.
 
-**-K** directory
-   Sets the directory in which the key files are to be written.
+``-K directory``
+   This option sets the directory in which the key files are to be written.
 
-**-k** policy
-   Create keys for a specific dnssec-policy.  If a policy uses multiple keys,
-   ``dnssec-keygen`` will generate multiple keys.  This will also
-   create a ".state" file to keep track of the key state.
+``-k policy``
+   This option creates keys for a specific ``dnssec-policy``. If a policy uses multiple keys,
+   ``dnssec-keygen`` generates multiple keys. This also
+   creates a ".state" file to keep track of the key state.
 
-   This option creates keys according to the dnssec-policy configuration, hence
-   it cannot be used together with many of the other options that
+   This option creates keys according to the ``dnssec-policy`` configuration, hence
+   it cannot be used at the same time as many of the other options that
    ``dnssec-keygen`` provides.
 
-**-L** ttl
-   Sets the default TTL to use for this key when it is converted into a
-   DNSKEY RR. If the key is imported into a zone, this is the TTL that
-   will be used for it, unless there was already a DNSKEY RRset in
-   place, in which case the existing TTL would take precedence. If this
-   value is not set and there is no existing DNSKEY RRset, the TTL will
-   default to the SOA TTL. Setting the default TTL to ``0`` or ``none``
+``-L ttl``
+   This option sets the default TTL to use for this key when it is converted into a
+   DNSKEY RR. This is the TTL used when the key is imported into a zone,
+   unless there was already a DNSKEY RRset in
+   place, in which case the existing TTL takes precedence. If this
+   value is not set and there is no existing DNSKEY RRset, the TTL
+   defaults to the SOA TTL. Setting the default TTL to ``0`` or ``none``
    is the same as leaving it unset.
 
-**-l** file
-   Provide a configuration file that contains a dnssec-policy statement
+``-l file``
+   This option provides a configuration file that contains a ``dnssec-policy`` statement
    (matching the policy set with ``-k``).
 
-**-n** nametype
-   Specifies the owner type of the key. The value of ``nametype`` must
+``-n nametype``
+   This option specifies the owner type of the key. The value of ``nametype`` must
    either be ZONE (for a DNSSEC zone key (KEY/DNSKEY)), HOST or ENTITY
    (for a key associated with a host (KEY)), USER (for a key associated
-   with a user(KEY)) or OTHER (DNSKEY). These values are case
-   insensitive. Defaults to ZONE for DNSKEY generation.
+   with a user (KEY)), or OTHER (DNSKEY). These values are
+   case-insensitive. The default is ZONE for DNSKEY generation.
 
-**-p** protocol
-   Sets the protocol value for the generated key, for use with
+``-p protocol``
+   This option sets the protocol value for the generated key, for use with
    ``-T KEY``. The protocol is a number between 0 and 255. The default
    is 3 (DNSSEC). Other possible values for this argument are listed in
    :rfc:`2535` and its successors.
 
-**-q**
-   Quiet mode: Suppresses unnecessary output, including progress
+``-q``
+   This option sets quiet mode, which suppresses unnecessary output, including progress
    indication. Without this option, when ``dnssec-keygen`` is run
-   interactively to generate an RSA or DSA key pair, it will print a
+   interactively to generate an RSA or DSA key pair, it prints a
    string of symbols to ``stderr`` indicating the progress of the key
-   generation. A '.' indicates that a random number has been found which
-   passed an initial sieve test; '+' means a number has passed a single
-   round of the Miller-Rabin primality test; a space means that the
+   generation. A ``.`` indicates that a random number has been found which
+   passed an initial sieve test; ``+`` means a number has passed a single
+   round of the Miller-Rabin primality test; and a space ( ) means that the
    number has passed all the tests and is a satisfactory key.
 
-**-S** key
-   Create a new key which is an explicit successor to an existing key.
-   The name, algorithm, size, and type of the key will be set to match
-   the existing key. The activation date of the new key will be set to
-   the inactivation date of the existing one. The publication date will
-   be set to the activation date minus the prepublication interval,
+``-S key``
+   This option creates a new key which is an explicit successor to an existing key.
+   The name, algorithm, size, and type of the key are set to match
+   the existing key. The activation date of the new key is set to
+   the inactivation date of the existing one. The publication date is
+   set to the activation date minus the prepublication interval,
    which defaults to 30 days.
 
-**-s** strength
-   Specifies the strength value of the key. The strength is a number
+``-s strength``
+   This option specifies the strength value of the key. The strength is a number
    between 0 and 15, and currently has no defined purpose in DNSSEC.
 
-**-T** rrtype
-   Specifies the resource record type to use for the key. ``rrtype``
+``-T rrtype``
+   This option specifies the resource record type to use for the key. ``rrtype``
    must be either DNSKEY or KEY. The default is DNSKEY when using a
    DNSSEC algorithm, but it can be overridden to KEY for use with
    SIG(0).
 
-**-t** type
-   Indicates the use of the key, for use with ``-T  KEY``. ``type``
+``-t type``
+   This option indicates the type of the key for use with ``-T KEY``. ``type``
    must be one of AUTHCONF, NOAUTHCONF, NOAUTH, or NOCONF. The default
    is AUTHCONF. AUTH refers to the ability to authenticate data, and
-   CONF the ability to encrypt data.
+   CONF to the ability to encrypt data.
 
-**-V**
-   Prints version information.
+``-V``
+   This option prints version information.
 
-**-v** level
-   Sets the debugging level.
+``-v level``
+   This option sets the debugging level.
 
 Timing Options
 ~~~~~~~~~~~~~~
 
 Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS. If the
-argument begins with a '+' or '-', it is interpreted as an offset from
+argument begins with a ``+`` or ``-``, it is interpreted as an offset from
 the present time. For convenience, if such an offset is followed by one
-of the suffixes 'y', 'mo', 'w', 'd', 'h', or 'mi', then the offset is
+of the suffixes ``y``, ``mo``, ``w``, ``d``, ``h``, or ``mi``, then the offset is
 computed in years (defined as 365 24-hour days, ignoring leap years),
 months (defined as 30 24-hour days), weeks, days, hours, or minutes,
 respectively. Without a suffix, the offset is computed in seconds. To
-explicitly prevent a date from being set, use 'none' or 'never'.
+explicitly prevent a date from being set, use ``none`` or ``never``.
 
-**-P** date/offset
-   Sets the date on which a key is to be published to the zone. After
-   that date, the key will be included in the zone but will not be used
-   to sign it. If not set, and if the -G option has not been used, the
-   default is "now".
+``-P date/offset``
+   This option sets the date on which a key is to be published to the zone. After
+   that date, the key is included in the zone but is not used
+   to sign it. If not set, and if the ``-G`` option has not been used, the
+   default is the current date.
 
-**-P** sync date/offset
-   Sets the date on which CDS and CDNSKEY records that match this key
+``-P sync date/offset``
+   This option sets the date on which CDS and CDNSKEY records that match this key
    are to be published to the zone.
 
-**-A** date/offset
-   Sets the date on which the key is to be activated. After that date,
-   the key will be included in the zone and used to sign it. If not set,
-   and if the -G option has not been used, the default is "now". If set,
-   if and -P is not set, then the publication date will be set to the
+``-A date/offset``
+   This option sets the date on which the key is to be activated. After that date,
+   the key is included in the zone and used to sign it. If not set,
+   and if the ``-G`` option has not been used, the default is the current date. If set,
+   and ``-P`` is not set, the publication date is set to the
    activation date minus the prepublication interval.
 
-**-R** date/offset
-   Sets the date on which the key is to be revoked. After that date, the
-   key will be flagged as revoked. It will be included in the zone and
-   will be used to sign it.
+``-R date/offset``
+   This option sets the date on which the key is to be revoked. After that date, the
+   key is flagged as revoked. It is included in the zone and
+   is used to sign it.
 
-**-I** date/offset
-   Sets the date on which the key is to be retired. After that date, the
-   key will still be included in the zone, but it will not be used to
+``-I date/offset``
+   This option sets the date on which the key is to be retired. After that date, the
+   key is still included in the zone, but it is not used to
    sign it.
 
-**-D** date/offset
-   Sets the date on which the key is to be deleted. After that date, the
-   key will no longer be included in the zone. (It may remain in the key
-   repository, however.)
+``-D date/offset``
+   This option sets the date on which the key is to be deleted. After that date, the
+   key is no longer included in the zone. (However, it may remain in the key
+   repository.)
 
-**-D** sync date/offset
-   Sets the date on which the CDS and CDNSKEY records that match this
+``-D sync date/offset``
+   This option sets the date on which the CDS and CDNSKEY records that match this
    key are to be deleted.
 
-**-i** interval
-   Sets the prepublication interval for a key. If set, then the
+``-i interval``
+   This option sets the prepublication interval for a key. If set, then the
    publication and activation dates must be separated by at least this
    much time. If the activation date is specified but the publication
-   date isn't, then the publication date will default to this much time
+   date is not, the publication date defaults to this much time
    before the activation date; conversely, if the publication date is
-   specified but activation date isn't, then activation will be set to
+   specified but not the activation date, activation is set to
    this much time after publication.
 
    If the key is being created as an explicit successor to another key,
@@ -273,7 +267,7 @@ explicitly prevent a date from being set, use 'none' or 'never'.
    zero.
 
    As with date offsets, if the argument is followed by one of the
-   suffixes 'y', 'mo', 'w', 'd', 'h', or 'mi', then the interval is
+   suffixes ``y``, ``mo``, ``w``, ``d``, ``h``, or ``mi``, the interval is
    measured in years, months, weeks, days, hours, or minutes,
    respectively. Without a suffix, the interval is measured in seconds.
 
@@ -295,9 +289,9 @@ string. ``Knnnn.+aaa+iiiii.key`` contains the public key, and
 ``Knnnn.+aaa+iiiii.private`` contains the private key.
 
 The ``.key`` file contains a DNSKEY or KEY record. When a zone is being
-signed by ``named`` or ``dnssec-signzone`` ``-S``, DNSKEY records are
+signed by ``named`` or ``dnssec-signzone -S``, DNSKEY records are
 included automatically. In other cases, the ``.key`` file can be
-inserted into a zone file manually or with a ``$INCLUDE`` statement.
+inserted into a zone file manually or with an ``$INCLUDE`` statement.
 
 The ``.private`` file contains algorithm-specific fields. For obvious
 security reasons, this file does not have general read permission.
@@ -310,7 +304,7 @@ To generate an ECDSAP256SHA256 zone-signing key for the zone
 
 ``dnssec-keygen -a ECDSAP256SHA256 example.com``
 
-The command would print a string of the form:
+The command prints a string of the form:
 
 ``Kexample.com.+013+26160``
 

bin/dnssec/dnssec-revoke.c

@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/file.h>
@@ -40,14 +41,14 @@ const char *program = "dnssec-revoke";
 
 static isc_mem_t *mctx = NULL;
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
 	fprintf(stderr, "Usage:\n");
 	fprintf(stderr, "    %s [options] keyfile\n\n", program);
-	fprintf(stderr, "Version: %s\n", VERSION);
+	fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
 #if USE_PKCS11
 	fprintf(stderr,
 		"    -E engine:    specify PKCS#11 provider "

bin/dnssec/dnssec-revoke.rst

@@ -41,38 +41,38 @@ containing the now-revoked key.
 Options
 ~~~~~~~
 
-**-h**
-   Emit usage message and exit.
+``-h``
+   This option emits a usage message and exits.
 
-**-K** directory
-   Sets the directory in which the key files are to reside.
+``-K directory``
+   This option sets the directory in which the key files are to reside.
 
-**-r**
-   After writing the new keyset files remove the original keyset files.
+``-r``
+   This option indicates to remove the original keyset files after writing the new keyset files.
 
-**-v** level
-   Sets the debugging level.
+``-v level``
+   This option sets the debugging level.
 
-**-V**
-   Prints version information.
+``-V``
+   This option prints version information.
 
-**-E** engine
-   Specifies the cryptographic hardware to use, when applicable.
+``-E engine``
+   This option specifies the cryptographic hardware to use, when applicable.
 
-   When BIND is built with OpenSSL PKCS#11 support, this defaults to the
-   string "pkcs11", which identifies an OpenSSL engine that can drive a
+   When BIND 9 is built with OpenSSL PKCS#11 support, this defaults to the
+   string ``pkcs11``, which identifies an OpenSSL engine that can drive a
    cryptographic accelerator or hardware service module. When BIND is
-   built with native PKCS#11 cryptography (--enable-native-pkcs11), it
+   built with native PKCS#11 cryptography (``--enable-native-pkcs11``), it
    defaults to the path of the PKCS#11 provider library specified via
-   "--with-pkcs11".
+   ``--with-pkcs11``.
 
-**-f**
-   Force overwrite: Causes ``dnssec-revoke`` to write the new key pair
+``-f``
+   This option indicates a forced overwrite and causes ``dnssec-revoke`` to write the new key pair,
    even if a file already exists matching the algorithm and key ID of
    the revoked key.
 
-**-R**
-   Print the key tag of the key with the REVOKE bit set but do not
+``-R``
+   This option prints the key tag of the key with the REVOKE bit set, but does not
    revoke the key.
 
 See Also

bin/dnssec/dnssec-settime.c

@@ -18,6 +18,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/file.h>
@@ -44,14 +45,14 @@ const char *program = "dnssec-settime";
 
 static isc_mem_t *mctx = NULL;
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
 	fprintf(stderr, "Usage:\n");
 	fprintf(stderr, "    %s [options] keyfile\n\n", program);
-	fprintf(stderr, "Version: %s\n", VERSION);
+	fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
 	fprintf(stderr, "General options:\n");
 #if USE_PKCS11
 	fprintf(stderr,

bin/dnssec/dnssec-settime.rst

@@ -40,7 +40,7 @@ timing metadata as specified by the ``-P``, ``-A``, ``-R``, ``-I``, and
 other signing software to determine when a key is to be published,
 whether it should be used for signing a zone, etc.
 
-If none of these options is set on the command line, then
+If none of these options is set on the command line,
 ``dnssec-settime`` simply prints the key timing metadata already stored
 in the key.
 
@@ -54,155 +54,157 @@ the key file. The private file's permissions are always set to be
 inaccessible to anyone other than the owner (mode 0600).
 
 When working with state files, it is possible to update the timing metadata in
-those files as well with ``-s``.  If this option is used you can also update key
+those files as well with ``-s``.  With this option, it is also possible to update key
 states with ``-d`` (DS), ``-k`` (DNSKEY), ``-r`` (RRSIG of KSK), or ``-z``
 (RRSIG of ZSK). Allowed states are HIDDEN, RUMOURED, OMNIPRESENT, and
 UNRETENTIVE.
 
-You can also set the goal state of the key with ``-g``.  This should be either
-HIDDEN or OMNIPRESENT (representing whether the key should be removed from the
-zone, or published).
+The goal state of the key can also be set with ``-g``. This should be either
+HIDDEN or OMNIPRESENT, representing whether the key should be removed from the
+zone or published.
 
-It is NOT RECOMMENDED to manipulate state files manually except for testing
+It is NOT RECOMMENDED to manipulate state files manually, except for testing
 purposes.
 
 Options
 ~~~~~~~
 
-**-f**
-   Force an update of an old-format key with no metadata fields. Without
-   this option, ``dnssec-settime`` will fail when attempting to update a
-   legacy key. With this option, the key will be recreated in the new
+``-f``
+   This option forces an update of an old-format key with no metadata fields. Without
+   this option, ``dnssec-settime`` fails when attempting to update a
+   legacy key. With this option, the key is recreated in the new
    format, but with the original key data retained. The key's creation
-   date will be set to the present time. If no other values are
-   specified, then the key's publication and activation dates will also
-   be set to the present time.
+   date is set to the present time. If no other values are
+   specified, then the key's publication and activation dates are also
+   set to the present time.
 
-**-K** directory
-   Sets the directory in which the key files are to reside.
+``-K directory``
+   This option sets the directory in which the key files are to reside.
 
-**-L** ttl
-   Sets the default TTL to use for this key when it is converted into a
-   DNSKEY RR. If the key is imported into a zone, this is the TTL that
-   will be used for it, unless there was already a DNSKEY RRset in
-   place, in which case the existing TTL would take precedence. If this
-   value is not set and there is no existing DNSKEY RRset, the TTL will
-   default to the SOA TTL. Setting the default TTL to ``0`` or ``none``
+``-L ttl``
+   This option sets the default TTL to use for this key when it is converted into a
+   DNSKEY RR. This is the TTL used when the key is imported into a zone,
+   unless there was already a DNSKEY RRset in
+   place, in which case the existing TTL takes precedence. If this
+   value is not set and there is no existing DNSKEY RRset, the TTL
+   defaults to the SOA TTL. Setting the default TTL to ``0`` or ``none``
    removes it from the key.
 
-**-h**
-   Emit usage message and exit.
+``-h``
+   This option emits a usage message and exits.
 
-**-V**
-   Prints version information.
+``-V``
+   This option prints version information.
 
-**-v** level
-   Sets the debugging level.
+``-v level``
+   This option sets the debugging level.
 
-**-E** engine
-   Specifies the cryptographic hardware to use, when applicable.
+``-E engine``
+   This option specifies the cryptographic hardware to use, when applicable.
 
    When BIND is built with OpenSSL PKCS#11 support, this defaults to the
-   string "pkcs11", which identifies an OpenSSL engine that can drive a
+   string ``pkcs11``, which identifies an OpenSSL engine that can drive a
    cryptographic accelerator or hardware service module. When BIND is
-   built with native PKCS#11 cryptography (--enable-native-pkcs11), it
+   built with native PKCS#11 cryptography (``--enable-native-pkcs11``), it
    defaults to the path of the PKCS#11 provider library specified via
-   "--with-pkcs11".
+   ``--with-pkcs11``.
 
 Timing Options
 ~~~~~~~~~~~~~~
 
 Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS. If the
-argument begins with a '+' or '-', it is interpreted as an offset from
+argument begins with a ``+`` or ``-``, it is interpreted as an offset from
 the present time. For convenience, if such an offset is followed by one
-of the suffixes 'y', 'mo', 'w', 'd', 'h', or 'mi', then the offset is
+of the suffixes ``y``, ``mo``, ``w``, ``d``, ``h``, or ``mi``, then the offset is
 computed in years (defined as 365 24-hour days, ignoring leap years),
 months (defined as 30 24-hour days), weeks, days, hours, or minutes,
 respectively. Without a suffix, the offset is computed in seconds. To
-unset a date, use 'none' or 'never'.
+explicitly prevent a date from being set, use ``none`` or ``never``.
 
-**-P** date/offset
-   Sets the date on which a key is to be published to the zone. After
-   that date, the key will be included in the zone but will not be used
+``-P date/offset``
+   This option sets the date on which a key is to be published to the zone. After
+   that date, the key is included in the zone but is not used
    to sign it.
 
-**-P** sync date/offset
-   Sets the date on which CDS and CDNSKEY records that match this key
+``-P sync date/offset``
+   This option sets the date on which CDS and CDNSKEY records that match this key
    are to be published to the zone.
 
-**-A** date/offset
-   Sets the date on which the key is to be activated. After that date,
-   the key will be included in the zone and used to sign it.
+``-A date/offset``
+   This option sets the date on which the key is to be activated. After that date,
+   the key is included in the zone and used to sign it. 
 
-**-R** date/offset
-   Sets the date on which the key is to be revoked. After that date, the
-   key will be flagged as revoked. It will be included in the zone and
-   will be used to sign it.
+``-R date/offset``
+   This option sets the date on which the key is to be revoked. After that date, the
+   key is flagged as revoked. It is included in the zone and
+   is used to sign it.
 
-**-I** date/offset
-   Sets the date on which the key is to be retired. After that date, the
-   key will still be included in the zone, but it will not be used to
+``-I date/offset``
+   This option sets the date on which the key is to be retired. After that date, the
+   key is still included in the zone, but it is not used to
    sign it.
 
-**-D** date/offset
-   Sets the date on which the key is to be deleted. After that date, the
-   key will no longer be included in the zone. (It may remain in the key
-   repository, however.)
+``-D date/offset``
+   This option sets the date on which the key is to be deleted. After that date, the
+   key is no longer included in the zone. (However, it may remain in the key
+   repository.)
 
-**-D** sync date/offset
-   Sets the date on which the CDS and CDNSKEY records that match this
+``-D sync date/offset``
+   This option sets the date on which the CDS and CDNSKEY records that match this
    key are to be deleted.
 
-**-S** predecessor key
-   Select a key for which the key being modified will be an explicit
+``-S predecessor key``
+   This option selects a key for which the key being modified is an explicit
    successor. The name, algorithm, size, and type of the predecessor key
    must exactly match those of the key being modified. The activation
-   date of the successor key will be set to the inactivation date of the
-   predecessor. The publication date will be set to the activation date
+   date of the successor key is set to the inactivation date of the
+   predecessor. The publication date is set to the activation date
    minus the prepublication interval, which defaults to 30 days.
 
-**-i** interval
-   Sets the prepublication interval for a key. If set, then the
+``-i interval``
+   This option sets the prepublication interval for a key. If set, then the
    publication and activation dates must be separated by at least this
    much time. If the activation date is specified but the publication
-   date isn't, then the publication date will default to this much time
+   date is not, the publication date defaults to this much time
    before the activation date; conversely, if the publication date is
-   specified but activation date isn't, then activation will be set to
+   specified but not the activation date, activation is set to
    this much time after publication.
 
-   If the key is being set to be an explicit successor to another key,
+   If the key is being created as an explicit successor to another key,
    then the default prepublication interval is 30 days; otherwise it is
    zero.
 
    As with date offsets, if the argument is followed by one of the
-   suffixes 'y', 'mo', 'w', 'd', 'h', or 'mi', then the interval is
+   suffixes ``y``, ``mo``, ``w``, ``d``, ``h``, or ``mi``, the interval is
    measured in years, months, weeks, days, hours, or minutes,
    respectively. Without a suffix, the interval is measured in seconds.
 
 Key State Options
 ~~~~~~~~~~~~~~~~~
 
-Known key states are HIDDEN, RUMOURED, OMNIPRESENT and UNRETENTIVE. These should
-not be set manually except for testing purposes.
+To test dnssec-policy it may be necessary to construct keys with artificial
+state information; these options are used by the testing framework for that
+purpose, but should never be used in production.
+
+Known key states are HIDDEN, RUMOURED, OMNIPRESENT, and UNRETENTIVE.
 
 ``-s``
-   When setting key timing data, also update the state file.
+   This option indicates that when setting key timing data, the state file should also be updated.
 
-``-g``
-   Set the goal state for this key. Must be HIDDEN or OMNIPRESENT.
+``-g state``
+   This option sets the goal state for this key. Must be HIDDEN or OMNIPRESENT.
 
-``-d``
-   Set the DS state for this key, and when it was last changed.
+``-d state date/offset``
+   This option sets the DS state for this key as of the specified date, offset from the current date.
 
-``-k``
-   Set the DNSKEY state for this key, and when it was last changed.
+``-k state date/offset``
+   This option sets the DNSKEY state for this key as of the specified date, offset from the current date.
 
-``-r``
-   Set the RRSIG (KSK) state for this key, and when it was last changed.
+``-r state date/offset``
+   This option sets the RRSIG (KSK) state for this key as of the specified date, offset from the current date.
 
-``-z``
-
-   Set the RRSIG (ZSK) state for this key, and when it was last changed.
+``-z state date/offset``
+   This option sets the RRSIG (ZSK) state for this key as of the specified date, offset from the current date.
 
 Printing Options
 ~~~~~~~~~~~~~~~~
@@ -210,18 +212,18 @@ Printing Options
 ``dnssec-settime`` can also be used to print the timing metadata
 associated with a key.
 
-**-u**
-   Print times in UNIX epoch format.
+``-u``
+   This option indicates that times should be printed in Unix epoch format.
 
-**-p** C/P/Psync/A/R/I/D/Dsync/all
-   Print a specific metadata value or set of metadata values. The ``-p``
+``-p C/P/Psync/A/R/I/D/Dsync/all``
+   This option prints a specific metadata value or set of metadata values. The ``-p``
    option may be followed by one or more of the following letters or
    strings to indicate which value or values to print: ``C`` for the
    creation date, ``P`` for the publication date, ``Psync`` for the CDS
    and CDNSKEY publication date, ``A`` for the activation date, ``R``
    for the revocation date, ``I`` for the inactivation date, ``D`` for
    the deletion date, and ``Dsync`` for the CDS and CDNSKEY deletion
-   date To print all of the metadata, use ``-p all``.
+   date. To print all of the metadata, use ``all``.
 
 See Also
 ~~~~~~~~

bin/dnssec/dnssec-signzone.c

@@ -33,6 +33,7 @@
 
 #include <isc/app.h>
 #include <isc/atomic.h>
+#include <isc/attributes.h>
 #include <isc/base32.h>
 #include <isc/commandline.h>
 #include <isc/event.h>
@@ -3125,11 +3126,11 @@ print_version(FILE *fp) {
 		return;
 	}
 
-	fprintf(fp, "; dnssec_signzone version " VERSION "\n");
+	fprintf(fp, "; dnssec_signzone version %s\n", PACKAGE_VERSION);
 }
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
@@ -3138,7 +3139,7 @@ usage(void) {
 
 	fprintf(stderr, "\n");
 
-	fprintf(stderr, "Version: %s\n", VERSION);
+	fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
 
 	fprintf(stderr, "Options: (default value in parenthesis) \n");
 	fprintf(stderr, "\t-S:\tsmart signing: automatically finds key files\n"

bin/dnssec/dnssec-signzone.rst

@@ -34,233 +34,232 @@ Synopsis
 Description
 ~~~~~~~~~~~
 
-``dnssec-signzone`` signs a zone. It generates NSEC and RRSIG records
+``dnssec-signzone`` signs a zone; it generates NSEC and RRSIG records
 and produces a signed version of the zone. The security status of
 delegations from the signed zone (that is, whether the child zones are
-secure or not) is determined by the presence or absence of a ``keyset``
+secure) is determined by the presence or absence of a ``keyset``
 file for each child zone.
 
 Options
 ~~~~~~~
 
-**-a**
-   Verify all generated signatures.
+``-a``
+   This option verifies all generated signatures.
 
-**-c** class
-   Specifies the DNS class of the zone.
+``-c class``
+   This option specifies the DNS class of the zone.
 
-**-C**
-   Compatibility mode: Generate a ``keyset-zonename`` file in addition
+``-C``
+   This option sets compatibility mode, in which a ``keyset-zonename`` file is generated in addition
    to ``dsset-zonename`` when signing a zone, for use by older versions
    of ``dnssec-signzone``.
 
-**-d** directory
-   Look for ``dsset-`` or ``keyset-`` files in ``directory``.
+``-d directory``
+   This option indicates the directory where BIND 9 should look for ``dsset-`` or ``keyset-`` files.
 
-**-D**
-   Output only those record types automatically managed by
-   ``dnssec-signzone``, i.e. RRSIG, NSEC, NSEC3 and NSEC3PARAM records.
+``-D``
+   This option indicates that only those record types automatically managed by
+   ``dnssec-signzone``, i.e., RRSIG, NSEC, NSEC3 and NSEC3PARAM records, should be included in the output.
    If smart signing (``-S``) is used, DNSKEY records are also included.
    The resulting file can be included in the original zone file with
    ``$INCLUDE``. This option cannot be combined with ``-O raw``,
-   ``-O map``, or serial number updating.
+   ``-O map``, or serial-number updating.
 
-**-E** engine
-   When applicable, specifies the hardware to use for cryptographic
-   operations, such as a secure key store used for signing.
+``-E engine``
+   This option specifies the hardware to use for cryptographic
+   operations, such as a secure key store used for signing, when applicable.
 
    When BIND is built with OpenSSL PKCS#11 support, this defaults to the
-   string "pkcs11", which identifies an OpenSSL engine that can drive a
+   string ``pkcs11``, which identifies an OpenSSL engine that can drive a
    cryptographic accelerator or hardware service module. When BIND is
-   built with native PKCS#11 cryptography (--enable-native-pkcs11), it
+   built with native PKCS#11 cryptography (``--enable-native-pkcs11``), it
    defaults to the path of the PKCS#11 provider library specified via
-   "--with-pkcs11".
+   ``--with-pkcs11``.
 
-**-g**
-   Generate DS records for child zones from ``dsset-`` or ``keyset-``
-   file. Existing DS records will be removed.
+``-g``
+   This option indicates that DS records for child zones should be generated from a ``dsset-`` or ``keyset-``
+   file. Existing DS records are removed.
 
-**-K** directory
-   Key repository: Specify a directory to search for DNSSEC keys. If not
-   specified, defaults to the current directory.
+``-K directory``
+   This option specifies the directory to search for DNSSEC keys. If not
+   specified, it defaults to the current directory.
 
-**-k** key
-   Treat specified key as a key signing key ignoring any key flags. This
+``-k key``
+   This option tells BIND 9 to treat the specified key as a key-signing key, ignoring any key flags. This
    option may be specified multiple times.
 
-**-M** maxttl
-   Sets the maximum TTL for the signed zone. Any TTL higher than maxttl
-   in the input zone will be reduced to maxttl in the output. This
+``-M maxttl``
+   This option sets the maximum TTL for the signed zone. Any TTL higher than ``maxttl``
+   in the input zone is reduced to ``maxttl`` in the output. This
    provides certainty as to the largest possible TTL in the signed zone,
-   which is useful to know when rolling keys because it is the longest
+   which is useful to know when rolling keys. The maxttl is the longest
    possible time before signatures that have been retrieved by resolvers
-   will expire from resolver caches. Zones that are signed with this
+   expire from resolver caches. Zones that are signed with this
    option should be configured to use a matching ``max-zone-ttl`` in
    ``named.conf``. (Note: This option is incompatible with ``-D``,
    because it modifies non-DNSSEC data in the output zone.)
 
-**-s** start-time
-   Specify the date and time when the generated RRSIG records become
+``-s start-time``
+   This option specifies the date and time when the generated RRSIG records become
    valid. This can be either an absolute or relative time. An absolute
    start time is indicated by a number in YYYYMMDDHHMMSS notation;
    20000530144500 denotes 14:45:00 UTC on May 30th, 2000. A relative
-   start time is indicated by +N, which is N seconds from the current
+   start time is indicated by ``+N``, which is N seconds from the current
    time. If no ``start-time`` is specified, the current time minus 1
    hour (to allow for clock skew) is used.
 
-**-e** end-time
-   Specify the date and time when the generated RRSIG records expire. As
+``-e end-time``
+   This option specifies the date and time when the generated RRSIG records expire. As
    with ``start-time``, an absolute time is indicated in YYYYMMDDHHMMSS
-   notation. A time relative to the start time is indicated with +N,
+   notation. A time relative to the start time is indicated with ``+N``,
    which is N seconds from the start time. A time relative to the
-   current time is indicated with now+N. If no ``end-time`` is
-   specified, 30 days from the start time is used as a default.
+   current time is indicated with ``now+N``. If no ``end-time`` is
+   specified, 30 days from the start time is the default.
    ``end-time`` must be later than ``start-time``.
 
-**-X** extended end-time
-   Specify the date and time when the generated RRSIG records for the
-   DNSKEY RRset will expire. This is to be used in cases when the DNSKEY
+``-X extended end-time``
+   This option specifies the date and time when the generated RRSIG records for the
+   DNSKEY RRset expire. This is to be used in cases when the DNSKEY
    signatures need to persist longer than signatures on other records;
    e.g., when the private component of the KSK is kept offline and the
    KSK signature is to be refreshed manually.
 
-   As with ``start-time``, an absolute time is indicated in
+   As with ``end-time``, an absolute time is indicated in
    YYYYMMDDHHMMSS notation. A time relative to the start time is
-   indicated with +N, which is N seconds from the start time. A time
-   relative to the current time is indicated with now+N. If no
+   indicated with ``+N``, which is N seconds from the start time. A time
+   relative to the current time is indicated with ``now+N``. If no
    ``extended end-time`` is specified, the value of ``end-time`` is used
    as the default. (``end-time``, in turn, defaults to 30 days from the
    start time.) ``extended end-time`` must be later than ``start-time``.
 
-**-f** output-file
-   The name of the output file containing the signed zone. The default
+``-f output-file``
+   This option indicates the name of the output file containing the signed zone. The default
    is to append ``.signed`` to the input filename. If ``output-file`` is
-   set to ``"-"``, then the signed zone is written to the standard
-   output, with a default output format of "full".
+   set to ``-``, then the signed zone is written to the standard
+   output, with a default output format of ``full``.
 
-**-h**
-   Prints a short summary of the options and arguments to
+``-h``
+   This option prints a short summary of the options and arguments to
    ``dnssec-signzone``.
 
-**-V**
-   Prints version information.
+``-V``
+   This option prints version information.
 
-**-i** interval
-   When a previously-signed zone is passed as input, records may be
-   resigned. The ``interval`` option specifies the cycle interval as an
-   offset from the current time (in seconds). If a RRSIG record expires
-   after the cycle interval, it is retained. Otherwise, it is considered
-   to be expiring soon, and it will be replaced.
+``-i interval``
+   This option indicates that, when a previously signed zone is passed as input, records may be
+   re-signed. The ``interval`` option specifies the cycle interval as an
+   offset from the current time, in seconds. If a RRSIG record expires
+   after the cycle interval, it is retained; otherwise, it is considered
+   to be expiring soon and it is replaced.
 
    The default cycle interval is one quarter of the difference between
-   the signature end and start times. So if neither ``end-time`` or
-   ``start-time`` are specified, ``dnssec-signzone`` generates
+   the signature end and start times. So if neither ``end-time`` nor
+   ``start-time`` is specified, ``dnssec-signzone`` generates
    signatures that are valid for 30 days, with a cycle interval of 7.5
    days. Therefore, if any existing RRSIG records are due to expire in
-   less than 7.5 days, they would be replaced.
+   less than 7.5 days, they are replaced.
 
-**-I** input-format
-   The format of the input zone file. Possible formats are ``"text"``
-   (default), ``"raw"``, and ``"map"``. This option is primarily
-   intended to be used for dynamic signed zones so that the dumped zone
+``-I input-format``
+   This option sets the format of the input zone file. Possible formats are ``text``
+   (the default), ``raw``, and ``map``. This option is primarily
+   intended to be used for dynamic signed zones, so that the dumped zone
    file in a non-text format containing updates can be signed directly.
-   The use of this option does not make much sense for non-dynamic
-   zones.
+   This option is not useful for non-dynamic zones.
 
-**-j** jitter
+``-j jitter``
    When signing a zone with a fixed signature lifetime, all RRSIG
-   records issued at the time of signing expires simultaneously. If the
-   zone is incrementally signed, i.e. a previously-signed zone is passed
-   as input to the signer, all expired signatures have to be regenerated
-   at about the same time. The ``jitter`` option specifies a jitter
-   window that will be used to randomize the signature expire time, thus
+   records issued at the time of signing expire simultaneously. If the
+   zone is incrementally signed, i.e., a previously signed zone is passed
+   as input to the signer, all expired signatures must be regenerated
+   at approximately the same time. The ``jitter`` option specifies a jitter
+   window that is used to randomize the signature expire time, thus
    spreading incremental signature regeneration over time.
 
-   Signature lifetime jitter also to some extent benefits validators and
-   servers by spreading out cache expiration, i.e. if large numbers of
-   RRSIGs don't expire at the same time from all caches there will be
-   less congestion than if all validators need to refetch at mostly the
+   Signature lifetime jitter also, to some extent, benefits validators and
+   servers by spreading out cache expiration, i.e., if large numbers of
+   RRSIGs do not expire at the same time from all caches, there is
+   less congestion than if all validators need to refetch at around the
    same time.
 
-**-L** serial
-   When writing a signed zone to "raw" or "map" format, set the "source
-   serial" value in the header to the specified serial number. (This is
+``-L serial``
+   When writing a signed zone to "raw" or "map" format, this option sets the "source
+   serial" value in the header to the specified ``serial`` number. (This is
    expected to be used primarily for testing purposes.)
 
-**-n** ncpus
-   Specifies the number of threads to use. By default, one thread is
+``-n ncpus``
+   This option specifies the number of threads to use. By default, one thread is
    started for each detected CPU.
 
-**-N** soa-serial-format
-   The SOA serial number format of the signed zone. Possible formats are
-   ``"keep"`` (default), ``"increment"``, ``"unixtime"``, and
-   ``"date"``.
+``-N soa-serial-format``
+   This option sets the SOA serial number format of the signed zone. Possible formats are
+   ``keep`` (the default), ``increment``, ``unixtime``, and
+   ``date``.
 
-   ``"keep"``
-      Do not modify the SOA serial number.
+   **keep**
+      This format indicates that the SOA serial number should not be modified.
 
-   ``"increment"``
-      Increment the SOA serial number using :rfc:`1982` arithmetic.
+   **increment**
+      This format increments the SOA serial number using :rfc:`1982` arithmetic.
 
-   ``"unixtime"``
-      Set the SOA serial number to the number of seconds since epoch.
+   **unixtime**
+      This format sets the SOA serial number to the number of seconds since the beginning of the Unix epoch.
 
-   ``"date"``
-      Set the SOA serial number to today's date in YYYYMMDDNN format.
+   **date**
+      This format sets the SOA serial number to today's date, in YYYYMMDDNN format.
 
-**-o** origin
-   The zone origin. If not specified, the name of the zone file is
+``-o origin``
+   This option sets the zone origin. If not specified, the name of the zone file is
    assumed to be the origin.
 
-**-O** output-format
-   The format of the output file containing the signed zone. Possible
-   formats are ``"text"`` (default), which is the standard textual
-   representation of the zone; ``"full"``, which is text output in a
-   format suitable for processing by external scripts; and ``"map"``,
-   ``"raw"``, and ``"raw=N"``, which store the zone in binary formats
-   for rapid loading by ``named``. ``"raw=N"`` specifies the format
+``-O output-format``
+   This option sets the format of the output file containing the signed zone. Possible
+   formats are ``text`` (the default), which is the standard textual
+   representation of the zone; ``full``, which is text output in a
+   format suitable for processing by external scripts; and ``map``,
+   ``raw``, and ``raw=N``, which store the zone in binary formats
+   for rapid loading by ``named``. ``raw=N`` specifies the format
    version of the raw zone file: if N is 0, the raw file can be read by
    any version of ``named``; if N is 1, the file can be read by release
-   9.9.0 or higher; the default is 1.
+   9.9.0 or higher. The default is 1.
 
-**-P**
-   Disable post sign verification tests.
+``-P``
+   This option disables post-sign verification tests.
 
-   The post sign verification test ensures that for each algorithm in
-   use there is at least one non revoked self signed KSK key, that all
-   revoked KSK keys are self signed, and that all records in the zone
+   The post-sign verification tests ensure that for each algorithm in
+   use there is at least one non-revoked self-signed KSK key, that all
+   revoked KSK keys are self-signed, and that all records in the zone
    are signed by the algorithm. This option skips these tests.
 
-**-Q**
-   Remove signatures from keys that are no longer active.
+``-Q``
+   This option removes signatures from keys that are no longer active.
 
-   Normally, when a previously-signed zone is passed as input to the
+   Normally, when a previously signed zone is passed as input to the
    signer, and a DNSKEY record has been removed and replaced with a new
    one, signatures from the old key that are still within their validity
    period are retained. This allows the zone to continue to validate
-   with cached copies of the old DNSKEY RRset. The ``-Q`` forces
+   with cached copies of the old DNSKEY RRset. The ``-Q`` option forces
    ``dnssec-signzone`` to remove signatures from keys that are no longer
    active. This enables ZSK rollover using the procedure described in
    :rfc:`4641#4.2.1.1` ("Pre-Publish Key Rollover").
 
 ``-q``
-   Quiet mode: Suppresses unnecessary output.  Without this option, when
-   ``dnssec-signzone`` is run it will print to standard output the number of
-   keys in use, the algorithms used to verify the zone was signed correctly and
-   other status information, and finally the filename containing the signed
-   zone.  With it, that output is suppressed, leaving only the filename.
+   This option enables quiet mode, which suppresses unnecessary output. Without this option, when
+   ``dnssec-signzone`` is run it prints three pieces of information to standard output: the number of
+   keys in use; the algorithms used to verify the zone was signed correctly and
+   other status information; and the filename containing the signed
+   zone. With the option that output is suppressed, leaving only the filename.
 
-**-R**
-   Remove signatures from keys that are no longer published.
+``-R``
+   This option removes signatures from keys that are no longer published.
 
    This option is similar to ``-Q``, except it forces
-   ``dnssec-signzone`` to signatures from keys that are no longer
+   ``dnssec-signzone`` to remove signatures from keys that are no longer
    published. This enables ZSK rollover using the procedure described in
    :rfc:`4641#4.2.1.2` ("Double Signature Zone Signing Key
    Rollover").
 
-**-S**
-   Smart signing: Instructs ``dnssec-signzone`` to search the key
+``-S``
+   This option enables smart signing, which instructs ``dnssec-signzone`` to search the key
    repository for keys that match the zone being signed, and to include
    them in the zone if appropriate.
 
@@ -274,94 +273,94 @@ Options
       If the key's publication date is set and is in the past, the key
       is published in the zone.
 
-      If the key's activation date is set and in the past, the key is
+      If the key's activation date is set and is in the past, the key is
       published (regardless of publication date) and used to sign the
       zone.
 
-      If the key's revocation date is set and in the past, and the key
+      If the key's revocation date is set and is in the past, and the key
       is published, then the key is revoked, and the revoked key is used
       to sign the zone.
 
-      If either of the key's unpublication or deletion dates are set and
+      If either the key's unpublication or deletion date is set and
       in the past, the key is NOT published or used to sign the zone,
       regardless of any other metadata.
 
-      If key's sync publication date is set and in the past,
+      If the key's sync publication date is set and is in the past,
       synchronization records (type CDS and/or CDNSKEY) are created.
 
-      If key's sync deletion date is set and in the past,
+      If the key's sync deletion date is set and is in the past,
       synchronization records (type CDS and/or CDNSKEY) are removed.
 
-**-T** ttl
-   Specifies a TTL to be used for new DNSKEY records imported into the
+``-T ttl``
+   This option specifies a TTL to be used for new DNSKEY records imported into the
    zone from the key repository. If not specified, the default is the
    TTL value from the zone's SOA record. This option is ignored when
    signing without ``-S``, since DNSKEY records are not imported from
    the key repository in that case. It is also ignored if there are any
    pre-existing DNSKEY records at the zone apex, in which case new
-   records' TTL values will be set to match them, or if any of the
-   imported DNSKEY records had a default TTL value. In the event of a a
+   records' TTL values are set to match them, or if any of the
+   imported DNSKEY records had a default TTL value. In the event of a
    conflict between TTL values in imported keys, the shortest one is
    used.
 
-**-t**
-   Print statistics at completion.
+``-t``
+   This option prints statistics at completion.
 
-**-u**
-   Update NSEC/NSEC3 chain when re-signing a previously signed zone.
+``-u``
+   This option updates the NSEC/NSEC3 chain when re-signing a previously signed zone.
    With this option, a zone signed with NSEC can be switched to NSEC3,
-   or a zone signed with NSEC3 can be switch to NSEC or to NSEC3 with
-   different parameters. Without this option, ``dnssec-signzone`` will
-   retain the existing chain when re-signing.
+   or a zone signed with NSEC3 can be switched to NSEC or to NSEC3 with
+   different parameters. Without this option, ``dnssec-signzone``
+   retains the existing chain when re-signing.
 
-**-v** level
-   Sets the debugging level.
+``-v level``
+   This option sets the debugging level.
 
-**-x**
-   Only sign the DNSKEY, CDNSKEY, and CDS RRsets with key-signing keys,
-   and omit signatures from zone-signing keys. (This is similar to the
+``-x``
+   This option indicates that BIND 9 should only sign the DNSKEY, CDNSKEY, and CDS RRsets with key-signing keys,
+   and should omit signatures from zone-signing keys. (This is similar to the
    ``dnssec-dnskey-kskonly yes;`` zone option in ``named``.)
 
-**-z**
-   Ignore KSK flag on key when determining what to sign. This causes
+``-z``
+   This option indicates that BIND 9 should ignore the KSK flag on keys when determining what to sign. This causes
    KSK-flagged keys to sign all records, not just the DNSKEY RRset.
    (This is similar to the ``update-check-ksk no;`` zone option in
    ``named``.)
 
-**-3** salt
-   Generate an NSEC3 chain with the given hex encoded salt. A dash
-   (salt) can be used to indicate that no salt is to be used when
+``-3 salt``
+   This option generates an NSEC3 chain with the given hex-encoded salt. A dash
+   (-) can be used to indicate that no salt is to be used when
    generating the NSEC3 chain.
 
-**-H** iterations
-   When generating an NSEC3 chain, use this many iterations. The default
+``-H iterations``
+   This option indicates that, when generating an NSEC3 chain, BIND 9 should use this many iterations. The default
    is 10.
 
-**-A**
-   When generating an NSEC3 chain set the OPTOUT flag on all NSEC3
-   records and do not generate NSEC3 records for insecure delegations.
+``-A``
+   This option indicates that, when generating an NSEC3 chain, BIND 9 should set the OPTOUT flag on all NSEC3
+   records and should not generate NSEC3 records for insecure delegations.
 
    Using this option twice (i.e., ``-AA``) turns the OPTOUT flag off for
    all records. This is useful when using the ``-u`` option to modify an
    NSEC3 chain which previously had OPTOUT set.
 
-**zonefile**
-   The file containing the zone to be signed.
+``zonefile``
+   This option sets the file containing the zone to be signed.
 
-**key**
-   Specify which keys should be used to sign the zone. If no keys are
-   specified, then the zone will be examined for DNSKEY records at the
-   zone apex. If these are found and there are matching private keys, in
-   the current directory, then these will be used for signing.
+``key``
+   This option specifies which keys should be used to sign the zone. If no keys are
+   specified, the zone is examined for DNSKEY records at the
+   zone apex. If these records are found and there are matching private keys in
+   the current directory, they are used for signing.
 
 Example
 ~~~~~~~
 
 The following command signs the ``example.com`` zone with the
-ECDSAP256SHA256 key generated by key generated by ``dnssec-keygen``
+ECDSAP256SHA256 key generated by ``dnssec-keygen``
 (Kexample.com.+013+17247). Because the ``-S`` option is not being used,
 the zone's keys must be in the master file (``db.example.com``). This
-invocation looks for ``dsset`` files, in the current directory, so that
+invocation looks for ``dsset`` files in the current directory, so that
 DS records can be imported from them (``-g``).
 
 ::
@@ -373,7 +372,7 @@ DS records can be imported from them (``-g``).
 
 In the above example, ``dnssec-signzone`` creates the file
 ``db.example.com.signed``. This file should be referenced in a zone
-statement in a ``named.conf`` file.
+statement in the ``named.conf`` file.
 
 This example re-signs a previously signed zone with default parameters.
 The private keys are assumed to be in the current directory.

bin/dnssec/dnssec-verify.c

@@ -16,6 +16,7 @@
 #include <time.h>
 
 #include <isc/app.h>
+#include <isc/attributes.h>
 #include <isc/base32.h>
 #include <isc/commandline.h>
 #include <isc/event.h>
@@ -137,8 +138,8 @@ loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) {
 	}
 }
 
-ISC_PLATFORM_NORETURN_PRE static void
-usage(void) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN static void
+usage(void);
 
 static void
 usage(void) {
@@ -147,7 +148,7 @@ usage(void) {
 
 	fprintf(stderr, "\n");
 
-	fprintf(stderr, "Version: %s\n", VERSION);
+	fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
 
 	fprintf(stderr, "Options: (default value in parenthesis) \n");
 	fprintf(stderr, "\t-v debuglevel (0)\n");

bin/dnssec/dnssec-verify.rst

@@ -35,72 +35,72 @@ Description
 ~~~~~~~~~~~
 
 ``dnssec-verify`` verifies that a zone is fully signed for each
-algorithm found in the DNSKEY RRset for the zone, and that the NSEC /
-NSEC3 chains are complete.
+algorithm found in the DNSKEY RRset for the zone, and that the
+NSEC/NSEC3 chains are complete.
 
 Options
 ~~~~~~~
 
-**-c** class
-   Specifies the DNS class of the zone.
+``-c class``
+   This option specifies the DNS class of the zone.
 
-**-E** engine
-   Specifies the cryptographic hardware to use, when applicable.
+``-E engine``
+   This option specifies the cryptographic hardware to use, when applicable.
 
    When BIND is built with OpenSSL PKCS#11 support, this defaults to the
-   string "pkcs11", which identifies an OpenSSL engine that can drive a
+   string ``pkcs11``, which identifies an OpenSSL engine that can drive a
    cryptographic accelerator or hardware service module. When BIND is
-   built with native PKCS#11 cryptography (--enable-native-pkcs11), it
+   built with native PKCS#11 cryptography (``--enable-native-pkcs11``), it
    defaults to the path of the PKCS#11 provider library specified via
-   "--with-pkcs11".
+   ``--with-pkcs11``.
 
-**-I** input-format
-   The format of the input zone file. Possible formats are ``"text"``
-   (default) and ``"raw"``. This option is primarily intended to be used
-   for dynamic signed zones so that the dumped zone file in a non-text
-   format containing updates can be verified independently. The use of
-   this option does not make much sense for non-dynamic zones.
+``-I input-format``
+   This option sets the format of the input zone file. Possible formats are ``text``
+   (the default) and ``raw``. This option is primarily intended to be used
+   for dynamic signed zones, so that the dumped zone file in a non-text
+   format containing updates can be verified independently.
+   This option is not useful for non-dynamic zones.
 
-**-o** origin
-   The zone origin. If not specified, the name of the zone file is
+``-o origin``
+   This option indicates the zone origin. If not specified, the name of the zone file is
    assumed to be the origin.
 
-**-v** level
-   Sets the debugging level.
+``-v level``
+   This option sets the debugging level.
 
-**-V**
-   Prints version information.
+``-V``
+   This option prints version information.
 
 ``-q``
-   Quiet mode: Suppresses output.  Without this option, when ``dnssec-verify``
-   is run it will print to standard output the number of keys in use, the
-   algorithms used to verify the zone was signed correctly and other status
-   information.  With it, all non-error output is suppressed, and only the exit
-   code will indicate success.
+   This option sets quiet mode, which suppresses output.  Without this option, when ``dnssec-verify``
+   is run it prints to standard output the number of keys in use, the
+   algorithms used to verify the zone was signed correctly, and other status
+   information.  With this option, all non-error output is suppressed, and only the exit
+   code indicates success.
 
-**-x**
-   Only verify that the DNSKEY RRset is signed with key-signing keys.
-   Without this flag, it is assumed that the DNSKEY RRset will be signed
-   by all active keys. When this flag is set, it will not be an error if
+``-x``
+   This option verifies only that the DNSKEY RRset is signed with key-signing keys.
+   Without this flag, it is assumed that the DNSKEY RRset is signed
+   by all active keys. When this flag is set, it is not an error if
    the DNSKEY RRset is not signed by zone-signing keys. This corresponds
    to the ``-x`` option in ``dnssec-signzone``.
 
-**-z**
-   Ignore the KSK flag on the keys when determining whether the zone if
-   correctly signed. Without this flag it is assumed that there will be
+``-z``
+   This option indicates that the KSK flag on the keys should be ignored when determining whether the zone is
+   correctly signed. Without this flag, it is assumed that there is
    a non-revoked, self-signed DNSKEY with the KSK flag set for each
-   algorithm and that RRsets other than DNSKEY RRset will be signed with
+   algorithm, and that RRsets other than DNSKEY RRset are signed with
    a different DNSKEY without the KSK flag set.
 
-   With this flag set, we only require that for each algorithm, there
-   will be at least one non-revoked, self-signed DNSKEY, regardless of
-   the KSK flag state, and that other RRsets will be signed by a
+   With this flag set, BIND 9 only requires that for each algorithm, there
+   be at least one non-revoked, self-signed DNSKEY, regardless of
+   the KSK flag state, and that other RRsets be signed by a
    non-revoked key for the same algorithm that includes the self-signed
    key; the same key may be used for both purposes. This corresponds to
    the ``-z`` option in ``dnssec-signzone``.
 
-**zonefile**
-   The file containing the zone to be signed.
+``zonefile``
+   This option indicates the file containing the zone to be signed.
 
 See Also
 ~~~~~~~~

bin/dnssec/dnssectool.c

@@ -112,7 +112,7 @@ vbprintf(int level, const char *fmt, ...) {
 
 void
 version(const char *name) {
-	fprintf(stderr, "%s %s\n", name, VERSION);
+	fprintf(stderr, "%s %s\n", name, PACKAGE_VERSION);
 	exit(0);
 }
 

bin/dnssec/dnssectool.h

@@ -15,6 +15,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
+#include <isc/attributes.h>
 #include <isc/log.h>
 #include <isc/platform.h>
 #include <isc/stdtime.h>
@@ -42,9 +43,8 @@ extern uint8_t dtype[8];
 
 typedef void(fatalcallback_t)(void);
 
-ISC_PLATFORM_NORETURN_PRE void
-fatal(const char *format, ...)
-	ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN void
+fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
 
 void
 setfatalcallback(fatalcallback_t *callback);
@@ -55,8 +55,8 @@ check_result(isc_result_t result, const char *message);
 void
 vbprintf(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3);
 
-ISC_PLATFORM_NORETURN_PRE void
-version(const char *program) ISC_PLATFORM_NORETURN_POST;
+ISC_NORETURN void
+version(const char *program);
 
 void
 sig_format(dns_rdata_rrsig_t *sig, char *cp, unsigned int size);

bin/dnssec/win32/cds.vcxproj.in

@@ -115,6 +115,17 @@
   <ItemGroup>
     <ClCompile Include="..\dnssec-cds.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\dnssec\win32\dnssectool.vcxproj">
+      <Project>{2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/dnssec/win32/dnssectool.vcxproj.in

@@ -112,6 +112,14 @@
       <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/dnssec/win32/dsfromkey.vcxproj.in

@@ -141,6 +141,17 @@ set PYTHONPATH=.
   <ItemGroup>
     <ClCompile Include="..\dnssec-dsfromkey.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\dnssec\win32\dnssectool.vcxproj">
+      <Project>{2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/dnssec/win32/importkey.vcxproj.in

@@ -115,6 +115,17 @@
   <ItemGroup>
     <ClCompile Include="..\dnssec-importkey.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\dnssec\win32\dnssectool.vcxproj">
+      <Project>{2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/dnssec/win32/keyfromlabel.vcxproj.in

@@ -115,6 +115,17 @@
   <ItemGroup>
     <ClCompile Include="..\dnssec-keyfromlabel.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\dnssec\win32\dnssectool.vcxproj">
+      <Project>{2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

bin/dnssec/win32/keygen.vcxproj.in

@@ -115,6 +115,20 @@
   <ItemGroup>
     <ClCompile Include="..\dnssec-keygen.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\lib\isc\win32\libisc.vcxproj">
+      <Project>{3840E563-D180-4761-AA9C-E6155F02EAFF}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\dns\win32\libdns.vcxproj">
+      <Project>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\lib\isccfg\win32\libisccfg.vcxproj">
+      <Project>{B2DFA58C-6347-478E-81E8-01E06999D4F1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\bin\dnssec\win32\dnssectool.vcxproj">
+      <Project>{2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>