[postfix] Require HELO.

diff --git a/postfix/main.cf b/postfix/main.cf
index 6c16a376abbe1fb71c9cb0114b1ad8a8e524c9fb..ac143ec57048365d9802f2005a38a805b01b0b51 100644 (file)
--- a/postfix/main.cf
+++ b/postfix/main.cf
@@ -35,6 +35,11 @@ mailbox_transport = lmtp:unix:private/dovecot-lmtp
 
 smtpd_reject_unlisted_sender = yes
 
+# HELO command
+smtpd_helo_restrictions = reject_invalid_helo_hostname,
+  reject_non_fqdn_helo_hostname
+smtpd_helo_required = yes
+
 # Message rewrite
 always_add_missing_headers = yes
 

diff --git a/postfix/master.cf b/postfix/master.cf
index e59f0de47cc6b80fd4e5111ac8bbb001ae1a4c47..761f017768f26725b6e8bd018eaf730e87363d9c 100644 (file)
--- a/postfix/master.cf
+++ b/postfix/master.cf
@@ -15,7 +15,6 @@ smtp       inet  n       -       y       -       -       smtpd
 #dnsblog   unix  -       -       y       -       0       dnsblog
 #tlsproxy  unix  -       -       y       -       0       tlsproxy
 submission inet  n       -       y       -       -       smtpd
-  -o smtpd_helo_restrictions=$mua_helo_restrictions
   -o milter_macro_daemon_name=ORIGINATING
 #smtps     inet  n       -       y       -       -       smtpd
 #  -o syslog_name=postfix/smtps