From dfc29774cf7b983220045248b37d127da06848d6 Mon Sep 17 00:00:00 2001
From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Sun, 13 Nov 2022 22:31:44 +0100
Subject: [PATCH] [postfix] Require HELO.

---
 postfix/main.cf   | 5 +++++
 postfix/master.cf | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/postfix/main.cf b/postfix/main.cf
index 6c16a37..ac143ec 100644
--- 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 e59f0de..761f017 100644
--- 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
-- 
2.39.5