Add DNS based HELO to outgoing mail (#2190)

* Add DNS based HELO to outgoing mail

Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>

CHANGELOG.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 
 ## Features
 
+- Improve HELO based system and use RDNS lookup instead our old system
+
 ### Bugfixes
 
 - Disable /reset/ endpoint when POLICY_SYSTEM_PASSWORD_RESET = no

bin/v-add-sys-ip

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: add system ip address
-# options: IP NETMASK [INTERFACE] [USER] [IP_STATUS] [IP_NAME] [NAT_IP] [HELO]
+# options: IP NETMASK [INTERFACE] [USER] [IP_STATUS] [IP_NAME] [NAT_IP]
 # labels:
 #
 # example: v-add-sys-ip 216.239.32.21 255.255.255.0
@@ -28,7 +28,6 @@ user="${4-admin}"
 ip_status="${5-shared}"
 ip_name=$6
 nat_ip=$7
-helo=$8
 
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf
@@ -46,7 +45,7 @@ source_conf "$HESTIA/conf/hestia.conf"
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '2' "$#" 'IP NETMASK [INTERFACE] [USER] [STATUS] [NAME] [NATED_IP] [HELO]'
+check_args '2' "$#" 'IP NETMASK [INTERFACE] [USER] [STATUS] [NAME] [NATED_IP]'
 is_format_valid 'ip' 'netmask' 'iface' 'user' 'ip_status'
 is_ip_free
 is_object_valid 'user' 'USER' "$user"
@@ -57,9 +56,6 @@ fi
 if [ -n "$nat_ip" ] ; then
     is_format_valid 'nat_ip'
 fi
-if [ -n "$helo" ] ; then
-    is_format_valid 'helo'
-fi
 if [ "$user" != "admin" ]; then
     ip_status="dedicated"
 fi
@@ -133,7 +129,6 @@ U_WEB_DOMAINS='0'
 INTERFACE='$iface'
 NETMASK='$netmask'
 NAT='$nat_ip'
-HELO='$helo'
 TIME='$time'
 DATE='$date'" > $HESTIA/data/ips/$ip
 chmod 660 $HESTIA/data/ips/$ip
@@ -235,11 +230,6 @@ if [ -n "$FIREWALL_SYSTEM" ]; then
     $BIN/v-update-firewall
 fi
 
-# Update ip helo for exim
-if [ -n "$MAIL_SYSTEM" ] && [ -n "$helo" ]; then
-    $BIN/v-change-sys-ip-helo "$ip" "$helo"
-fi
-
 # Logging
 $BIN/v-log-action "system" "Info" "Network" "Added new IP address to the system (IP: $ip)."
 log_event "$OK" "$ARGUMENTS"

bin/v-change-sys-hostname

@@ -14,7 +14,6 @@
 
 # Argument definition
 domain=$1
-helo=${2-yes}
 
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf
@@ -29,7 +28,7 @@ source_conf "$HESTIA/conf/hestia.conf"
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '1' "$#" 'HOSTNAME [HELO]'
+check_args '1' "$#" 'HOSTNAME'
 is_format_valid 'domain'
 
 # Perform verification if read-only mode is enabled
@@ -64,12 +63,6 @@ else
     fi
 fi
 
-# Update ip helo for exim
-if [[ -n "$MAIL_SYSTEM" && "$helo" == "yes" ]]; then
-    pub_ip=$(curl --ipv4 -s https://ip.hestiacp.com/)
-    $BIN/v-change-sys-ip-helo $pub_ip $domain
-fi
-
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#

bin/v-change-sys-ip-helo

@@ -1,71 +0,0 @@
-#!/bin/bash
-# info: change ip HELO/SMTP Banner
-# options: IP HELO
-#
-# The function for changing HELO/SMTP Banner associated with ip.
-
-
-#----------------------------------------------------------#
-#                    Variable&Function                     #
-#----------------------------------------------------------#
-
-# Argument definition
-ip=$1
-helo=$2
-
-# Includes
-# shellcheck source=/etc/hestiacp/hestia.conf
-source /etc/hestiacp/hestia.conf
-# shellcheck source=/usr/local/hestia/func/main.sh
-source $HESTIA/func/main.sh
-# shellcheck source=/usr/local/hestia/func/ip.sh
-source $HESTIA/func/ip.sh
-# load config file
-source_conf "$HESTIA/conf/hestia.conf"
-
-# Check if mail system is installed
-if [ -z "$MAIL_SYSTEM" ]; then
-    check_result "$E_NOTEXIST" "Mail system not installed"
-fi
-
-if [ ! -e "$HESTIA/data/ips/$ip" ]; then 
-    exit;
-fi
-
-#----------------------------------------------------------#
-#                    Verifications                         #
-#----------------------------------------------------------#
-
-check_args '2' "$#" 'IP HELO'
-is_format_valid 'ip'
-is_format_valid 'helo'
-is_ip_valid "$ip"
-
-# Perform verification if read-only mode is enabled
-check_hestia_demo_mode
-
-
-#----------------------------------------------------------#
-#                       Action                             #
-#----------------------------------------------------------#
-
-# Check if IP address is behind NAT configuration and if so use Public IP for HELO
-source_conf "$HESTIA/data/ips/$ip"
-
-if [  -z "$NAT" ]; then 
-    # Change ip HELO/SMTP Banner
-    update_ip_helo_value "$ip" "$helo"
-else
-    # Change ip HELO/SMTP Banner
-    update_ip_helo_value "$NAT" "$helo"
-fi
-
-#----------------------------------------------------------#
-#                       Hestia                             #
-#----------------------------------------------------------#
-
-# Logging
-$BIN/v-log-action "system" "Info" "System" "Configured HELO/SMTP banner (IP: $ip, Value: $helo)."
-log_event "$OK" "$ARGUMENTS"
-
-exit

bin/v-delete-sys-ip

@@ -128,14 +128,6 @@ if [ -n "$PROXY_SYSTEM" ]; then
     fi
 fi
 
-if [ -n "$MAIL_SYSTEM" ]; then
-    if [ -z "$NAT" ]; then 
-        delete_ip_helo_value "$ip"
-    else
-        delete_ip_helo_value "$NAT"
-    fi
-fi
-
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#

bin/v-list-sys-ip

@@ -39,7 +39,6 @@ json_list() {
         "INTERFACE": "'$INTERFACE'",
         "NETMASK": "'$NETMASK'",
         "NAT": "'$NAT'",
-        "HELO": "'$HELO'",
         "TIME": "'$TIME'",
         "DATE": "'$DATE'"
         }'
@@ -57,7 +56,6 @@ shell_list() {
     echo "NAME:           $NAME"
     echo "USERS:          $U_SYS_USERS"
     echo "DOMAINS:        $U_WEB_DOMAINS"
-    echo "HELO:           $HELO"
     echo "TIME:           $TIME"
     echo "DATE:           $DATE"
 }
@@ -65,15 +63,15 @@ shell_list() {
 # PLAIN list function
 plain_list() {
     echo -ne "$IP\t$OWNER\t$STATUS\t$NAME\t$U_SYS_USERS\t$U_WEB_DOMAINS\t"
-    echo -e "$INTERFACE\t$NETMASK\t$NAT\t$HELO\t$TIME\t$DATE"
+    echo -e "$INTERFACE\t$NETMASK\t$NAT\t$TIME\t$DATE"
 }
 
 # CSV list function
 csv_list() {
     echo -n "IP,OWNER,STATUS,NAME,U_SYS_USERS,U_WEB_DOMAINS,INTERFACE"
-    echo "NETMASK,NAT,HELO,TIME,DATE"
+    echo "NETMASK,NAT,TIME,DATE"
     echo -n "$IP,$OWNER,$STATUS,$NAME,\"$U_SYS_USERS\",$U_WEB_DOMAINS,"
-    echo "$INTERFACE, $NETMASK,$NAT,$HELO,$TIME,$DATE"
+    echo "$INTERFACE, $NETMASK,$NAT,$TIME,$DATE"
 }
 
 

bin/v-list-sys-ips

@@ -41,7 +41,6 @@ json_list() {
         "INTERFACE": "'$INTERFACE'",
         "NETMASK": "'$NETMASK'",
         "NAT": "'$NAT'",
-        "HELO": "'$HELO'",
         "TIME": "'$TIME'",
         "DATE": "'$DATE'"
         }'
@@ -57,17 +56,14 @@ json_list() {
 
 # SHELL list function
 shell_list() {
-    echo "IP   MASK   NAT    HELO                    STATUS   WEB  DATE"
-    echo "--   ----   ---    --------------------    ------   ---  ----"
+    echo "IP   MASK   NAT    STATUS   WEB  DATE"
+    echo "--   ----   ---    ------   ---  ----"
     while read IP; do
         source_conf "$HESTIA/data/ips/$IP"
         if [ -z "$NAT" ]; then
             NAT='no'
         fi
-        if [ -z "$HELO" ]; then
-            HELO='unset'
-        fi
-        echo "$IP $NETMASK $NAT $HELO $STATUS $U_WEB_DOMAINS $DATE"
+        echo "$IP $NETMASK $NAT $STATUS $U_WEB_DOMAINS $DATE"
     done < <(ls $HESTIA/data/ips/)
 }
 
@@ -76,18 +72,18 @@ plain_list() {
     while read IP; do
         source_conf "$HESTIA/data/ips/$IP"
         echo -ne "$IP\t$OWNER\t$STATUS\t$NAME\t$U_SYS_USERS\t$U_WEB_DOMAINS\t"
-        echo -e "$INTERFACE\t$NETMASK\t$NAT\t$HELO\t$TIME\t$DATE"
+        echo -e "$INTERFACE\t$NETMASK\t$NAT\t$TIME\t$DATE"
     done < <(ls $HESTIA/data/ips/)
 }
 
 # CSV list function
 csv_list() {
     echo -n "IP,OWNER,STATUS,NAME,U_SYS_USERS,U_WEB_DOMAINS,INTERFACE"
-    echo "NETMASK,NAT,HELO,TIME,DATE"
+    echo "NETMASK,NAT,TIME,DATE"
     while read IP; do
         source_conf "$HESTIA/data/ips/$IP"
         echo -n "$IP,$OWNER,$STATUS,$NAME,\"$U_SYS_USERS\",$U_WEB_DOMAINS,"
-        echo "$INTERFACE, $NETMASK,$NAT,$HELO,$TIME,$DATE"
+        echo "$INTERFACE, $NETMASK,$NAT,$TIME,$DATE"
     done < <(ls $HESTIA/data/ips/)
 }
 

bin/v-update-sys-ip

@@ -127,15 +127,6 @@ if [ ! -e "$HESTIA/data/ips/$pub_ip" ]; then
     fi
 fi
 
-# Update ip helo for exim
-if [ -n "$MAIL_SYSTEM" ]; then
-    helo=$(is_ip_rdns_valid "$pub_ip")
-
-    if [ -n "$helo" ]; then
-        $BIN/v-change-sys-ip-helo "$ip" "$helo"
-    fi
-fi
-
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#

func/ip.sh

@@ -44,42 +44,6 @@ is_ip_rdns_valid() {
     return 1 # False
 }
 
-# Update ip helo for exim
-update_ip_helo_value() {
-    ip="$1"
-    helo="$2"
-    natip="$1"
-    
-    # In case the IP is an NAT use the real ip address 
-    if [ ! -e "$HESTIA/data/ips/$ip" ]; then
-        ip=$(get_real_ip $ip);
-    fi 
-    
-    # Create or update ip value
-    update_ip_value_new 'HELO' "$helo"
-
-    # Create mailhelo.conf file if doesn't exist
-    if [ ! -e "/etc/${MAIL_SYSTEM}/mailhelo.conf" ]; then
-        touch /etc/${MAIL_SYSTEM}/mailhelo.conf
-    fi
-
-    #Create or update ip:helo pair in mailhelo.conf file
-    if [ -n "$helo" ]; then
-        if [ $(cat /etc/${MAIL_SYSTEM}/mailhelo.conf | grep "$natip") ]; then
-            sed -i "/^$natip:/c $natip:$helo" /etc/${MAIL_SYSTEM}/mailhelo.conf
-        else
-            echo $natip:$helo >> /etc/${MAIL_SYSTEM}/mailhelo.conf
-        fi
-    else
-        sed -i "/^$natip:/d" /etc/${MAIL_SYSTEM}/mailhelo.conf
-    fi
-}
-
-delete_ip_helo_value (){
-    ip=$1
-    sed -i "/^$ip:/d" /etc/${MAIL_SYSTEM}/mailhelo.conf   
-}
-
 # Update ip address value
 update_ip_value() {
     key="$1"

func/main.sh

@@ -1110,7 +1110,6 @@ is_format_valid() {
                 ftp_password)   is_password_format_valid "$arg" ;;
                 ftp_user)       is_user_format_valid "$arg" "$arg_name" ;;
                 hash)           is_hash_format_valid "$arg" "$arg_name" ;;
-                helo)           is_domain_format_valid "$arg" "$arg_name" ;;
                 host)           is_object_format_valid "$arg" "$arg_name" ;;
                 hour)           is_cron_format_valid "$arg" $arg_name ;;
                 id)             is_int_format_valid "$arg" 'id' ;;

func/syshealth.sh

@@ -127,7 +127,7 @@ function syshealth_update_ip_config_format() {
     # IP ADDRESS
     # Create array of known keys in configuration file
     system="ip"
-    known_keys=(OWNER STATUS NAME U_SYS_USERS U_WEB_DOMAINS INTERFACE NETMASK NAT HELO TIME DATE)
+    known_keys=(OWNER STATUS NAME U_SYS_USERS U_WEB_DOMAINS INTERFACE NETMASK NAT TIME DATE)
     write_kv_config_file
     unset system
     unset known_keys

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

@@ -9,7 +9,7 @@
 #CLAMD = yes
 
 smtp_banner = $smtp_active_hostname
-smtp_active_hostname = ${if exists {/etc/exim4/mailhelo.conf}{${lookup{$interface_address}lsearch{/etc/exim4/mailhelo.conf}{$value}{$primary_hostname}}}{$primary_hostname}}
+smtp_active_hostname = ${lookup dnsdb{ptr=$interface_address}{$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 = ${if exists {/etc/exim4/mailhelo.conf}{${lookup{$sending_ip_address}lsearch{/etc/exim4/mailhelo.conf}{$value}{$primary_hostname}}}{$primary_hostname}}
+  helo_data = ${lookup dnsdb{ptr=$sending_ip_address}{$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 = ${if exists {/etc/exim4/mailhelo.conf}{${lookup{$interface_address}lsearch{/etc/exim4/mailhelo.conf}{$value}{$primary_hostname}}}{$primary_hostname}}
+smtp_active_hostname = ${lookup dnsdb{ptr=$interface_address}{$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 = ${if exists {/etc/exim4/mailhelo.conf}{${lookup{$sending_ip_address}lsearch{/etc/exim4/mailhelo.conf}{$value}{$primary_hostname}}}{$primary_hostname}}
+  helo_data = ${lookup dnsdb{ptr=$sending_ip_address}{$value}{$primary_hostname}}
   dkim_domain = DKIM_DOMAIN
   dkim_selector = mail
   dkim_private_key = DKIM_PRIVATE_KEY

install/hst-install-debian.sh

@@ -1214,7 +1214,7 @@ cp -rf $HESTIA_INSTALL_DIR/templates/web/skel/document_errors/* /var/www/documen
 cp -rf $HESTIA_INSTALL_DIR/firewall $HESTIA/data/
 
 # Configuring server hostname
-$HESTIA/bin/v-change-sys-hostname $servername 'no' > /dev/null 2>&1
+$HESTIA/bin/v-change-sys-hostname $servername > /dev/null 2>&1
 
 # Generating SSL certificate
 echo "[ * ] Generating default self-signed SSL certificate..."
@@ -1827,11 +1827,6 @@ if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
     ip=$pub_ip
 fi
 
-if [ "$exim" = 'yes' ]; then
-    # Set HELO for IP as it didn't set during v-change-sys-hostname
-    $HESTIA/bin/v-change-sys-ip-helo $local_ip $servername
-fi
-
 # Configuring libapache2-mod-remoteip
 if [ "$apache" = 'yes' ] && [ "$nginx"  = 'yes' ] ; then
     cd /etc/apache2/mods-available

install/hst-install-ubuntu.sh

@@ -1244,7 +1244,7 @@ cp -rf $HESTIA_INSTALL_DIR/templates/web/skel/document_errors/* /var/www/documen
 cp -rf $HESTIA_INSTALL_DIR/firewall $HESTIA/data/
 
 # Configuring server hostname
-$HESTIA/bin/v-change-sys-hostname $servername 'no' > /dev/null 2>&1
+$HESTIA/bin/v-change-sys-hostname $servername > /dev/null 2>&1
 
 # Generating SSL certificate
 echo "[ * ] Generating default self-signed SSL certificate..."
@@ -1840,11 +1840,6 @@ if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
     ip=$pub_ip
 fi
 
-if [ "$exim" = 'yes' ]; then
-    # Set HELO for IP as it didn't set during v-change-sys-hostname
-    $HESTIA/bin/v-change-sys-ip-helo $local_ip $servername
-fi
-
 # Configuring libapache2-mod-remoteip
 if [ "$apache" = 'yes' ] && [ "$nginx"  = 'yes' ] ; then
     cd /etc/apache2/mods-available

install/upgrade/versions/1.4.18.sh

@@ -19,3 +19,19 @@ if [ -n "$DB_PMA_ALIAS" ]; then
     $HESTIA/bin/v-change-sys-db-alias 'pma' "$DB_PMA_ALIAS"
 fi
 
+if [ -n "$MAIL_SYSTEM" ]; then
+
+    if [ -f "/etc/exim4/exim4.conf.template" ]; then
+        sed -i 's/^smtp_active_hostname = \${if exists {\/etc\/exim4\/mailhelo\.conf}{\${lookup{\$interface_address}lsearch{\/etc\/exim4\/mailhelo\.conf}{\$value}{\$primary_hostname}}}{\$primary_hostname}}$/smtp_active_hostname = \${lookup dnsdb{ptr=\$interface_address}{\$value}{\$primary_hostname}}/' /etc/exim4/exim4.conf.template
+    
+        sed -i 's/^  helo_data = \${if exists {\/etc\/exim4\/mailhelo\.conf}{\${lookup{\$sending_ip_address}lsearch{\/etc\/exim4\/mailhelo\.conf}{\$value}{\$primary_hostname}}}{\$primary_hostname}}$/  helo_data = \${lookup dnsdb{ptr=\$sending_ip_address}{\$value}{\$primary_hostname}}/' /etc/exim4/exim4.conf.template
+    fi
+    
+    # Clean up legacy mailhelo file
+    rm -f /etc/${MAIL_SYSTEM}/mailhelo.conf
+    
+    # Clean up legacy ip variable
+    for ip in $($BIN/v-list-sys-ips plain | cut -f1); do
+        sed '/^HELO/d' $HESTIA/data/ips/$ip;
+    done
+fi

test/test.bats

@@ -545,14 +545,6 @@ function check_ip_not_banned(){
     fi
 }
 
-@test "Ip: Change Helo" {
-    local ip="198.18.0.121"
-    run v-change-sys-ip-helo 198.18.0.121 dev.hestiacp.com
-    assert_success
-    refute_output
-    assert_file_contains /etc/exim4/mailhelo.conf "198.18.0.121:dev.hestiacp.com"
-}
-
 @test "Ip: Delete ips" {
     local ip="198.18.0.12"
     run v-delete-sys-ip $ip

web/add/ip/index.php

@@ -48,7 +48,6 @@ if (!empty($_POST['ok'])) {
     $v_netmask = escapeshellarg($_POST['v_netmask']);
     $v_name = escapeshellarg($_POST['v_name']);
     $v_nat = escapeshellarg($_POST['v_nat']);
-    $v_helo = escapeshellarg($_POST['v_helo']);
     $v_interface = escapeshellarg($_POST['v_interface']);
     $v_owner = escapeshellarg($_POST['v_owner']);
     $v_shared = $_POST['v_shared'];
@@ -63,7 +62,7 @@ if (!empty($_POST['ok'])) {
 
     // Add IP
     if (empty($_SESSION['error_msg'])) {
-        exec(HESTIA_CMD."v-add-sys-ip ".$v_ip." ".$v_netmask." ".$v_interface."  ".$v_owner." ".escapeshellarg($ip_status)." ".$v_name." ".$v_nat." ".$v_helo, $output, $return_var);
+        exec(HESTIA_CMD."v-add-sys-ip ".$v_ip." ".$v_netmask." ".$v_interface."  ".$v_owner." ".escapeshellarg($ip_status)." ".$v_name." ".$v_nat, $output, $return_var);
         check_return_code($return_var, $output);
         unset($output);
         $v_owner = $_POST['v_owner'];
@@ -77,7 +76,6 @@ if (!empty($_POST['ok'])) {
         unset($v_netmask);
         unset($v_name);
         unset($v_nat);
-        unset($v_helo);
     }
 }
 

web/edit/ip/index.php

@@ -33,7 +33,6 @@ $v_netmask = $data[$v_ip]['NETMASK'];
 $v_interace = $data[$v_ip]['INTERFACE'];
 $v_name = $data[$v_ip]['NAME'];
 $v_nat = $data[$v_ip]['NAT'];
-$v_helo = $data[$v_ip]['HELO'];
 $v_ipstatus = $data[$v_ip]['STATUS'];
 if ($v_ipstatus == 'dedicated') {
     $v_dedicated = 'yes';
@@ -100,14 +99,6 @@ if (!empty($_POST['save'])) {
         unset($output);
     }
 
-    // Change HELO/SMTP Banner address
-    if (($v_helo != $_POST['v_helo']) && (empty($_SESSION['error_msg']))) {
-        $v_helo = escapeshellarg($_POST['v_helo']);
-        exec(HESTIA_CMD."v-change-sys-ip-helo ".$v_ip." ".$v_helo, $output, $return_var);
-        check_return_code($return_var, $output);
-        unset($output);
-    }
-
     // Set success message
     if (empty($_SESSION['error_msg'])) {
         $_SESSION['ok_msg'] = _('Changes has been saved.');

web/templates/pages/add_ip.html

@@ -140,16 +140,6 @@
 								<input type="text" size="20" class="vst-input" name="v_nat" value="<?=htmlentities(trim($v_nat, "'"))?>">
 							</td>
 						</tr>
-						<tr style="<?php if ($_SESSION['MAIL_SYSTEM'] != 'exim4') { echo 'display: none;';}?>">
-							<td class="vst-text input-label">
-								<?=_('HELO/SMTP Banner');?> <span class="optional">(<?=_('optional');?>)</span>
-							</td>
-						</tr>
-						<tr style="<?php if ($_SESSION['MAIL_SYSTEM'] != 'exim4') { echo 'display: none;';}?>">
-							<td>
-								<input type="text" size="20" class="vst-input" name="v_helo" value="<?=htmlentities(trim($v_helo, "'"))?>">
-							</td>
-						</tr>
 					</table>
 					<table class="data-col2"></table>
 				</td>

web/templates/pages/edit_ip.html

@@ -134,16 +134,6 @@
 								<input type="text" size="20" class="vst-input" name="v_nat" value="<?=htmlentities(trim($v_nat, "'"))?>">
 							</td>
 						</tr>
-						<tr style="<?php if ($_SESSION['MAIL_SYSTEM'] != 'exim4') { echo 'display: none;';}?>">
-							<td class="vst-text input-label">
-								<?=_('HELO/SMTP Banner');?> <span class="optional">(<?=_('optional');?>)</span>
-							</td>
-						</tr>
-						<tr style="<?php if ($_SESSION['MAIL_SYSTEM'] != 'exim4') { echo 'display: none;';}?>">
-							<td>
-								<input type="text" size="20" class="vst-input" name="v_helo" value="<?=htmlentities(trim($v_helo, "'"))?>">
-							</td>
-						</tr>
 					</table>
 					<table class="data-col2"></table>
 				</td>