From 77fcf182a60fdd14d0b8e6c0e6daf88ff6de58e3 Mon Sep 17 00:00:00 2001
From: Niklas Schmitt <ns@znuny.com>
Date: Wed, 8 Nov 2023 13:42:22 +0100
Subject: [PATCH] Revert "Added SysConfig Setting to configure timeout for DNS
 resolver queries. (#390)"

This reverts commit 827f68c78f9253acf17670f6c56962901c023b9e.
---
 Kernel/Config/Files/XML/Framework.xml | 7 -------
 Kernel/System/CheckItem.pm            | 5 ++---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Kernel/Config/Files/XML/Framework.xml b/Kernel/Config/Files/XML/Framework.xml
index 2f4178428f0..13744ddf8ac 100644
--- a/Kernel/Config/Files/XML/Framework.xml
+++ b/Kernel/Config/Files/XML/Framework.xml
@@ -554,13 +554,6 @@
             <Item ValueType="String" ValueRegex="">ns.example.com</Item>
         </Value>
     </Setting>
-    <Setting Name="ResolverTimeout" Required="0" Valid="0">
-        <Description Translatable="1">Sets the timeout (in seconds) for resolver DNS queries (i.e. during checking MX record if CheckMXRecord is enabled to protect against long agent UI responses in case of very slow DNS queries).</Description>
-        <Navigation>Core::Email</Navigation>
-        <Value>
-            <Item ValueType="String" ValueRegex="">3</Item>
-        </Value>
-    </Setting>
     <Setting Name="CheckEmailAddresses" Required="1" Valid="1">
         <Description Translatable="1">Makes the application check the syntax of email addresses.</Description>
         <Navigation>Core::Email</Navigation>
diff --git a/Kernel/System/CheckItem.pm b/Kernel/System/CheckItem.pm
index 6ad659b548b..d7bef61d034 100644
--- a/Kernel/System/CheckItem.pm
+++ b/Kernel/System/CheckItem.pm
@@ -147,9 +147,8 @@ sub CheckEmail {
         if ($Resolver) {
 
             # it's no fun to have this hanging in the web interface
-            my $ResolverTimeout = $ConfigObject->Get('ResolverTimeout') // 3;
-            $Resolver->tcp_timeout($ResolverTimeout);
-            $Resolver->udp_timeout($ResolverTimeout);
+            $Resolver->tcp_timeout(3);
+            $Resolver->udp_timeout(3);
 
             # check if we need to use a specific name server
             my $Nameserver = $ConfigObject->Get('CheckMXRecord::Nameserver');