Avoid leaving $domain live with bogus info, during server connection startup

(cherry picked from commit cde93db00d4f5cff864070ebfed2d0c36e532e71)

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index b1f442c80fd2ca983d62bfee9499acba7d1d5498..65d76020607c8d58c4fdea4f648044d94c35a568 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -4096,11 +4096,10 @@ while (done <= 0)
       /* Force a reverse lookup if HELO quoted something in helo_lookup_domains
       because otherwise the log can be confusing. */
 
-      if (  !sender_host_name
-         && (deliver_domain = sender_helo_name,  /* set $domain */
-             match_isinlist(sender_helo_name, CUSS &helo_lookup_domains, 0,
-              &domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL)) == OK)
-        (void)host_name_lookup();
+       if (  !sender_host_name
+          && match_isinlist(sender_helo_name, CUSS &helo_lookup_domains, 0,
+               &domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL) == OK)
+         (void)host_name_lookup();
 
       /* Rebuild the fullhost info to include the HELO name (and the real name
       if it was looked up.) */