base.m4: Only get picky about HELO hostnames from external servers.

diff --git a/base.m4 b/base.m4
index e7036c7ffb56bae559158f9065134837ca86cf7a..8f962bb4462f44f7bbe6d39ab24426938a65ed77 100644 (file)
--- 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
 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
        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\
                 add_header = :after_received:X-Distorted-Warning: \
                        BADHELO \
                        Client's HELO doesn't match its IP address.\n\t\