diff --git a/CHANGES b/CHANGES
index 431b65bc20..34e8325f3b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+3529. [func] Named now listens on both IPv4 and IPv6 interfaces
+ by default. Named previously only listened on IPv4
+ interfaces by default unless named was running in
+ IPv6 only mode. [RT #32945]
+
3528. [func] New "dnssec-coverage" command scans the timing
metadata for a set of DNSSEC keys and reports if a
lapse in signing coverage has been scheduled
diff --git a/README b/README
index b0a32f2a25..b1519bfab5 100644
--- a/README
+++ b/README
@@ -51,6 +51,10 @@ BIND 9
For up-to-date release notes and errata, see
http://www.isc.org/software/bind9/releasenotes
+BIND 9.10.0
+
+ Named now listens on both IPv4 and IPv6 interfaces by default.
+
BIND 9.9.0
BIND 9.9.0 includes a number of changes from BIND 9.8 and earlier
diff --git a/bin/named/config.c b/bin/named/config.c
index dcde6747ee..bd1df75408 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -71,7 +71,7 @@ options {\n\
host-statistics no;\n\
interface-interval 60;\n\
listen-on {any;};\n\
- listen-on-v6 {none;};\n\
+ listen-on-v6 {any;};\n\
match-mapped-addresses no;\n\
max-rsa-exponent-size 0; /* no limit */\n\
memstatistics-file \"named.memstats\";\n\
diff --git a/bin/named/server.c b/bin/named/server.c
index 3fc676a113..84ac1b8900 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -5300,13 +5300,11 @@ load_configuration(const char *filename, ns_server_t *server,
ns_g_aclconfctx,
ns_g_mctx, &listenon);
} else if (!ns_g_lwresdonly) {
- isc_boolean_t enable;
/*
* Not specified, use default.
*/
- enable = ISC_TF(isc_net_probeipv4() != ISC_R_SUCCESS);
CHECK(ns_listenlist_default(ns_g_mctx, listen_port,
- enable, &listenon));
+ ISC_TRUE, &listenon));
}
if (listenon != NULL) {
ns_interfacemgr_setlistenon6(server->interfacemgr,
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 3cd31c056a..df4c02db3b 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -7719,8 +7719,8 @@ listen-on port 1234 { !1.2.3.4; 1.2/16; };
The listen-on-v6 option is used to
specify the interfaces and the ports on which the server will
- listen
- for incoming queries sent using IPv6.
+ listen for incoming queries sent using IPv6. If not specified,
+ the server will listen on port 53 on all IPv6 interfaces.
@@ -7769,13 +7769,6 @@ listen-on-v6 port 1234 { !2001:db8::/32; any; };
listen-on-v6 { none; };
-
- If no listen-on-v6 option is
- specified, the server will not listen on any IPv6 address
- unless -6 is specified when named is
- invoked. If -6 is specified then
- named will listen on port 53 on all IPv6 interfaces by default.
-