[exim-cvs] cvs commit: exim/exim-src/src host.c exim/exim-t…

Etusivu
Poista viesti
Vastaa
Lähettäjä: Philip Hazel
Päiväys:  
Vastaanottaja: exim-cvs
Aihe: [exim-cvs] cvs commit: exim/exim-src/src host.c exim/exim-test-orig/AutoTest/stderr 077 082 186 262 316 317 418 442 447 451 463 488 503 514 519 539 546 581 582
ph10 2005/09/19 11:13:39 BST

  Modified files:
    exim-src/src         host.c 
    exim-test-orig/AutoTest/stderr 077 082 186 262 316 317 418 442 
                                   447 451 463 488 503 514 519 539 
                                   546 581 582 
  Log:
  More work for interfacing to the new test suite.


  Revision  Changes    Path
  1.15      +35 -2     exim/exim-src/src/host.c
  1.3       +15 -0     exim/exim-test-orig/AutoTest/stderr/077
  1.4       +2 -0      exim/exim-test-orig/AutoTest/stderr/082
  1.4       +15 -0     exim/exim-test-orig/AutoTest/stderr/186
  1.3       +3 -0      exim/exim-test-orig/AutoTest/stderr/262
  1.3       +4 -0      exim/exim-test-orig/AutoTest/stderr/316
  1.6       +3 -0      exim/exim-test-orig/AutoTest/stderr/317
  1.6       +4 -0      exim/exim-test-orig/AutoTest/stderr/418
  1.4       +15 -0     exim/exim-test-orig/AutoTest/stderr/442
  1.6       +2 -0      exim/exim-test-orig/AutoTest/stderr/447
  1.10      +4 -0      exim/exim-test-orig/AutoTest/stderr/451
  1.5       +6 -0      exim/exim-test-orig/AutoTest/stderr/463
  1.3       +1 -0      exim/exim-test-orig/AutoTest/stderr/488
  1.5       +8 -0      exim/exim-test-orig/AutoTest/stderr/503
  1.3       +17 -0     exim/exim-test-orig/AutoTest/stderr/514
  1.3       +13 -0     exim/exim-test-orig/AutoTest/stderr/519
  1.3       +8 -0      exim/exim-test-orig/AutoTest/stderr/539
  1.3       +3 -0      exim/exim-test-orig/AutoTest/stderr/546
  1.10      +4 -0      exim/exim-test-orig/AutoTest/stderr/581
  1.3       +2 -0      exim/exim-test-orig/AutoTest/stderr/582


  Index: host.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/host.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- host.c    16 Sep 2005 14:44:11 -0000    1.14
  +++ host.c    19 Sep 2005 10:13:39 -0000    1.15
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/host.c,v 1.14 2005/09/16 14:44:11 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/host.c,v 1.15 2005/09/19 10:13:39 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -147,8 +147,11 @@
   *************************************************/


/* This function is called instead of gethostbyname(), gethostbyname2(), or
-getipnodebyname() when running in the test harness. It uses only the DNS to
-look up the host name. In the new test harness, this means it will access only
+getipnodebyname() when running in the test harness. It recognizes the name
+"manyhome.test.ex" and generates a humungous number of IP addresses. It also
+recognizes an unqualified "localhost" and forces it to the appropriate loopback
+address. IP addresses are treated as literals. For other names, it uses the DNS
+to find the host name. In the new test harness, this means it will access only
the fake DNS resolver. In the old harness it will call the real resolver and
access the test zone.

  @@ -177,6 +180,36 @@
   DEBUG(D_host_lookup)
     debug_printf("using host_fake_gethostbyname for %s (%s)\n", name,
       (af == AF_INET)? "IPv4" : "IPv6");
  +
  +/* Handle the name that needs a vast number of IP addresses */
  +
  +if (Ustrcmp(name, "manyhome.test.ex") == 0 && af == AF_INET)
  +  {
  +  int i, j;
  +  yield = store_get(sizeof(struct hostent));
  +  alist = store_get(2049 * sizeof(char *));
  +  adds  = store_get(2048 * alen);
  +  yield->h_name = CS name;
  +  yield->h_aliases = NULL;
  +  yield->h_addrtype = af;
  +  yield->h_length = alen;
  +  yield->h_addr_list = CSS alist;
  +  for (i = 104; i <= 111; i++)
  +    {
  +    for (j = 0; j <= 255; j++)
  +      {
  +      *alist++ = adds;
  +      *adds++ = 10;
  +      *adds++ = 250;
  +      *adds++ = i;
  +      *adds++ = j;
  +      }
  +    }
  +  *alist = NULL;
  +  return yield;
  +  }
  +
  +/* Handle unqualified "localhost" */


   if (Ustrcmp(name, "localhost") == 0)
     lname = (af == AF_INET)? US"127.0.0.1" : US"::1";


  Index: 077
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/077,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 077    1 Aug 2005 13:20:29 -0000    1.2
  +++ 077    19 Sep 2005 10:13:39 -0000    1.3
  @@ -82,16 +82,31 @@
     SMTP connection from [10.99.99.90]
   host in host_lookup? yes (matched "0.0.0.0/0")
   looking up host name for 10.99.99.90
  +passing 90.99.99.10.in-addr.arpa on to res_search
   DNS lookup of 90.99.99.10.in-addr.arpa (PTR) succeeded
   IP address lookup yielded host1.masq.test.ex
     alias oneback.test.ex
  +using host_fake_gethostbyname for host1.masq.test.ex (IPv6)
  +passing host1.masq.test.ex on to res_search
  +DNS lookup of host1.masq.test.ex (AAAA) gave NO_DATA
  +returning DNS_NODATA
   gethostbyname2(af=inet6) returned 4 (NO_DATA)
  +using host_fake_gethostbyname for host1.masq.test.ex (IPv4)
  +passing host1.masq.test.ex on to res_search
  +DNS lookup of host1.masq.test.ex (A) succeeded
   gethostbyname2 looked up these IP addresses:
     name=host1.masq.test.ex address=10.90.90.90
   checking addresses for host1.masq.test.ex
     10.90.90.90
   no IP address for host1.masq.test.ex matched 10.99.99.90
  +using host_fake_gethostbyname for oneback.test.ex (IPv6)
  +passing oneback.test.ex on to res_search
  +DNS lookup of oneback.test.ex (AAAA) gave NO_DATA
  +returning DNS_NODATA
   gethostbyname2(af=inet6) returned 4 (NO_DATA)
  +using host_fake_gethostbyname for oneback.test.ex (IPv4)
  +passing oneback.test.ex on to res_search
  +DNS lookup of oneback.test.ex (A) succeeded
   gethostbyname2 looked up these IP addresses:
     name=oneback.test.ex address=10.99.99.90
   checking addresses for oneback.test.ex


  Index: 082
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/082,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 082    8 Aug 2005 09:57:30 -0000    1.3
  +++ 082    19 Sep 2005 10:13:39 -0000    1.4
  @@ -85,7 +85,9 @@
      result: ----> No lookup yet: No
   looking up host name for 10.0.0.1
   IP address lookup yielded ten-1.test.ex
  +using host_fake_gethostbyname for ten-1.test.ex (IPv6)
   gethostbyname2(af=inet6) returned 4 (NO_DATA)
  +using host_fake_gethostbyname for ten-1.test.ex (IPv4)
   gethostbyname2 looked up these IP addresses:
     name=ten-1.test.ex address=10.0.0.1
   checking addresses for ten-1.test.ex


  Index: 186
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/186,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 186    13 Sep 2005 15:40:07 -0000    1.3
  +++ 186    19 Sep 2005 10:13:39 -0000    1.4
  @@ -82,10 +82,13 @@
   calling lookuphost router
   lookuphost router called for abcd@???
     domain = ten-1.test.ex
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (MX) gave NO_DATA
   returning DNS_NODATA
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (AAAA) gave NO_DATA
   returning DNS_NODATA
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (A) succeeded
   fully qualified name = ten-1.test.ex
   ten-1.test.ex 10.0.0.1 mx=-1 sort=xx 
  @@ -184,6 +187,7 @@
     domain = ten-1.test.ex
   DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
   DNS lookup of ten-1.test.ex-AAAA: using cached value DNS_NODATA
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (A) succeeded
   fully qualified name = ten-1.test.ex
   ten-1.test.ex 10.0.0.1 mx=-1 sort=xx 
  @@ -280,10 +284,13 @@
   calling lookuphost router
   lookuphost router called for abcd@???
     domain = ten-1.test.ex
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (MX) gave NO_DATA
   returning DNS_NODATA
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (AAAA) gave NO_DATA
   returning DNS_NODATA
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (A) succeeded
   fully qualified name = ten-1.test.ex
   ten-1.test.ex 10.0.0.1 mx=-1 sort=xx 
  @@ -380,6 +387,7 @@
     domain = ten-1.test.ex
   DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
   DNS lookup of ten-1.test.ex-AAAA: using cached value DNS_NODATA
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (A) succeeded
   fully qualified name = ten-1.test.ex
   ten-1.test.ex 10.0.0.1 mx=-1 sort=xx 
  @@ -426,6 +434,7 @@
   calling lookuphost router
   lookuphost router called for ph10@???
     domain = nonexist.test.ex
  +passing nonexist.test.ex on to res_search
   DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   lookuphost router declined for ph10@???
  @@ -477,10 +486,13 @@
   calling lookuphost router
   lookuphost router called for abcd@???
     domain = ten-1.test.ex
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (MX) gave NO_DATA
   returning DNS_NODATA
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (AAAA) gave NO_DATA
   returning DNS_NODATA
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (A) succeeded
   fully qualified name = ten-1.test.ex
   ten-1.test.ex 10.0.0.1 mx=-1 sort=xx 
  @@ -518,8 +530,10 @@
   set transport smtp
   finding IP address for nonexist.test.ex
   doing DNS lookup
  +passing nonexist.test.ex on to res_search
   DNS lookup of nonexist.test.ex (AAAA) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
  +passing nonexist.test.ex on to res_search
   DNS lookup of nonexist.test.ex (A) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   mug99 router: defer for mug99@???
  @@ -575,6 +589,7 @@
     domain = ten-1.test.ex
   DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
   DNS lookup of ten-1.test.ex-AAAA: using cached value DNS_NODATA
  +passing ten-1.test.ex on to res_search
   DNS lookup of ten-1.test.ex (A) succeeded
   fully qualified name = ten-1.test.ex
   ten-1.test.ex 10.0.0.1 mx=-1 sort=xx 


  Index: 262
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/262,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 262    1 Aug 2005 13:20:29 -0000    1.2
  +++ 262    19 Sep 2005 10:13:39 -0000    1.3
  @@ -29,6 +29,7 @@
     type=dnsdb key="test.ex"
   database lookup required for test.ex
   dnsdb key: test.ex
  +passing test.ex on to res_search
   DNS lookup of test.ex (TXT) succeeded
   lookup yielded: A TXT record for test.ex.
   test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
  @@ -83,6 +84,7 @@
     type=dnsdb key="unknown"
   database lookup required for unknown
   dnsdb key: unknown
  +passing unknown on to res_search
   DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   lookup failed
  @@ -112,6 +114,7 @@
     type=dnsdb key="A=myhost.test.ex"
   database lookup required for A=myhost.test.ex
   dnsdb key: myhost.test.ex
  +passing myhost.test.ex on to res_search
   DNS lookup of myhost.test.ex (A) succeeded
   lookup yielded: 10.10.10.10
   ph10@??? in "dnsdb;A=myhost.test.ex"? yes (matched "dnsdb;A=myhost.test.ex")


  Index: 316
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/316,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 316    1 Aug 2005 13:20:29 -0000    1.2
  +++ 316    19 Sep 2005 10:13:39 -0000    1.3
  @@ -20,6 +20,7 @@
   host in "1.2.3.4"? yes (matched "1.2.3.4")
   host in host_lookup? yes (matched "+lookup_hosts")
   looking up host name for 1.2.3.4
  +passing 4.3.2.1.in-addr.arpa on to res_search
   DNS lookup of 4.3.2.1.in-addr.arpa (PTR) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   IP address lookup using gethostbyaddr()
  @@ -107,6 +108,7 @@
   host in "5.6.7.8"? no (end of list)
   host in host_lookup? yes (end of list)
   looking up host name for 9.10.11.12
  +passing 12.11.10.9.in-addr.arpa on to res_search
   DNS lookup of 12.11.10.9.in-addr.arpa (PTR) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   IP address lookup using gethostbyaddr()
  @@ -156,6 +158,7 @@
   host in "5.6.7.8"? no (end of list)
   host in host_lookup? yes (end of list)
   looking up host name for 1.1.1.1
  +passing 1.1.1.1.in-addr.arpa on to res_search
   DNS lookup of 1.1.1.1.in-addr.arpa (PTR) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   IP address lookup using gethostbyaddr()
  @@ -205,6 +208,7 @@
   host in "5.6.7.8"? no (end of list)
   host in host_lookup? yes (end of list)
   looking up host name for 2.2.2.2
  +passing 2.2.2.2.in-addr.arpa on to res_search
   DNS lookup of 2.2.2.2.in-addr.arpa (PTR) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   IP address lookup using gethostbyaddr()


  Index: 317
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/317,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 317    1 Aug 2005 13:20:29 -0000    1.5
  +++ 317    19 Sep 2005 10:13:39 -0000    1.6
  @@ -276,10 +276,13 @@
   calling r2 router
   r2 router called for unknown@???
     domain = test.ex
  +passing test.ex on to res_search
   DNS lookup of test.ex (MX) gave NO_DATA
   returning DNS_NODATA
  +passing test.ex on to res_search
   DNS lookup of test.ex (AAAA) gave NO_DATA
   returning DNS_NODATA
  +passing test.ex on to res_search
   DNS lookup of test.ex (A) gave NO_DATA
   returning DNS_NODATA
   r2 router declined for unknown@???


  Index: 418
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/418,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 418    1 Aug 2005 13:20:29 -0000    1.5
  +++ 418    19 Sep 2005 10:13:39 -0000    1.6
  @@ -91,13 +91,17 @@
   calling r1 router
   r1 router called for kilos@thishost
     domain = thishost
  +passing thishost on to res_search
   DNS lookup of thishost (MX) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   r1 router widened thishost to thishost.test.ex
  +passing thishost.test.ex on to res_search
   DNS lookup of thishost.test.ex (MX) gave NO_DATA
   returning DNS_NODATA
  +passing thishost.test.ex on to res_search
   DNS lookup of thishost.test.ex (AAAA) gave NO_DATA
   returning DNS_NODATA
  +passing thishost.test.ex on to res_search
   DNS lookup of thishost.test.ex (A) succeeded
   local host found for non-MX address
   fully qualified name = thishost.test.ex


  Index: 442
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/442,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 442    1 Aug 2005 13:20:29 -0000    1.3
  +++ 442    19 Sep 2005 10:13:39 -0000    1.4
  @@ -38,15 +38,30 @@
   check hosts = *.gov.uk.test.ex
   sender host name required, to match against *.gov.uk.test.ex
   looking up host name for 10.99.99.97
  +passing 97.99.99.10.in-addr.arpa on to res_search
   DNS lookup of 97.99.99.10.in-addr.arpa (PTR) succeeded
   IP address lookup yielded x.co.uk.test.ex
     alias x.gov.uk.test.ex
  +using host_fake_gethostbyname for x.co.uk.test.ex (IPv6)
  +passing x.co.uk.test.ex on to res_search
  +DNS lookup of x.co.uk.test.ex (AAAA) gave NO_DATA
  +returning DNS_NODATA
   gethostbyname2(af=inet6) returned 4 (NO_DATA)
  +using host_fake_gethostbyname for x.co.uk.test.ex (IPv4)
  +passing x.co.uk.test.ex on to res_search
  +DNS lookup of x.co.uk.test.ex (A) succeeded
   gethostbyname2 looked up these IP addresses:
     name=x.co.uk.test.ex address=10.99.99.97
   checking addresses for x.co.uk.test.ex
     10.99.99.97 OK
  +using host_fake_gethostbyname for x.gov.uk.test.ex (IPv6)
  +passing x.gov.uk.test.ex on to res_search
  +DNS lookup of x.gov.uk.test.ex (AAAA) gave NO_DATA
  +returning DNS_NODATA
   gethostbyname2(af=inet6) returned 4 (NO_DATA)
  +using host_fake_gethostbyname for x.gov.uk.test.ex (IPv4)
  +passing x.gov.uk.test.ex on to res_search
  +DNS lookup of x.gov.uk.test.ex (A) succeeded
   gethostbyname2 looked up these IP addresses:
     name=x.gov.uk.test.ex address=10.99.99.97
   checking addresses for x.gov.uk.test.ex


  Index: 447
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/447,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 447    1 Aug 2005 13:20:29 -0000    1.5
  +++ 447    19 Sep 2005 10:13:39 -0000    1.6
  @@ -159,8 +159,10 @@
   check dnslists = rbl.test.ex 
   DNS list check: rbl.test.ex
   new DNS lookup for 13.12.11.10.rbl.test.ex
  +passing 13.12.11.10.rbl.test.ex on to res_search
   DNS lookup of 13.12.11.10.rbl.test.ex (A) succeeded
   DNS lookup for 13.12.11.10.rbl.test.ex succeeded (yielding 127.0.0.2)
  +passing 13.12.11.10.rbl.test.ex on to res_search
   DNS lookup of 13.12.11.10.rbl.test.ex (TXT) succeeded
   => that means 10.11.12.13 is listed at rbl.test.ex
   warn: condition test succeeded


  Index: 451
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/451,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- 451    9 Aug 2005 13:31:54 -0000    1.9
  +++ 451    19 Sep 2005 10:13:39 -0000    1.10
  @@ -41,7 +41,9 @@
   set transport smtp
   finding IP address for 127.0.0.1
   calling host_find_byname
  +using host_fake_gethostbyname for 127.0.0.1 (IPv6)
   gethostbyname2(af=inet6) returned 1 (HOST_NOT_FOUND)
  +using host_fake_gethostbyname for 127.0.0.1 (IPv4)
   local host found for non-MX address
   fully qualified name = 127.0.0.1
   gethostbyname2 looked up these IP addresses:
  @@ -49,7 +51,9 @@
   remote host address is the local host: y: configured to try delivery anyway
   finding IP address for 10.0.0.0
   calling host_find_byname
  +using host_fake_gethostbyname for 10.0.0.0 (IPv6)
   gethostbyname2(af=inet6) returned 1 (HOST_NOT_FOUND)
  +using host_fake_gethostbyname for 10.0.0.0 (IPv4)
   fully qualified name = 10.0.0.0
   gethostbyname2 looked up these IP addresses:
     name=10.0.0.0 address=10.0.0.0


  Index: 463
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/463,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 463    1 Aug 2005 13:20:29 -0000    1.4
  +++ 463    19 Sep 2005 10:13:39 -0000    1.5
  @@ -54,7 +54,9 @@
   set transport t2
   finding IP address for 127.0.0.1
   calling host_find_byname
  +using host_fake_gethostbyname for 127.0.0.1 (IPv6)
   gethostbyname2(af=inet6) returned 1 (HOST_NOT_FOUND)
  +using host_fake_gethostbyname for 127.0.0.1 (IPv4)
   local host found for non-MX address
   fully qualified name = 127.0.0.1
   gethostbyname2 looked up these IP addresses:
  @@ -101,7 +103,9 @@
   expanded list of hosts = "127.0.0.1" options = 
   finding IP address for 127.0.0.1
   calling host_find_byname
  +using host_fake_gethostbyname for 127.0.0.1 (IPv6)
   gethostbyname2(af=inet6) returned 1 (HOST_NOT_FOUND)
  +using host_fake_gethostbyname for 127.0.0.1 (IPv4)
   local host found for non-MX address
   fully qualified name = 127.0.0.1
   gethostbyname2 looked up these IP addresses:
  @@ -204,7 +208,9 @@
   expanded list of hosts = "127.0.0.1" options = 
   finding IP address for 127.0.0.1
   calling host_find_byname
  +using host_fake_gethostbyname for 127.0.0.1 (IPv6)
   gethostbyname2(af=inet6) returned 1 (HOST_NOT_FOUND)
  +using host_fake_gethostbyname for 127.0.0.1 (IPv4)
   local host found for non-MX address
   fully qualified name = 127.0.0.1
   gethostbyname2 looked up these IP addresses:


  Index: 488
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/488,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 488    1 Aug 2005 13:20:29 -0000    1.2
  +++ 488    19 Sep 2005 10:13:39 -0000    1.3
  @@ -27,6 +27,7 @@
   calling dnslookup router
   dnslookup router called for k@???
     domain = mxt13.test.ex
  +passing mxt13.test.ex on to res_search
   DNS lookup of mxt13.test.ex (MX) succeeded
   other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
   other1.test.ex in hosts_treat_as_local? no (end of list)


  Index: 503
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/503,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 503    1 Aug 2005 13:20:29 -0000    1.4
  +++ 503    19 Sep 2005 10:13:39 -0000    1.5
  @@ -78,11 +78,15 @@
   routed by r1 router
     envelope to: x@y
     transport: t1
  +using host_fake_gethostbyname for 127.0.0.1 (IPv6)
   gethostbyname2(af=inet6) returned 1 (HOST_NOT_FOUND)
  +using host_fake_gethostbyname for 127.0.0.1 (IPv4)
   local host found for non-MX address
   fully qualified name = 127.0.0.1
   gethostbyname2 looked up these IP addresses:
     name=127.0.0.1 address=127.0.0.1
  +using host_fake_gethostbyname for ::1 (IPv6)
  +using host_fake_gethostbyname for ::1 (IPv4)
   gethostbyname2(af=inet) returned 1 (HOST_NOT_FOUND)
   local host found for non-MX address
   fully qualified name = ::1
  @@ -188,11 +192,15 @@
   routed by r1 router
     envelope to: x@y
     transport: t1
  +using host_fake_gethostbyname for 127.0.0.1 (IPv6)
   gethostbyname2(af=inet6) returned 1 (HOST_NOT_FOUND)
  +using host_fake_gethostbyname for 127.0.0.1 (IPv4)
   local host found for non-MX address
   fully qualified name = 127.0.0.1
   gethostbyname2 looked up these IP addresses:
     name=127.0.0.1 address=127.0.0.1
  +using host_fake_gethostbyname for ::1 (IPv6)
  +using host_fake_gethostbyname for ::1 (IPv4)
   gethostbyname2(af=inet) returned 1 (HOST_NOT_FOUND)
   local host found for non-MX address
   fully qualified name = ::1


  Index: 514
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/514,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 514    1 Aug 2005 13:20:29 -0000    1.2
  +++ 514    19 Sep 2005 10:13:39 -0000    1.3
  @@ -30,9 +30,17 @@
   check hosts = partial-lsearch;/source/exim4/AutoTest/aux/514.lsearch
   sender host name required, to match against partial-lsearch;/source/exim4/AutoTest/aux/514.lsearch
   looking up host name for 10.0.0.1
  +passing 1.0.0.10.in-addr.arpa on to res_search
   DNS lookup of 1.0.0.10.in-addr.arpa (PTR) succeeded
   IP address lookup yielded ten-1.test.ex
  +using host_fake_gethostbyname for ten-1.test.ex (IPv6)
  +passing ten-1.test.ex on to res_search
  +DNS lookup of ten-1.test.ex (AAAA) gave NO_DATA
  +returning DNS_NODATA
   gethostbyname2(af=inet6) returned 4 (NO_DATA)
  +using host_fake_gethostbyname for ten-1.test.ex (IPv4)
  +passing ten-1.test.ex on to res_search
  +DNS lookup of ten-1.test.ex (A) succeeded
   gethostbyname2 looked up these IP addresses:
     name=ten-1.test.ex address=10.0.0.1
   checking addresses for ten-1.test.ex
  @@ -183,9 +191,17 @@
   processing "deny"
   check hosts = dnsdb;a=$sender_host_name
   looking up host name for 10.0.0.4
  +passing 4.0.0.10.in-addr.arpa on to res_search
   DNS lookup of 4.0.0.10.in-addr.arpa (PTR) succeeded
   IP address lookup yielded ten-4.test.ex
  +using host_fake_gethostbyname for ten-4.test.ex (IPv6)
  +passing ten-4.test.ex on to res_search
  +DNS lookup of ten-4.test.ex (AAAA) gave NO_DATA
  +returning DNS_NODATA
   gethostbyname2(af=inet6) returned 4 (NO_DATA)
  +using host_fake_gethostbyname for ten-4.test.ex (IPv4)
  +passing ten-4.test.ex on to res_search
  +DNS lookup of ten-4.test.ex (A) succeeded
   gethostbyname2 looked up these IP addresses:
     name=ten-4.test.ex address=10.0.0.4
   checking addresses for ten-4.test.ex
  @@ -200,6 +216,7 @@
     type=dnsdb key="a=ten-4.test.ex"
   database lookup required for a=ten-4.test.ex
   dnsdb key: ten-4.test.ex
  +passing ten-4.test.ex on to res_search
   DNS lookup of ten-4.test.ex (A) succeeded
   lookup yielded: 10.0.0.4
   host in "dnsdb;a=ten-4.test.ex"? yes (matched "dnsdb;a=ten-4.test.ex")


  Index: 519
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/519,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 519    1 Aug 2005 13:20:29 -0000    1.2
  +++ 519    19 Sep 2005 10:13:39 -0000    1.3
  @@ -9,8 +9,14 @@
     SMTP connection from [10.0.0.1]
   host in host_lookup? yes (matched "*")
   looking up host name for 10.0.0.1
  +passing 1.0.0.10.in-addr.arpa on to res_search
   DNS lookup of 1.0.0.10.in-addr.arpa (PTR) succeeded
   IP address lookup yielded ten-1.test.ex
  +passing ten-1.test.ex on to res_search
  +DNS lookup of ten-1.test.ex (AAAA) gave NO_DATA
  +returning DNS_NODATA
  +passing ten-1.test.ex on to res_search
  +DNS lookup of ten-1.test.ex (A) succeeded
   gethostbyname2 looked up these IP addresses:
     name=ten-1.test.ex address=10.0.0.1
   checking addresses for ten-1.test.ex
  @@ -38,6 +44,11 @@
   looking up host name for 10.0.0.1
   IP address lookup using gethostbyaddr()
   IP address lookup yielded ten-1.test.ex
  +passing ten-1.test.ex on to res_search
  +DNS lookup of ten-1.test.ex (AAAA) gave NO_DATA
  +returning DNS_NODATA
  +passing ten-1.test.ex on to res_search
  +DNS lookup of ten-1.test.ex (A) succeeded
   gethostbyname2 looked up these IP addresses:
     name=ten-1.test.ex address=10.0.0.1
   checking addresses for ten-1.test.ex
  @@ -63,6 +74,7 @@
     SMTP connection from [1.2.3.4]
   host in host_lookup? yes (matched "*")
   looking up host name for 1.2.3.4
  +passing 4.3.2.1.in-addr.arpa on to res_search
   DNS lookup of 4.3.2.1.in-addr.arpa (PTR) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   IP address lookup using gethostbyaddr()
  @@ -92,6 +104,7 @@
   looking up host name for 1.2.3.4
   IP address lookup using gethostbyaddr()
   IP address lookup failed: h_errno=1
  +passing 4.3.2.1.in-addr.arpa on to res_search
   DNS lookup of 4.3.2.1.in-addr.arpa (PTR) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   LOG: host_lookup_failed MAIN


  Index: 539
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/539,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 539    1 Aug 2005 13:20:29 -0000    1.2
  +++ 539    19 Sep 2005 10:13:39 -0000    1.3
  @@ -19,16 +19,20 @@
   --------> all router <--------
   local_part=x domain=argala
   checking domains
  +passing argala on to res_search
   DNS lookup of argala (MX) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   argala in "!@mx_any"? yes (end of list)
   calling all router
   all router called for x@argala
     domain = argala
  +passing argala on to res_search
   DNS lookup of argala (MX) gave NO_DATA
   returning DNS_NODATA
  +passing argala on to res_search
   DNS lookup of argala (AAAA) gave NO_DATA
   returning DNS_NODATA
  +passing argala on to res_search
   DNS lookup of argala (A) succeeded
   fully qualified name = argala.csi.cam.ac.uk
   argala.csi.cam.ac.uk 131.111.10.23 mx=-1 sort=xx 
  @@ -42,6 +46,7 @@
   --------> all router <--------
   local_part=x domain=argala.csi.cam.ac.uk
   checking domains
  +passing argala.csi.cam.ac.uk on to res_search
   DNS lookup of argala.csi.cam.ac.uk (MX) gave NO_DATA
   returning DNS_NODATA
   Address records are not being sought
  @@ -49,10 +54,13 @@
   calling all router
   all router called for x@???
     domain = argala.csi.cam.ac.uk
  +passing argala.csi.cam.ac.uk on to res_search
   DNS lookup of argala.csi.cam.ac.uk (MX) gave NO_DATA
   returning DNS_NODATA
  +passing argala.csi.cam.ac.uk on to res_search
   DNS lookup of argala.csi.cam.ac.uk (AAAA) gave NO_DATA
   returning DNS_NODATA
  +passing argala.csi.cam.ac.uk on to res_search
   DNS lookup of argala.csi.cam.ac.uk (A) succeeded
   fully qualified name = argala.csi.cam.ac.uk
   argala.csi.cam.ac.uk 131.111.10.23 mx=-1 sort=xx 


  Index: 546
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/546,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 546    1 Aug 2005 13:20:29 -0000    1.2
  +++ 546    19 Sep 2005 10:13:39 -0000    1.3
  @@ -21,9 +21,12 @@
   calling r1 router
   r1 router called for x@???
     domain = mxt1c.test.ex
  +passing mxt1c.test.ex on to res_search
   DNS lookup of mxt1c.test.ex (MX) succeeded
  +passing xoanon on to res_search
   DNS lookup of xoanon (AAAA) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
  +passing xoanon on to res_search
   DNS lookup of xoanon (A) gave HOST_NOT_FOUND
   returning DNS_NOMATCH
   fully qualified name = mxt1c.test.ex


  Index: 581
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/581,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- 581    1 Aug 2005 13:20:29 -0000    1.9
  +++ 581    19 Sep 2005 10:13:39 -0000    1.10
  @@ -74,7 +74,9 @@
     ph10@???
   using the transport's hosts: 127.0.0.1
   getting address for 127.0.0.1
  +using host_fake_gethostbyname for 127.0.0.1 (IPv6)
   gethostbyname2(af=inet6) returned 1 (HOST_NOT_FOUND)
  +using host_fake_gethostbyname for 127.0.0.1 (IPv4)
   local host found for non-MX address
   fully qualified name = 127.0.0.1
   gethostbyname2 looked up these IP addresses:
  @@ -308,7 +310,9 @@
     ph10@???
   using the transport's hosts: 127.0.0.1
   getting address for 127.0.0.1
  +using host_fake_gethostbyname for 127.0.0.1 (IPv6)
   gethostbyname2(af=inet6) returned 1 (HOST_NOT_FOUND)
  +using host_fake_gethostbyname for 127.0.0.1 (IPv4)
   local host found for non-MX address
   fully qualified name = 127.0.0.1
   gethostbyname2 looked up these IP addresses:


  Index: 582
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/582,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 582    1 Aug 2005 13:20:29 -0000    1.2
  +++ 582    19 Sep 2005 10:13:39 -0000    1.3
  @@ -19,6 +19,7 @@
   --------> r1 router <--------
   local_part=ph domain=mxt1.test.ex
   checking domains
  +passing mxt1.test.ex on to res_search
   DNS lookup of mxt1.test.ex (MX) succeeded
   local host has lowest MX
   host_find_bydns yield = HOST_FOUND_LOCAL (3); returned hosts:
  @@ -27,6 +28,7 @@
   mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
   mxt1.test.ex in "+anymx"? yes (matched "+anymx")
   checking "condition"
  +passing mxt1.test.ex on to res_search
   DNS lookup of mxt1.test.ex (MX) succeeded
   local host has lowest MX
   host_find_bydns yield = HOST_FOUND_LOCAL (3); returned hosts: