From: Ondřej Surý <ondrej@isc.org>
Date: Thu, 8 Oct 2020 06:26:28 +0000 (+0200)
Subject: Always set the DF flag (not only when CMSG is available)
X-Git-Tag: v9.17.6~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1672e851c848b3d11b01360e74eeda5526752ab6;p=thirdparty%2Fbind9.git

Always set the DF flag (not only when CMSG is available)

By mistake, we were setting the DF flag only when CMSG was available for
said platform.
---

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 62c82899325..e3f11082423 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -2348,8 +2348,6 @@ again:
 #endif /* IPV6_RECVPKTINFO */
 #endif /* defined(USE_CMSG) */
 
-		set_ip_dontfrag(sock);
-
 #if defined(SET_RCVBUF)
 		optlen = sizeof(size);
 		if (getsockopt(sock->fd, SOL_SOCKET, SO_RCVBUF, (void *)&size,
@@ -2416,6 +2414,8 @@ again:
 #endif /* ifdef IP_RECVTOS */
 #endif /* defined(USE_CMSG) || defined(SET_RCVBUF) || defined(SET_SNDBUF) */
 
+	set_ip_dontfrag(sock);
+
 setup_done:
 	inc_stats(manager->stats, sock->statsindex[STATID_OPEN]);
 	if (sock->active == 0) {