3254. [bug] Set isc_socket_ipv6only() on the IPv6 control channels.

                        [RT #22249]

diff --git a/CHANGES b/CHANGES
index ba705af22b753d2858857ab45b6f627cc621520a..7b74da4dec14a1669ea11d725ac543fae53cfc4a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3254.  [bug]           Set isc_socket_ipv6only() on the IPv6 control channels.
+                       [RT #22249]
+
 3253.  [bug]           Return DNS_R_SYNTAX when the input to a text field is
                        too long. [RT #26956]
 

diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 775152a5a0ca81d28aed26a0b4aef170fecb4b66..e8ad7a429fb83cf9b0cb63638b89f063be7cabc2 100644 (file)
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: controlconf.c,v 1.60.70.2 2011/03/12 04:57:23 tbox Exp $ */
+/* $Id: controlconf.c,v 1.60.70.3 2011/12/22 08:12:21 marka Exp $ */
 
 /*! \file */
 
@@ -1148,6 +1148,11 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp,
        if (result == ISC_R_SUCCESS)
                isc_socket_setname(listener->sock, "control", NULL);
 
+#ifndef ISC_ALLOW_MAPPED
+       if (result == ISC_R_SUCCESS)
+               isc_socket_ipv6only(listener->sock, ISC_TRUE);
+#endif
+
        if (result == ISC_R_SUCCESS)
                result = isc_socket_bind(listener->sock, &listener->address,
                                         ISC_SOCKET_REUSEADDRESS);