X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/12d3b444e8703fb16cc4d8e9fe267d3d0aa11c6e..945da4acd058761e3ecc640f3237a92cd90bf6f3:/base.m4

diff --git a/base.m4 b/base.m4
index e7036c7..506c4e0 100644
--- a/base.m4
+++ b/base.m4
@@ -152,9 +152,15 @@ 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
-		 add_header = :after_received:X-Distorted-Warning: \
+		!condition = ${if eq{$acl_c_mode}{submission}}
+		!hosts = +allnets
+		 add_header = :after_received:X-CONF_header_token-Warning: \
 			BADHELO \
 			Client's HELO doesn't match its IP address.\n\t\
 			helo-name=$sender_helo_name \