From 2f0841cefa225400a5ccaf5afbeb1766b11ab9cf Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Mon, 1 Jun 2015 02:43:47 +0100 Subject: [PATCH] base.m4: Only get picky about HELO hostnames from external servers. --- base.m4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/base.m4 b/base.m4 index e7036c7..8f962bb 100644 --- a/base.m4 +++ b/base.m4 @@ -152,8 +152,14 @@ SECTION(acl, mail)m4_dnl mail: ## If we stashed a warning header about HELO from earlier, we should - ## add it now. + ## add it now. Only don't bother if the client has authenticated + ## successfully for submission (because we can't expect mobile + ## clients to be properly set up knowing their names), or it's one of + ## our own satellites (because they're either properly set up anyway, + ## or satellites using us as a smarthost). warn condition = $acl_c_helo_warning + !condition = ${if eq{$acl_c_mode}{submission}} + !hosts = +allnets add_header = :after_received:X-Distorted-Warning: \ BADHELO \ Client's HELO doesn't match its IP address.\n\t\ -- 2.11.0