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

[user/henk/code/exim.git] / src / src / parse.c

diff --git a/src/src/parse.c b/src/src/parse.c
index ff814e738b6217b3f6207350c6c7fecead9a64ae..9e57365be4891d6739e454d02f88682b634b9f2a 100644 (file)
--- a/src/src/parse.c
+++ b/src/src/parse.c
@@ -550,9 +550,7 @@ read_addr_spec(uschar *s, uschar *t, int term, uschar **errorptr,
 {
 s = read_local_part(s, t, errorptr, FALSE);
 if (*errorptr == NULL)
-  {
   if (*s != term)
-    {
     if (*s != '@')
       *errorptr = string_sprintf("\"@\" or \".\" expected after \"%s\"", t);
     else
@@ -562,8 +560,6 @@ if (*errorptr == NULL)
       *domainptr = t;
       s = read_domain(s, t, errorptr);
       }
-    }
-  }
 return s;
 }
 
@@ -817,7 +813,7 @@ if (*end - *start > ADDRESS_MAXLENGTH)
   return NULL;
   }
 
-return (uschar *)yield;
+return yield;
 
 /* Use goto (via the macro FAILED) to get to here from a variety of places.
 We might have an empty address in a group - the caller can choose to ignore