From f14d870d1582de53cf43e6be6466039833a63d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 2 Jun 2021 17:41:17 +0200 Subject: [PATCH 1/2] Fix copy&paste error in setsockopt_off Because of copy&paste error the setsockopt_off macro would enable the socket option instead of disabling it. --- lib/isc/netmgr/netmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c index 0b708b57d5..bb55bf5ab8 100644 --- a/lib/isc/netmgr/netmgr.c +++ b/lib/isc/netmgr/netmgr.c @@ -2985,7 +2985,7 @@ isc__nm_closesocket(uv_os_sock_t sock) { setsockopt(socket, level, name, &(int){ 1 }, sizeof(int)) #define setsockopt_off(socket, level, name) \ - setsockopt(socket, level, name, &(int){ 1 }, sizeof(int)) + setsockopt(socket, level, name, &(int){ 0 }, sizeof(int)) isc_result_t isc__nm_socket_freebind(uv_os_sock_t fd, sa_family_t sa_family) { From 22aa929aac63e77430c2e174af59276a8e64b07e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 2 Jun 2021 17:44:16 +0200 Subject: [PATCH 2/2] Add CHANGES and release note for [GL #2746] --- CHANGES | 3 +++ doc/notes/notes-current.rst | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/CHANGES b/CHANGES index 9b37ab14fe..d4f2df86eb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5652. [bug] Copy and paste error caused the socket option to + be enabled instead of disabled. [GL #2746] + 5651. [func] Refactor zone dumping to be processed asynchronously via the uv_work_t thread pool API. [GL #2732] diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst index 4694b063b5..330a86c8be 100644 --- a/doc/notes/notes-current.rst +++ b/doc/notes/notes-current.rst @@ -72,3 +72,7 @@ Bug Fixes - Fixed an assertion failure that could occur if stale data was used to answer a query, and then a prefetch was triggered after the query was restarted (for example, to follow a CNAME). :gl:`#2733` + +- Fix an error that would enable don't fragment socket option instead + of disabling it leading to errors when sending the oversized UDP + packets. [GL #2746]