Do not use the A lookup following an AAAA for setting the FQDN. Bug 1588

[exim.git] / src / src / host.c

diff --git a/src/src/host.c b/src/src/host.c
index 45ec13659c7fd524531ee2814127fc9182db1207..206751757d4775359094e0f5442ab834d35169d4 100644 (file)
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -2380,7 +2380,10 @@ for (; i >= 0; i--)
 
   /* Lookup succeeded: fill in the given host item with the first non-ignored
   address found; create additional items for any others. A single A6 record
-  may generate more than one address. */
+  may generate more than one address.  The lookup had a chance to update the
+  fqdn; we do not want any later times round the loop to do so. */
+
+  fully_qualified_name = NULL;
 
   for (rr = dns_next_rr(&dnsa, &dnss, RESET_ANSWERS);
        rr != NULL;