Fallback to hostname without retrying ptr lookup in exim (#2259)

* Fallback to hostname without retrying ptr lookup in exim

* Adjust spacing

Co-authored-by: Raphael Schneeberger <rs@scit.ch>

install/deb/exim/exim4.conf.4.94.template

@@ -9,7 +9,7 @@
 #CLAMD = yes
 
 smtp_banner = $smtp_active_hostname
-smtp_active_hostname = ${lookup dnsdb{>: ptr=$interface_address}{${listextract{1}{$value}}}{$primary_hostname}}
+smtp_active_hostname = ${lookup dnsdb{>: defer_never,ptr=$interface_address}{${listextract{1}{$value}}}{$primary_hostname}}
 add_environment = <; PATH=/bin:/usr/bin
 keep_environment =
 disable_ipv6 = true
@@ -345,7 +345,7 @@ smtp_relay_smtp:
 
 remote_smtp:
   driver = smtp
-  helo_data = ${lookup dnsdb{>: ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}}
+  helo_data = ${lookup dnsdb{>: defer_never,ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}}
   dkim_domain = DKIM_DOMAIN
   dkim_selector = mail
   dkim_private_key = DKIM_PRIVATE_KEY

install/deb/exim/exim4.conf.template

@@ -9,7 +9,7 @@
 #CLAMD = yes
 
 smtp_banner = $smtp_active_hostname
-smtp_active_hostname = ${lookup dnsdb{>: ptr=$interface_address}{${listextract{1}{$value}}}{$primary_hostname}}
+smtp_active_hostname = ${lookup dnsdb{>: defer_never,ptr=$interface_address}{${listextract{1}{$value}}}{$primary_hostname}}
 add_environment = <; PATH=/bin:/usr/bin
 keep_environment =
 disable_ipv6 = true
@@ -345,7 +345,7 @@ smtp_relay_smtp:
 
 remote_smtp:
   driver = smtp
-  helo_data = ${lookup dnsdb{>: ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}}
+  helo_data = ${lookup dnsdb{>: defer_never,ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}}
   dkim_domain = DKIM_DOMAIN
   dkim_selector = mail
   dkim_private_key = DKIM_PRIVATE_KEY

install/upgrade/versions/1.5.1.sh

@@ -41,3 +41,11 @@ esac
 
 echo "[ * ] Update /etc/apt/sources.list.d/hestia.list"
 sed -i "s|deb https://$RHOST/ $codename main|deb [arch=$ARCH] https://$RHOST/ $codename main|g" /etc/apt/sources.list.d/hestia.list
+
+if [ -n "$MAIL_SYSTEM" ]; then
+    echo "[ ! ] Update Exim config"
+    if [ -f "/etc/exim4/exim4.conf.template" ]; then
+        sed -i 's/^smtp_active_hostname = \${lookup dnsdb{>: ptr=\$interface_address}{\${listextract{1}{\$value}}}{\$primary_hostname}}$/smtp_active_hostname = \${lookup dnsdb{>: defer_never,ptr=\$interface_address}{\${listextract{1}{\$value}}}{\$primary_hostname}}/' /etc/exim4/exim4.conf.template
+        sed -i 's/^  helo_data = \${lookup dnsdb{>: ptr=\$sending_ip_address}{\${listextract{1}{\$value}}}{\$primary_hostname}}$/  helo_data = \${lookup dnsdb{>: defer_never,ptr=\$sending_ip_address}{\${listextract{1}{\$value}}}{\$primary_hostname}}/' /etc/exim4/exim4.conf.template
+    fi
+fi