From: Tony Finch <dot@dot.at>
Date: Mon, 19 Sep 2005 18:00:47 +0000 (+0000)
Subject: Exim produced the error message "an SRV record indicated no SMTP
X-Git-Tag: exim-4_53~5
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=66afa40353d7dccfb7d35d6d67bf6408d46bbe8f;p=exim.git

Exim produced the error message "an SRV record indicated no SMTP
service" if it encountered an MX record with an empty target hostname.
The message is now "an MX or SRV record indicated no SMTP service".
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 1d047283d..390f04d23 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.237 2005/09/19 14:01:51 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.238 2005/09/19 18:00:47 fanf2 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -212,6 +212,10 @@ PH/49 Michael Haardt's randomized retrying, but as a separate retry parameter
 
 PH/50 Make never_users, trusted_users, admin_groups, trusted_groups expandable.
 
+TF/07 Exim produced the error message "an SRV record indicated no SMTP
+      service" if it encountered an MX record with an empty target hostname.
+      The message is now "an MX or SRV record indicated no SMTP service".
+
 
 Exim version 4.52
 -----------------
diff --git a/src/src/routers/dnslookup.c b/src/src/routers/dnslookup.c
index 9a9fba15a..9abdc81e5 100644
--- a/src/src/routers/dnslookup.c
+++ b/src/src/routers/dnslookup.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/routers/dnslookup.c,v 1.7 2005/09/19 09:41:37 fanf2 Exp $ */
+/* $Cambridge: exim/src/src/routers/dnslookup.c,v 1.8 2005/09/19 18:00:47 fanf2 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -304,9 +304,9 @@ for (;;)
 
   if (rc != HOST_FIND_FAILED) break;
 
-  /* Check to see if the failure is the result of MX records pointing
-  to non-existent domains, and if so, set an appropriate error message; the
-  case of an SRV record pointing to "." is another special case that we can
+  /* Check to see if the failure is the result of MX records pointing to
+  non-existent domains, and if so, set an appropriate error message; the case
+  of an MX or SRV record pointing to "." is another special case that we can
   detect. Otherwise "unknown mail domain" is used, which is confusing. Also, in
   this case don't do the widening. We need check only the first host to see if
   its MX has been filled in, but there is no address, because if there were any
@@ -319,7 +319,7 @@ for (;;)
     {
     setflag(addr, af_pass_message);   /* This is not a security risk */
     if (h.name[0] == 0)
-      addr->message = US"an SRV record indicated no SMTP service";
+      addr->message = US"an MX or SRV record indicated no SMTP service";
     else
       {
       addr->message = US"all relevant MX records point to non-existent hosts";