From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 27 Sep 2012 21:00:55 +0000 (+0100)
Subject: Unbreak non-ipv6 build.
X-Git-Tag: exim-4_81_RC1~3^2~67
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=6abc190a70df97fc85e53192a62a61981c77fede

Unbreak non-ipv6 build.

My commit 3a7963704c519 broke compilation without HAVE_IPv6.  Rework.
---

diff --git a/src/src/lookups/dnsdb.c b/src/src/lookups/dnsdb.c
index ec1cd159a..a8eab2e47 100644
--- a/src/src/lookups/dnsdb.c
+++ b/src/src/lookups/dnsdb.c
@@ -296,19 +296,21 @@ while ((domain = string_nextinlist(&keystring, &sep, buffer, sizeof(buffer)))
     the final "nothing found" result, but carry on to the next domain. */
 
     found = domain;
+#if HAVE_IPV6
     if (type == T_APL)		/* NB cannot happen unless HAVE_IPV6 */
       {
-#if HAVE_IPV6 && defined(SUPPORT_A6)
-      if (searchtype == T_APL)  searchtype = T_A6;
-#endif
-#if HAVE_IPV6 && !defined(SUPPORT_A6)
-      if (searchtype == T_APL)  searchtype = T_AAAA;
-#endif
+      if (searchtype == T_APL)
+# if defined(SUPPORT_A6)
+                                     searchtype = T_A6;
+# else
+                                     searchtype = T_AAAA;
+# endif
       else if (searchtype == T_A6)   searchtype = T_AAAA;
       else if (searchtype == T_AAAA) searchtype = T_A;
       rc = dns_special_lookup(&dnsa, domain, searchtype, &found);
       }
     else
+#endif
       rc = dns_special_lookup(&dnsa, domain, type, &found);
 
     if (rc == DNS_NOMATCH || rc == DNS_NODATA) continue;