From da549bfcb8f1822c2ad2ee3f759e42edaa58d266 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 22 Dec 2011 08:10:09 +0000 Subject: [PATCH] 3254. [bug] Set isc_socket_ipv6only() on the IPv6 control channels. [RT #22249] --- CHANGES | 3 +++ bin/named/controlconf.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 9135893965..2f98470bea 100644 --- 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 93e51f1025..f757b8e33c 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: controlconf.c,v 1.60.544.2 2011/03/12 04:59:14 tbox Exp $ */ +/* $Id: controlconf.c,v 1.60.544.3 2011/12/22 08:10:09 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);