From: Mark Andrews <marka@isc.org>
Date: Mon, 29 Oct 2018 05:49:33 +0000 (+1100)
Subject: Only set IPV6_USE_MIN_MTU on IPv6.
X-Git-Tag: v9.13.4~79^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=561b780ba08cd5f612b8412271dce4139c948784;p=thirdparty%2Fbind9.git

Only set IPV6_USE_MIN_MTU on IPv6.
---

diff --git a/CHANGES b/CHANGES
index 24b52236912..e01ce1b2f58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+5065.	[bug]		Only set IPV6_USE_MIN_MTU on IPv6. [GL #553]
+
 5064.	[test]		Initalize TZ environment variable before calling
 			dns_test_begin in dnstap_test. [GL #624]
 
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 20601d6622e..626f52f8614 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1291,7 +1291,7 @@ build_msghdr_send(isc__socket_t *sock, char* cmsgbuf, isc_socketevent_t *dev,
 	}
 
 #if defined(IPV6_USE_MIN_MTU)
-	if ((sock->type == isc_sockettype_udp) &&
+	if ((sock->type == isc_sockettype_udp) && (sock->pf == AF_INET6) &&
 	    ((dev->attributes & ISC_SOCKEVENTATTR_USEMINMTU) != 0))
 	{
 		int use_min_mtu = 1;	/* -1, 0, 1 */