Debug: fix openssl tls_close() debug output

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

diff --git a/src/src/dns.c b/src/src/dns.c
index f19d23b4c1fda73c50a6cf8c688b3307920c6985..575b815605dba78d7a2f72193e04c1e3179d2f33 100644 (file)
--- a/src/src/dns.c
+++ b/src/src/dns.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2014 */
+/* Copyright (c) University of Cambridge 1995 - 2016 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for interfacing with the DNS. */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for interfacing with the DNS. */


@@ -40,7 +40,6 @@ fakens_search(const uschar *domain, int type, uschar *answerptr, int size)
 {
 int len = Ustrlen(domain);
 int asize = size;                  /* Locally modified */
 {
 int len = Ustrlen(domain);
 int asize = size;                  /* Locally modified */

-uschar *endname;

 uschar name[256];
 uschar utilname[256];
 uschar *aptr = answerptr;          /* Locally modified */
 uschar name[256];
 uschar utilname[256];
 uschar *aptr = answerptr;          /* Locally modified */


@@ -51,33 +50,6 @@ struct stat statbuf;
 if (domain[len - 1] == '.') len--;
 Ustrncpy(name, domain, len);
 name[len] = 0;
 if (domain[len - 1] == '.') len--;
 Ustrncpy(name, domain, len);
 name[len] = 0;

-endname = name + len;
-
-/* This code, for forcing TRY_AGAIN and NO_RECOVERY, is here so that it works
-for the old test suite that uses a real nameserver. When the old test suite is
-eventually abandoned, this code could be moved into the fakens utility. */
-
-if (len >= 14 && Ustrcmp(endname - 14, "test.again.dns") == 0)
-  {
-  int delay = Uatoi(name);  /* digits at the start of the name */
-  DEBUG(D_dns) debug_printf("Return from DNS lookup of %s (%s) faked for testing\n",
-    name, dns_text_type(type));
-  if (delay > 0)
-    {
-    DEBUG(D_dns) debug_printf("delaying %d seconds\n", delay);
-    sleep(delay);
-    }
-  h_errno = TRY_AGAIN;
-  return -1;
-  }
-
-if (len >= 13 && Ustrcmp(endname - 13, "test.fail.dns") == 0)
-  {
-  DEBUG(D_dns) debug_printf("Return from DNS lookup of %s (%s) faked for testing\n",
-    name, dns_text_type(type));
-  h_errno = NO_RECOVERY;
-  return -1;
-  }

 
 /* Look for the fakens utility, and if it exists, call it. */
 
 
 /* Look for the fakens utility, and if it exists, call it. */
 


@@ -90,8 +62,7 @@ if (stat(CS utilname, &statbuf) >= 0)
   int infd, outfd, rc;
   uschar *argv[5];
 
   int infd, outfd, rc;
   uschar *argv[5];
 

-  DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) using fakens `%s'\n",
-    name, dns_text_type(type), utilname);
+  DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) using fakens\n", name, dns_text_type(type));

 
   argv[0] = utilname;
   argv[1] = config_main_directory;
 
   argv[0] = utilname;
   argv[1] = config_main_directory;


@@ -113,6 +84,13 @@ if (stat(CS utilname, &statbuf) >= 0)
     asize -= rc;      /* may need to be passed on to res_search(). */
     }
 
     asize -= rc;      /* may need to be passed on to res_search(). */
     }
 

+  /* If we ran out of output buffer before exhausting the return,
+  carry on reading and counting it. */
+
+  if (asize == 0)
+    while ((rc = read(outfd, name, sizeof(name))) > 0)
+      len += rc;
+

   if (rc < 0)
     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "read from fakens failed: %s",
       strerror(errno));
   if (rc < 0)
     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "read from fakens failed: %s",
       strerror(errno));


@@ -131,7 +109,7 @@ if (stat(CS utilname, &statbuf) >= 0)
   }
 else
   {
   }
 else
   {

-    DEBUG(D_dns) debug_printf("fakens (%s) not found\n", utilname);
+  DEBUG(D_dns) debug_printf("fakens (%s) not found\n", utilname);

   }
 
 /* fakens utility not found, or it returned "pass on" */
   }
 
 /* fakens utility not found, or it returned "pass on" */


@@ -327,6 +305,15 @@ else
 
 
 
 
 
 

+/* Increment the aptr in dnss, checking against dnsa length.
+Return: TRUE for a bad result
+*/
+static BOOL
+dnss_inc(dns_answer * dnsa, dns_scan * dnss, unsigned delta)
+{
+return (dnss->aptr += delta) >= dnsa->answer + dnsa->answerlen;
+}
+

 /*************************************************
 *       Get next DNS record from answer block    *
 *************************************************/
 /*************************************************
 *       Get next DNS record from answer block    *
 *************************************************/


@@ -350,10 +337,19 @@ dns_next_rr(dns_answer *dnsa, dns_scan *dnss, int reset)
 HEADER *h = (HEADER *)dnsa->answer;
 int namelen;
 
 HEADER *h = (HEADER *)dnsa->answer;
 int namelen;
 

+char * trace = NULL;
+#ifdef rr_trace
+# define TRACE DEBUG(D_dns)
+#else
+trace = trace;
+# define TRACE if (FALSE)
+#endif
+

 /* Reset the saved data when requested to, and skip to the first required RR */
 
 if (reset != RESET_NEXT)
   {
 /* Reset the saved data when requested to, and skip to the first required RR */
 
 if (reset != RESET_NEXT)
   {

+  TRACE debug_printf("%s: reset\n", __FUNCTION__);

   dnss->rrcount = ntohs(h->qdcount);
   dnss->aptr = dnsa->answer + sizeof(HEADER);
 
   dnss->rrcount = ntohs(h->qdcount);
   dnss->aptr = dnsa->answer + sizeof(HEADER);
 


@@ -361,10 +357,13 @@ if (reset != RESET_NEXT)
 
   while (dnss->rrcount-- > 0)
     {
 
   while (dnss->rrcount-- > 0)
     {

+    TRACE trace = "Q-namelen";

     namelen = dn_expand(dnsa->answer, dnsa->answer + dnsa->answerlen,
     namelen = dn_expand(dnsa->answer, dnsa->answer + dnsa->answerlen,

-      dnss->aptr, (DN_EXPAND_ARG4_TYPE) &(dnss->srr.name), DNS_MAXNAME);
-    if (namelen < 0) { dnss->rrcount = 0; return NULL; }
-    dnss->aptr += namelen + 4;    /* skip name & type & class */
+      dnss->aptr, (DN_EXPAND_ARG4_TYPE) &dnss->srr.name, DNS_MAXNAME);
+    if (namelen < 0) goto null_return;
+    /* skip name & type & class */
+    TRACE trace = "Q-skip";
+    if (dnss_inc(dnsa, dnss, namelen+4)) goto null_return;

     }
 
   /* Get the number of answer records. */
     }
 
   /* Get the number of answer records. */


@@ -375,23 +374,37 @@ if (reset != RESET_NEXT)
   the NS records (i.e. authority section) if wanting to look at the additional
   records. */
 
   the NS records (i.e. authority section) if wanting to look at the additional
   records. */
 

-  if (reset == RESET_ADDITIONAL) dnss->rrcount += ntohs(h->nscount);
+  if (reset == RESET_ADDITIONAL)
+    {
+    TRACE debug_printf("%s: additional\n", __FUNCTION__);
+    dnss->rrcount += ntohs(h->nscount);
+    }

 
   if (reset == RESET_AUTHORITY || reset == RESET_ADDITIONAL)
     {
 
   if (reset == RESET_AUTHORITY || reset == RESET_ADDITIONAL)
     {

+    TRACE if (reset == RESET_AUTHORITY)
+      debug_printf("%s: authority\n", __FUNCTION__);

     while (dnss->rrcount-- > 0)
       {
     while (dnss->rrcount-- > 0)
       {

+      TRACE trace = "A-namelen";

       namelen = dn_expand(dnsa->answer, dnsa->answer + dnsa->answerlen,
       namelen = dn_expand(dnsa->answer, dnsa->answer + dnsa->answerlen,

-        dnss->aptr, (DN_EXPAND_ARG4_TYPE) &(dnss->srr.name), DNS_MAXNAME);
-      if (namelen < 0) { dnss->rrcount = 0; return NULL; }
-      dnss->aptr += namelen + 8;            /* skip name, type, class & TTL */
+        dnss->aptr, (DN_EXPAND_ARG4_TYPE) &dnss->srr.name, DNS_MAXNAME);
+      if (namelen < 0) goto null_return;
+      /* skip name, type, class & TTL */
+      TRACE trace = "A-hdr";
+      if (dnss_inc(dnsa, dnss, namelen+8)) goto null_return;

       GETSHORT(dnss->srr.size, dnss->aptr); /* size of data portion */
       GETSHORT(dnss->srr.size, dnss->aptr); /* size of data portion */

-      dnss->aptr += dnss->srr.size;         /* skip over it */
+      /* skip over it */
+      TRACE trace = "A-skip";
+      if (dnss_inc(dnsa, dnss, dnss->srr.size)) goto null_return;

       }
       }

-    dnss->rrcount = (reset == RESET_AUTHORITY)
+    dnss->rrcount = reset == RESET_AUTHORITY

       ? ntohs(h->nscount) : ntohs(h->arcount);
     }
       ? ntohs(h->nscount) : ntohs(h->arcount);
     }

+  TRACE debug_printf("%s: %d RRs to read\n", __FUNCTION__, dnss->rrcount);

   }
   }

+else
+  TRACE debug_printf("%s: next (%d left)\n", __FUNCTION__, dnss->rrcount);

 
 /* The variable dnss->aptr is now pointing at the next RR, and dnss->rrcount
 contains the number of RR records left. */
 
 /* The variable dnss->aptr is now pointing at the next RR, and dnss->rrcount
 contains the number of RR records left. */


@@ -401,24 +414,66 @@ if (dnss->rrcount-- <= 0) return NULL;
 /* If expanding the RR domain name fails, behave as if no more records
 (something safe). */
 
 /* If expanding the RR domain name fails, behave as if no more records
 (something safe). */
 

+TRACE trace = "R-namelen";

 namelen = dn_expand(dnsa->answer, dnsa->answer + dnsa->answerlen, dnss->aptr,
 namelen = dn_expand(dnsa->answer, dnsa->answer + dnsa->answerlen, dnss->aptr,

-  (DN_EXPAND_ARG4_TYPE) &(dnss->srr.name), DNS_MAXNAME);
-if (namelen < 0) { dnss->rrcount = 0; return NULL; }
+  (DN_EXPAND_ARG4_TYPE) &dnss->srr.name, DNS_MAXNAME);
+if (namelen < 0) goto null_return;

 
 /* Move the pointer past the name and fill in the rest of the data structure
 from the following bytes. */
 
 
 /* Move the pointer past the name and fill in the rest of the data structure
 from the following bytes. */
 

-dnss->aptr += namelen;
-GETSHORT(dnss->srr.type, dnss->aptr); /* Record type */
-dnss->aptr += 6;                      /* Don't want class or TTL */
-GETSHORT(dnss->srr.size, dnss->aptr); /* Size of data portion */
-dnss->srr.data = dnss->aptr;          /* The record's data follows */
-dnss->aptr += dnss->srr.size;         /* Advance to next RR */
+TRACE trace = "R-name";
+if (dnss_inc(dnsa, dnss, namelen)) goto null_return;
+
+GETSHORT(dnss->srr.type, dnss->aptr);          /* Record type */
+TRACE trace = "R-class";
+if (dnss_inc(dnsa, dnss, 2)) goto null_return; /* Don't want class */
+GETLONG(dnss->srr.ttl, dnss->aptr);            /* TTL */
+GETSHORT(dnss->srr.size, dnss->aptr);          /* Size of data portion */
+dnss->srr.data = dnss->aptr;                   /* The record's data follows */
+
+/* Unchecked increment ok here since no further access on this iteration;
+will be checked on next at "R-name". */
+
+dnss->aptr += dnss->srr.size;                  /* Advance to next RR */

 
 /* Return a pointer to the dns_record structure within the dns_answer. This is
 for convenience so that the scans can use nice-looking for loops. */
 
 
 /* Return a pointer to the dns_record structure within the dns_answer. This is
 for convenience so that the scans can use nice-looking for loops. */
 

-return &(dnss->srr);
+return &dnss->srr;
+
+null_return:
+  TRACE debug_printf("%s: terminate (%d RRs left). Last op: %s\n",
+    __FUNCTION__, dnss->rrcount, trace);
+  dnss->rrcount = 0;
+  return NULL;
+}
+
+
+/* Extract the AUTHORITY information from the answer. If the
+answer isn't authoritive (AA not set), we do not extract anything.
+
+The AUTHORITIVE section contains NS records if
+the name in question was found, it contains a SOA record
+otherwise. (This is just from experience and some tests, is there
+some spec?)
+
+We've cycle through the AUTHORITY section, since it may contain
+other records (e.g. NSEC3) too.  */
+
+static const uschar *
+dns_extract_auth_name(const dns_answer * dnsa) /* FIXME: const dns_answer */
+{
+dns_scan dnss;
+dns_record * rr;
+HEADER * h = (HEADER *) dnsa->answer;
+
+if (!h->nscount || !h->aa) return NULL;
+for (rr = dns_next_rr((dns_answer*) dnsa, &dnss, RESET_AUTHORITY);
+     rr;
+     rr = dns_next_rr((dns_answer*) dnsa, &dnss, RESET_NEXT))
+  if (rr->type == (h->ancount ? T_NS : T_SOA)) return rr->name;
+return NULL;

 }
 
 
 }
 
 


@@ -430,7 +485,7 @@ return &(dnss->srr);
 
 /* We do not perform DNSSEC work ourselves; if the administrator has installed
 a verifying resolver which sets AD as appropriate, though, we'll use that.
 
 /* We do not perform DNSSEC work ourselves; if the administrator has installed
 a verifying resolver which sets AD as appropriate, though, we'll use that.

-(AD = Authentic Data)
+(AD = Authentic Data, AA = Authoritive Answer)

 
 Argument:   pointer to dns answer block
 Returns:    bool indicating presence of AD bit
 
 Argument:   pointer to dns answer block
 Returns:    bool indicating presence of AD bit


@@ -444,18 +499,60 @@ DEBUG(D_dns)
   debug_printf("DNSSEC support disabled at build-time; dns_is_secure() false\n");
 return FALSE;
 #else
   debug_printf("DNSSEC support disabled at build-time; dns_is_secure() false\n");
 return FALSE;
 #else

-HEADER *h = (HEADER *)dnsa->answer;
-return h->ad ? TRUE : FALSE;
+HEADER * h = (HEADER *) dnsa->answer;
+const uschar * auth_name;
+const uschar * trusted;
+
+if (h->ad) return TRUE;
+
+/* If the resolver we ask is authoritive for the domain in question, it
+* may not set the AD but the AA bit. If we explicitly trust
+* the resolver for that domain (via a domainlist in dns_trust_aa),
+* we return TRUE to indicate a secure answer.
+*/
+
+if (  !h->aa
+   || !dns_trust_aa
+   || !(trusted = expand_string(dns_trust_aa))
+   || !*trusted
+   || !(auth_name = dns_extract_auth_name(dnsa))
+   || OK != match_isinlist(auth_name, &trusted, 0, NULL, NULL,
+                           MCL_DOMAIN, TRUE, NULL)
+   )
+  return FALSE;
+
+DEBUG(D_dns) debug_printf("DNS faked the AD bit "
+  "(got AA and matched with dns_trust_aa (%s in %s))\n",
+  auth_name, dns_trust_aa);
+
+return TRUE;

 #endif
 }
 
 static void
 dns_set_insecure(dns_answer * dnsa)
 {
 #endif
 }
 
 static void
 dns_set_insecure(dns_answer * dnsa)
 {

+#ifndef DISABLE_DNSSEC

 HEADER * h = (HEADER *)dnsa->answer;
 h->ad = 0;
 HEADER * h = (HEADER *)dnsa->answer;
 h->ad = 0;

+#endif

 }
 
 }
 

+/************************************************
+ *     Check whether the AA bit is set         *
+ *     We need this to warn if we requested AD *
+ *     from an authoritive server              *
+ ************************************************/
+
+BOOL
+dns_is_aa(const dns_answer *dnsa)
+{
+#ifdef DISABLE_DNSSEC
+return FALSE;
+#else
+return ((HEADER*)dnsa->answer)->aa;
+#endif
+}

 
 
 
 
 
 


@@ -516,14 +613,12 @@ dns_return(const uschar * name, int type, int rc)
 res_state resp = os_get_dns_resolver_res();
 tree_node *node = store_get_perm(sizeof(tree_node) + 290);
 sprintf(CS node->name, "%.255s-%s-%lx", name, dns_text_type(type),
 res_state resp = os_get_dns_resolver_res();
 tree_node *node = store_get_perm(sizeof(tree_node) + 290);
 sprintf(CS node->name, "%.255s-%s-%lx", name, dns_text_type(type),

-  resp->options);
+  (unsigned long) resp->options);

 node->data.val = rc;
 (void)tree_insertnode(&tree_dns_fails, node);
 return rc;
 }
 
 node->data.val = rc;
 (void)tree_insertnode(&tree_dns_fails, node);
 return rc;
 }
 

-
-

 /*************************************************
 *              Do basic DNS lookup               *
 *************************************************/
 /*************************************************
 *              Do basic DNS lookup               *
 *************************************************/


@@ -567,9 +662,8 @@ have many addresses in the same domain. We rely on the resolver and name server
 caching for successful lookups. */
 
 sprintf(CS node_name, "%.255s-%s-%lx", name, dns_text_type(type),
 caching for successful lookups. */
 
 sprintf(CS node_name, "%.255s-%s-%lx", name, dns_text_type(type),

-  resp->options);
-previous = tree_search(tree_dns_fails, node_name);
-if (previous != NULL)
+  (unsigned long) resp->options);
+if ((previous = tree_search(tree_dns_fails, node_name)))

   {
   DEBUG(D_dns) debug_printf("DNS lookup of %.255s-%s: using cached value %s\n",
     name, dns_text_type(type),
   {
   DEBUG(D_dns) debug_printf("DNS lookup of %.255s-%s: using cached value %s\n",
     name, dns_text_type(type),


@@ -580,7 +674,7 @@ if (previous != NULL)
   return previous->data.val;
   }
 
   return previous->data.val;
   }
 

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

 /* Convert all names to a-label form before doing lookup */
   {
   uschar * alabel;
 /* Convert all names to a-label form before doing lookup */
   {
   uschar * alabel;


@@ -674,48 +768,48 @@ if (dnsa->answerlen > MAXPACKET)
 if (dnsa->answerlen < 0) switch (h_errno)
   {
   case HOST_NOT_FOUND:
 if (dnsa->answerlen < 0) switch (h_errno)
   {
   case HOST_NOT_FOUND:

-  DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) gave HOST_NOT_FOUND\n"
-    "returning DNS_NOMATCH\n", name, dns_text_type(type));
-  return dns_return(name, type, DNS_NOMATCH);
+    DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) gave HOST_NOT_FOUND\n"
+      "returning DNS_NOMATCH\n", name, dns_text_type(type));
+    return dns_return(name, type, DNS_NOMATCH);

 
   case TRY_AGAIN:
 
   case TRY_AGAIN:

-  DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) gave TRY_AGAIN\n",
-    name, dns_text_type(type));
+    DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) gave TRY_AGAIN\n",
+      name, dns_text_type(type));

 
 

-  /* Cut this out for various test programs */
+    /* Cut this out for various test programs */

 #ifndef STAND_ALONE
 #ifndef STAND_ALONE

-  save_domain = deliver_domain;
-  deliver_domain = string_copy(name);  /* set $domain */
-  rc = match_isinlist(name, (const uschar **)&dns_again_means_nonexist, 0, NULL, NULL,
-    MCL_DOMAIN, TRUE, NULL);
-  deliver_domain = save_domain;
-  if (rc != OK)
-    {
-    DEBUG(D_dns) debug_printf("returning DNS_AGAIN\n");
-    return dns_return(name, type, DNS_AGAIN);
-    }
-  DEBUG(D_dns) debug_printf("%s is in dns_again_means_nonexist: returning "
-    "DNS_NOMATCH\n", name);
-  return dns_return(name, type, DNS_NOMATCH);
+    save_domain = deliver_domain;
+    deliver_domain = string_copy(name);  /* set $domain */
+    rc = match_isinlist(name, (const uschar **)&dns_again_means_nonexist, 0, NULL, NULL,
+      MCL_DOMAIN, TRUE, NULL);
+    deliver_domain = save_domain;
+    if (rc != OK)
+      {
+      DEBUG(D_dns) debug_printf("returning DNS_AGAIN\n");
+      return dns_return(name, type, DNS_AGAIN);
+      }
+    DEBUG(D_dns) debug_printf("%s is in dns_again_means_nonexist: returning "
+      "DNS_NOMATCH\n", name);
+    return dns_return(name, type, DNS_NOMATCH);

 
 #else   /* For stand-alone tests */
 
 #else   /* For stand-alone tests */

-  return dns_return(name, type, DNS_AGAIN);
+    return dns_return(name, type, DNS_AGAIN);

 #endif
 
   case NO_RECOVERY:
 #endif
 
   case NO_RECOVERY:

-  DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) gave NO_RECOVERY\n"
-    "returning DNS_FAIL\n", name, dns_text_type(type));
-  return dns_return(name, type, DNS_FAIL);
+    DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) gave NO_RECOVERY\n"
+      "returning DNS_FAIL\n", name, dns_text_type(type));
+    return dns_return(name, type, DNS_FAIL);

 
   case NO_DATA:
 
   case NO_DATA:

-  DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) gave NO_DATA\n"
-    "returning DNS_NODATA\n", name, dns_text_type(type));
-  return dns_return(name, type, DNS_NODATA);
+    DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) gave NO_DATA\n"
+      "returning DNS_NODATA\n", name, dns_text_type(type));
+    return dns_return(name, type, DNS_NODATA);

 
   default:
 
   default:

-  DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) gave unknown DNS error %d\n"
-    "returning DNS_FAIL\n", name, dns_text_type(type), h_errno);
-  return dns_return(name, type, DNS_FAIL);
+    DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) gave unknown DNS error %d\n"
+      "returning DNS_FAIL\n", name, dns_text_type(type), h_errno);
+    return dns_return(name, type, DNS_FAIL);

   }
 
 DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) succeeded\n",
   }
 
 DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) succeeded\n",


@@ -773,7 +867,7 @@ BOOL secure_so_far = TRUE;
 
 for (i = 0; i < 10; i++)
   {
 
 for (i = 0; i < 10; i++)
   {

-  uschar data[256];
+  uschar * data;

   dns_record *rr, cname_rr, type_rr;
   dns_scan dnss;
   int datalen, rc;
   dns_record *rr, cname_rr, type_rr;
   dns_scan dnss;
   int datalen, rc;


@@ -790,7 +884,7 @@ for (i = 0; i < 10; i++)
 
   cname_rr.data = type_rr.data = NULL;
   for (rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS);
 
   cname_rr.data = type_rr.data = NULL;
   for (rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS);

-       rr != NULL;
+       rr;

        rr = dns_next_rr(dnsa, &dnss, RESET_NEXT))
     {
     if (rr->type == type)
        rr = dns_next_rr(dnsa, &dnss, RESET_NEXT))
     {
     if (rr->type == type)


@@ -811,7 +905,7 @@ for (i = 0; i < 10; i++)
     if (  rr_name
        && Ustrcmp(rr_name, *fully_qualified_name) != 0
        && rr_name[0] != '*'
     if (  rr_name
        && Ustrcmp(rr_name, *fully_qualified_name) != 0
        && rr_name[0] != '*'

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

        && (  !string_is_utf8(*fully_qualified_name)
          || Ustrcmp(rr_name,
               string_domain_utf8_to_alabel(*fully_qualified_name, NULL)) != 0
        && (  !string_is_utf8(*fully_qualified_name)
          || Ustrcmp(rr_name,
               string_domain_utf8_to_alabel(*fully_qualified_name, NULL)) != 0


@@ -823,7 +917,7 @@ for (i = 0; i < 10; i++)
 
   /* If any data records of the correct type were found, we are done. */
 
 
   /* If any data records of the correct type were found, we are done. */
 

-  if (type_rr.data != NULL)
+  if (type_rr.data)

     {
     if (!secure_so_far)        /* mark insecure if any element of CNAME chain was */
       dns_set_insecure(dnsa);
     {
     if (!secure_so_far)        /* mark insecure if any element of CNAME chain was */
       dns_set_insecure(dnsa);


@@ -835,10 +929,14 @@ for (i = 0; i < 10; i++)
   have had a failure from dns_lookup). However code against the possibility of
   its not existing. */
 
   have had a failure from dns_lookup). However code against the possibility of
   its not existing. */
 

-  if (cname_rr.data == NULL) return DNS_FAIL;
+  if (!cname_rr.data)
+    return DNS_FAIL;
+
+  data = store_get(256);

   datalen = dn_expand(dnsa->answer, dnsa->answer + dnsa->answerlen,
   datalen = dn_expand(dnsa->answer, dnsa->answer + dnsa->answerlen,

-    cname_rr.data, (DN_EXPAND_ARG4_TYPE)data, sizeof(data));
-  if (datalen < 0) return DNS_FAIL;
+    cname_rr.data, (DN_EXPAND_ARG4_TYPE)data, 256);
+  if (datalen < 0)
+    return DNS_FAIL;

   name = data;
 
   if (!dns_is_secure(dnsa))
   name = data;
 
   if (!dns_is_secure(dnsa))


@@ -863,7 +961,7 @@ return DNS_FAIL;
 *    Do a DNS lookup and handle virtual types   *
 ************************************************/
 
 *    Do a DNS lookup and handle virtual types   *
 ************************************************/
 

-/* This function handles some invented "lookup types" that synthesize feature
+/* This function handles some invented "lookup types" that synthesize features

 not available in the basic types. The special types all have negative values.
 Positive type values are passed straight on to dns_lookup().
 
 not available in the basic types. The special types all have negative values.
 Positive type values are passed straight on to dns_lookup().
 


@@ -889,25 +987,25 @@ switch (type)
   {
   /* The "mx hosts only" type doesn't require any special action here */
   case T_MXH:
   {
   /* The "mx hosts only" type doesn't require any special action here */
   case T_MXH:

-       return dns_lookup(dnsa, name, T_MX, fully_qualified_name);
+    return dns_lookup(dnsa, name, T_MX, fully_qualified_name);

 
   /* Find nameservers for the domain or the nearest enclosing zone, excluding
   the root servers. */
   case T_ZNS:
 
   /* Find nameservers for the domain or the nearest enclosing zone, excluding
   the root servers. */
   case T_ZNS:

-       type = T_NS;
-       /* FALLTHROUGH */
+    type = T_NS;
+    /* FALLTHROUGH */

   case T_SOA:
   case T_SOA:

-       {
-       const uschar *d = name;
-       while (d != 0)
-         {
-         int rc = dns_lookup(dnsa, d, type, fully_qualified_name);
-         if (rc != DNS_NOMATCH && rc != DNS_NODATA) return rc;
-         while (*d != 0 && *d != '.') d++;
-         if (*d++ == 0) break;
-         }
-       return DNS_NOMATCH;
-       }
+    {
+    const uschar *d = name;
+    while (d != 0)
+      {
+      int rc = dns_lookup(dnsa, d, type, fully_qualified_name);
+      if (rc != DNS_NOMATCH && rc != DNS_NODATA) return rc;
+      while (*d != 0 && *d != '.') d++;
+      if (*d++ == 0) break;
+      }
+    return DNS_NOMATCH;
+    }

 
   /* Try to look up the Client SMTP Authorization SRV record for the name. If
   there isn't one, search from the top downwards for a CSA record in a parent
 
   /* Try to look up the Client SMTP Authorization SRV record for the name. If
   there isn't one, search from the top downwards for a CSA record in a parent


@@ -916,148 +1014,147 @@ switch (type)
   can tell whether to look at the explicit authorization field or the subdomain
   assertion field. */
   case T_CSA:
   can tell whether to look at the explicit authorization field or the subdomain
   assertion field. */
   case T_CSA:

-       {
-       uschar *srvname, *namesuff, *tld, *p;
-       int priority, weight, port;
-       int limit, rc, i;
-       BOOL ipv6;
-       dns_record *rr;
-       dns_scan dnss;
-
-       DEBUG(D_dns) debug_printf("CSA lookup of %s\n", name);
-
-       srvname = string_sprintf("_client._smtp.%s", name);
-       rc = dns_lookup(dnsa, srvname, T_SRV, NULL);
-       if (rc == DNS_SUCCEED || rc == DNS_AGAIN)
-         {
-         if (rc == DNS_SUCCEED) *fully_qualified_name = string_copy(name);
-         return rc;
-         }
+    {
+    uschar *srvname, *namesuff, *tld, *p;
+    int priority, weight, port;
+    int limit, rc, i;
+    BOOL ipv6;
+    dns_record *rr;
+    dns_scan dnss;
+
+    DEBUG(D_dns) debug_printf("CSA lookup of %s\n", name);
+
+    srvname = string_sprintf("_client._smtp.%s", name);
+    rc = dns_lookup(dnsa, srvname, T_SRV, NULL);
+    if (rc == DNS_SUCCEED || rc == DNS_AGAIN)
+      {
+      if (rc == DNS_SUCCEED) *fully_qualified_name = string_copy(name);
+      return rc;
+      }

 
 

-       /* Search for CSA subdomain assertion SRV records from the top downwards,
-       starting with the 2nd level domain. This order maximizes cache-friendliness.
-       We skip the top level domains to avoid loading their nameservers and because
-       we know they'll never have CSA SRV records. */
+    /* Search for CSA subdomain assertion SRV records from the top downwards,
+    starting with the 2nd level domain. This order maximizes cache-friendliness.
+    We skip the top level domains to avoid loading their nameservers and because
+    we know they'll never have CSA SRV records. */

 
 

-       namesuff = Ustrrchr(name, '.');
-       if (namesuff == NULL) return DNS_NOMATCH;
+    namesuff = Ustrrchr(name, '.');
+    if (namesuff == NULL) return DNS_NOMATCH;
+    tld = namesuff + 1;
+    ipv6 = FALSE;
+    limit = dns_csa_search_limit;
+
+    /* Use more appropriate search parameters if we are in the reverse DNS. */
+
+    if (strcmpic(namesuff, US".arpa") == 0)
+      if (namesuff - 8 > name && strcmpic(namesuff - 8, US".in-addr.arpa") == 0)
+       {
+       namesuff -= 8;

        tld = namesuff + 1;
        tld = namesuff + 1;

-       ipv6 = FALSE;
-       limit = dns_csa_search_limit;
+       limit = 3;
+       }
+      else if (namesuff - 4 > name && strcmpic(namesuff - 4, US".ip6.arpa") == 0)
+       {
+       namesuff -= 4;
+       tld = namesuff + 1;
+       ipv6 = TRUE;
+       limit = 3;
+       }

 
 

-       /* Use more appropriate search parameters if we are in the reverse DNS. */
+    DEBUG(D_dns) debug_printf("CSA TLD %s\n", tld);

 
 

-       if (strcmpic(namesuff, US".arpa") == 0)
-         {
-         if (namesuff - 8 > name && strcmpic(namesuff - 8, US".in-addr.arpa") == 0)
-               {
-               namesuff -= 8;
-               tld = namesuff + 1;
-               limit = 3;
-               }
-         else if (namesuff - 4 > name && strcmpic(namesuff - 4, US".ip6.arpa") == 0)
-               {
-               namesuff -= 4;
-               tld = namesuff + 1;
-               ipv6 = TRUE;
-               limit = 3;
-               }
-         }
+    /* Do not perform the search if the top level or 2nd level domains do not
+    exist. This is quite common, and when it occurs all the search queries would
+    go to the root or TLD name servers, which is not friendly. So we check the
+    AUTHORITY section; if it contains the root's SOA record or the TLD's SOA then
+    the TLD or the 2LD (respectively) doesn't exist and we can skip the search.
+    If the TLD and the 2LD exist but the explicit CSA record lookup failed, then
+    the AUTHORITY SOA will be the 2LD's or a subdomain thereof. */

 
 

-       DEBUG(D_dns) debug_printf("CSA TLD %s\n", tld);
+    if (rc == DNS_NOMATCH)
+      {
+      /* This is really gross. The successful return value from res_search() is
+      the packet length, which is stored in dnsa->answerlen. If we get a
+      negative DNS reply then res_search() returns -1, which causes the bounds
+      checks for name decompression to fail when it is treated as a packet
+      length, which in turn causes the authority search to fail. The correct
+      packet length has been lost inside libresolv, so we have to guess a
+      replacement value. (The only way to fix this properly would be to
+      re-implement res_search() and res_query() so that they don't muddle their
+      success and packet length return values.) For added safety we only reset
+      the packet length if the packet header looks plausible. */
+
+      HEADER *h = (HEADER *)dnsa->answer;
+      if (h->qr == 1 && h->opcode == QUERY && h->tc == 0
+         && (h->rcode == NOERROR || h->rcode == NXDOMAIN)
+         && ntohs(h->qdcount) == 1 && ntohs(h->ancount) == 0
+         && ntohs(h->nscount) >= 1)
+           dnsa->answerlen = MAXPACKET;
+
+      for (rr = dns_next_rr(dnsa, &dnss, RESET_AUTHORITY);
+          rr;
+          rr = dns_next_rr(dnsa, &dnss, RESET_NEXT)
+         )
+       if (rr->type != T_SOA) continue;
+       else if (strcmpic(rr->name, US"") == 0 ||
+                strcmpic(rr->name, tld) == 0) return DNS_NOMATCH;
+       else break;
+      }
+
+    for (i = 0; i < limit; i++)
+      {
+      if (ipv6)
+       {
+       /* Scan through the IPv6 reverse DNS in chunks of 16 bits worth of IP
+       address, i.e. 4 hex chars and 4 dots, i.e. 8 chars. */
+       namesuff -= 8;
+       if (namesuff <= name) return DNS_NOMATCH;
+       }
+      else
+       /* Find the start of the preceding domain name label. */
+       do
+         if (--namesuff <= name) return DNS_NOMATCH;
+       while (*namesuff != '.');
+
+      DEBUG(D_dns) debug_printf("CSA parent search at %s\n", namesuff + 1);
+
+      srvname = string_sprintf("_client._smtp.%s", namesuff + 1);
+      rc = dns_lookup(dnsa, srvname, T_SRV, NULL);
+      if (rc == DNS_AGAIN) return rc;
+      if (rc != DNS_SUCCEED) continue;
+
+      /* Check that the SRV record we have found is worth returning. We don't
+      just return the first one we find, because some lower level SRV record
+      might make stricter assertions than its parent domain. */
+
+      for (rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS);
+          rr;
+          rr = dns_next_rr(dnsa, &dnss, RESET_NEXT))
+       {
+       if (rr->type != T_SRV) continue;

 
 

-       /* Do not perform the search if the top level or 2nd level domains do not
-       exist. This is quite common, and when it occurs all the search queries would
-       go to the root or TLD name servers, which is not friendly. So we check the
-       AUTHORITY section; if it contains the root's SOA record or the TLD's SOA then
-       the TLD or the 2LD (respectively) doesn't exist and we can skip the search.
-       If the TLD and the 2LD exist but the explicit CSA record lookup failed, then
-       the AUTHORITY SOA will be the 2LD's or a subdomain thereof. */
+       /* Extract the numerical SRV fields (p is incremented) */
+       p = rr->data;
+       GETSHORT(priority, p);
+       GETSHORT(weight, p);    weight = weight; /* compiler quietening */
+       GETSHORT(port, p);

 
 

-       if (rc == DNS_NOMATCH)
-         {
-         /* This is really gross. The successful return value from res_search() is
-         the packet length, which is stored in dnsa->answerlen. If we get a
-         negative DNS reply then res_search() returns -1, which causes the bounds
-         checks for name decompression to fail when it is treated as a packet
-         length, which in turn causes the authority search to fail. The correct
-         packet length has been lost inside libresolv, so we have to guess a
-         replacement value. (The only way to fix this properly would be to
-         re-implement res_search() and res_query() so that they don't muddle their
-         success and packet length return values.) For added safety we only reset
-         the packet length if the packet header looks plausible. */
-
-         HEADER *h = (HEADER *)dnsa->answer;
-         if (h->qr == 1 && h->opcode == QUERY && h->tc == 0
-                 && (h->rcode == NOERROR || h->rcode == NXDOMAIN)
-                 && ntohs(h->qdcount) == 1 && ntohs(h->ancount) == 0
-                 && ntohs(h->nscount) >= 1)
-               dnsa->answerlen = MAXPACKET;
-
-         for (rr = dns_next_rr(dnsa, &dnss, RESET_AUTHORITY);
-                  rr != NULL;
-                  rr = dns_next_rr(dnsa, &dnss, RESET_NEXT))
-               if (rr->type != T_SOA) continue;
-               else if (strcmpic(rr->name, US"") == 0 ||
-                                strcmpic(rr->name, tld) == 0) return DNS_NOMATCH;
-               else break;
-         }
+       /* Check the CSA version number */
+       if (priority != 1) continue;

 
 

-       for (i = 0; i < limit; i++)
+       /* If it's making an interesting assertion, return this response. */
+       if (port & 1)

          {
          {

-         if (ipv6)
-               {
-               /* Scan through the IPv6 reverse DNS in chunks of 16 bits worth of IP
-               address, i.e. 4 hex chars and 4 dots, i.e. 8 chars. */
-               namesuff -= 8;
-               if (namesuff <= name) return DNS_NOMATCH;
-               }
-         else
-               /* Find the start of the preceding domain name label. */
-               do
-                 if (--namesuff <= name) return DNS_NOMATCH;
-               while (*namesuff != '.');
-
-         DEBUG(D_dns) debug_printf("CSA parent search at %s\n", namesuff + 1);
-
-         srvname = string_sprintf("_client._smtp.%s", namesuff + 1);
-         rc = dns_lookup(dnsa, srvname, T_SRV, NULL);
-         if (rc == DNS_AGAIN) return rc;
-         if (rc != DNS_SUCCEED) continue;
-
-         /* Check that the SRV record we have found is worth returning. We don't
-         just return the first one we find, because some lower level SRV record
-         might make stricter assertions than its parent domain. */
-
-         for (rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS);
-                  rr != NULL;
-                  rr = dns_next_rr(dnsa, &dnss, RESET_NEXT))
-               {
-               if (rr->type != T_SRV) continue;
-
-               /* Extract the numerical SRV fields (p is incremented) */
-               p = rr->data;
-               GETSHORT(priority, p);
-               GETSHORT(weight, p);    weight = weight; /* compiler quietening */
-               GETSHORT(port, p);
-
-               /* Check the CSA version number */
-               if (priority != 1) continue;
-
-               /* If it's making an interesting assertion, return this response. */
-               if (port & 1)
-                 {
-                 *fully_qualified_name = namesuff + 1;
-                 return DNS_SUCCEED;
-                 }
-               }
+         *fully_qualified_name = namesuff + 1;
+         return DNS_SUCCEED;

          }
          }

-       return DNS_NOMATCH;

        }
        }

+      }
+    return DNS_NOMATCH;
+    }

 
   default:
 
   default:

-       if (type >= 0)
-         return dns_lookup(dnsa, name, type, fully_qualified_name);
+    if (type >= 0)
+      return dns_lookup(dnsa, name, type, fully_qualified_name);

   }
 
 /* Control should never reach here */
   }
 
 /* Control should never reach here */


@@ -1073,38 +1170,45 @@ return DNS_FAIL;
 *          Get address(es) from DNS record       *
 *************************************************/
 
 *          Get address(es) from DNS record       *
 *************************************************/
 

-/* The record type is either T_A for an IPv4 address or T_AAAA (or T_A6 when
-supported) for an IPv6 address.
+/* The record type is either T_A for an IPv4 address or T_AAAA for an IPv6 address.

 
 Argument:
   dnsa       the DNS answer block
   rr         the RR
 
 
 Argument:
   dnsa       the DNS answer block
   rr         the RR
 

-Returns:     pointer to a chain of dns_address items
+Returns:     pointer to a chain of dns_address items; NULL when the dnsa was overrun

 */
 
 dns_address *
 dns_address_from_rr(dns_answer *dnsa, dns_record *rr)
 {
 */
 
 dns_address *
 dns_address_from_rr(dns_answer *dnsa, dns_record *rr)
 {

-dns_address *yield = NULL;
-
-dnsa = dnsa;    /* Stop picky compilers warning */
+dns_address * yield = NULL;
+uschar * dnsa_lim = dnsa->answer + dnsa->answerlen;

 
 if (rr->type == T_A)
   {
   uschar *p = US rr->data;
 
 if (rr->type == T_A)
   {
   uschar *p = US rr->data;

-  yield = store_get(sizeof(dns_address) + 20);
-  (void)sprintf(CS yield->address, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
-  yield->next = NULL;
+  if (p + 4 <= dnsa_lim)
+    {
+    yield = store_get(sizeof(dns_address) + 20);
+    (void)sprintf(CS yield->address, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
+    yield->next = NULL;
+    }

   }
 
 #if HAVE_IPV6
 
 else
   {
   }
 
 #if HAVE_IPV6
 
 else
   {

-  yield = store_get(sizeof(dns_address) + 50);
-  inet_ntop(AF_INET6, US rr->data, CS yield->address, 50);
-  yield->next = NULL;
+  if (rr->data + 16 <= dnsa_lim)
+    {
+    struct in6_addr in6;
+    int i;
+    for (i = 0; i < 16; i++) in6.s6_addr[i] = rr->data[i];
+    yield = store_get(sizeof(dns_address) + 50);
+    inet_ntop(AF_INET6, &in6, CS yield->address, 50);
+    yield->next = NULL;
+    }

   }
 #endif  /* HAVE_IPV6 */
 
   }
 #endif  /* HAVE_IPV6 */