ph10 2005/10/04 09:54:33 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src dns.c
exim-test-orig/AutoTest/stderr 077 186 262 316 317 418 442 447
488 514 519 539 546 582
Log:
Change interface to fake nameserver for new test-suite. Some error
messages changed; hence changes to the old tests too.
Revision Changes Path
1.245 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.12 +60 -56 exim/exim-src/src/dns.c
1.4 +5 -5 exim/exim-test-orig/AutoTest/stderr/077
1.5 +15 -15 exim/exim-test-orig/AutoTest/stderr/186
1.4 +3 -3 exim/exim-test-orig/AutoTest/stderr/262
1.4 +4 -4 exim/exim-test-orig/AutoTest/stderr/316
1.7 +3 -3 exim/exim-test-orig/AutoTest/stderr/317
1.7 +4 -4 exim/exim-test-orig/AutoTest/stderr/418
1.5 +5 -5 exim/exim-test-orig/AutoTest/stderr/442
1.7 +2 -2 exim/exim-test-orig/AutoTest/stderr/447
1.4 +1 -1 exim/exim-test-orig/AutoTest/stderr/488
1.4 +7 -7 exim/exim-test-orig/AutoTest/stderr/514
1.4 +7 -7 exim/exim-test-orig/AutoTest/stderr/519
1.4 +8 -8 exim/exim-test-orig/AutoTest/stderr/539
1.4 +3 -3 exim/exim-test-orig/AutoTest/stderr/546
1.4 +2 -2 exim/exim-test-orig/AutoTest/stderr/582
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- ChangeLog 3 Oct 2005 13:25:32 -0000 1.244
+++ ChangeLog 4 Oct 2005 08:54:33 -0000 1.245
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.244 2005/10/03 13:25:32 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.245 2005/10/04 08:54:33 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -26,6 +26,9 @@
now slurps the rest of the string, so it can include any characters
but it must come last in the list of options (after /sender_retain
or /domain=).
+
+PH/05 Some modifications to the interface to the fake nameserver for the new
+ testing suite.
Exim version 4.53
Index: dns.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dns.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dns.c 16 Sep 2005 14:44:11 -0000 1.11
+++ dns.c 4 Oct 2005 08:54:33 -0000 1.12
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dns.c,v 1.11 2005/09/16 14:44:11 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/dns.c,v 1.12 2005/10/04 08:54:33 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -29,10 +29,10 @@
/* This function is called instead of res_search() when Exim is running in its
test harness. It recognizes some special domain names, and uses them to force
-failure and retry responses (optionally with a delay). It also recognises the
-zones test.ex, 10.in-addr.arpa, and 0.8.e.f.ip6.arpa, and for those it calls an
-external utility that mock-up a nameserver, if it can find the utility.
-Otherwise, it passes its arguments on to res_search().
+failure and retry responses (optionally with a delay). Otherwise, it calls an
+external utility that mocks-up a nameserver, if it can find the utility.
+If not, it passes its arguments on to res_search(). The fake nameserver may
+also return a code specifying that the name should be passed on.
Background: the original test suite required a real nameserver to carry the
test zones, whereas the new test suit has the fake server for portability. This
@@ -51,14 +51,24 @@
fakens_search(uschar *domain, int type, uschar *answerptr, int size)
{
int len = Ustrlen(domain);
+int asize = size; /* Locally modified */
uschar *endname;
uschar name[256];
+uschar utilname[256];
+uschar *aptr = answerptr; /* Locally modified */
+struct stat statbuf;
+
+/* Remove terminating dot. */
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 */
@@ -81,66 +91,60 @@
return -1;
}
-if (Ustrcmp(name, "test.ex") == 0 ||
- (len > 8 && Ustrcmp(endname - 8, ".test.ex") == 0) ||
- (len >= 16 && Ustrcmp(endname - 16, ".10.in-addr.arpa") == 0) ||
- (len >= 17 && Ustrcmp(endname - 17, ".0.8.e.f.ip6.arpa") == 0))
+/* Look for the fakens utility, and if it exists, call it. */
+
+(void)string_format(utilname, sizeof(utilname), "%s/../bin/fakens",
+ spool_directory);
+
+if (stat(CS utilname, &statbuf) >= 0)
{
- uschar utilname[256];
- struct stat statbuf;
+ pid_t pid;
+ int infd, outfd, rc;
+ uschar *argv[5];
+
+ DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) using fakens\n",
+ name, dns_text_type(type));
+
+ argv[0] = utilname;
+ argv[1] = spool_directory;
+ argv[2] = name;
+ argv[3] = dns_text_type(type);
+ argv[4] = NULL;
+
+ pid = child_open(argv, NULL, 0000, &infd, &outfd, FALSE);
+ if (pid < 0)
+ log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to run fakens: %s",
+ strerror(errno));
+
+ len = 0;
+ rc = -1;
+ while (asize > 0 && (rc = read(outfd, aptr, asize)) > 0)
+ {
+ len += rc;
+ aptr += rc; /* Don't modify the actual arguments, because they */
+ asize -= rc; /* may need to be passed on to res_search(). */
+ }
- (void)string_format(utilname, sizeof(utilname), "%s/../bin/fakens",
- spool_directory);
+ if (rc < 0)
+ log_write(0, LOG_MAIN|LOG_PANIC_DIE, "read from fakens failed: %s",
+ strerror(errno));
- if (stat(CS utilname, &statbuf) >= 0)
+ switch(child_close(pid, 0))
{
- pid_t pid;
- int infd, outfd, rc;
- uschar *argv[5];
-
- DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) using fakens\n",
- name, dns_text_type(type));
-
- argv[0] = utilname;
- argv[1] = spool_directory;
- argv[2] = name;
- argv[3] = dns_text_type(type);
- argv[4] = NULL;
-
- pid = child_open(argv, NULL, 0000, &infd, &outfd, FALSE);
- if (pid < 0)
- log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to run fakens: %s",
- strerror(errno));
-
- len = 0;
- rc = -1;
- while (size > 0 && (rc = read(outfd, answerptr, size)) > 0)
- {
- len += rc;
- answerptr += rc;
- size -= rc;
- }
-
- if (rc < 0)
- log_write(0, LOG_MAIN|LOG_PANIC_DIE, "read from fakens failed: %s",
- strerror(errno));
-
- switch(child_close(pid, 0))
- {
- case 0: return len;
- case 1: h_errno = HOST_NOT_FOUND; break;
- case 2: h_errno = TRY_AGAIN; break;
- default:
- case 3: h_errno = NO_RECOVERY; break;
- case 4: h_errno = NO_DATA; break;
- }
- return -1;
+ case 0: return len;
+ case 1: h_errno = HOST_NOT_FOUND; return -1;
+ case 2: h_errno = TRY_AGAIN; return -1;
+ default:
+ case 3: h_errno = NO_RECOVERY; return -1;
+ case 4: h_errno = NO_DATA; return -1;
+ case 5: /* Pass on to res_search() */
+ DEBUG(D_dns) debug_printf("fakens returned PASS_ON\n");
}
}
-/* Not test.ex or 10.in-addr.arpa, or fakens utility not found. */
+/* fakens utility not found, or it returned "pass on" */
-DEBUG(D_dns) debug_printf("passing %s on to res_search\n", domain);
+DEBUG(D_dns) debug_printf("passing %s on to res_search()\n", domain);
return res_search(CS domain, C_IN, type, answerptr, size);
}
Index: 077
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/077,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 077 19 Sep 2005 10:13:39 -0000 1.3
+++ 077 4 Oct 2005 08:54:33 -0000 1.4
@@ -82,17 +82,17 @@
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
+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
+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
+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
@@ -100,12 +100,12 @@
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
+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
+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
Index: 186
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/186,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 186 19 Sep 2005 10:13:39 -0000 1.4
+++ 186 4 Oct 2005 08:54:33 -0000 1.5
@@ -82,13 +82,13 @@
calling lookuphost router
lookuphost router called for abcd@???
domain = ten-1.test.ex
-passing ten-1.test.ex on to res_search
+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
+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
+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
@@ -187,7 +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
+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
@@ -284,13 +284,13 @@
calling lookuphost router
lookuphost router called for abcd@???
domain = ten-1.test.ex
-passing ten-1.test.ex on to res_search
+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
+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
+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
@@ -387,7 +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
+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
@@ -434,7 +434,7 @@
calling lookuphost router
lookuphost router called for ph10@???
domain = nonexist.test.ex
-passing nonexist.test.ex on to res_search
+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@???
@@ -486,13 +486,13 @@
calling lookuphost router
lookuphost router called for abcd@???
domain = ten-1.test.ex
-passing ten-1.test.ex on to res_search
+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
+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
+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
@@ -530,10 +530,10 @@
set transport smtp
finding IP address for nonexist.test.ex
doing DNS lookup
-passing nonexist.test.ex on to res_search
+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
+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@???
@@ -589,7 +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
+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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 262 19 Sep 2005 10:13:39 -0000 1.3
+++ 262 4 Oct 2005 08:54:33 -0000 1.4
@@ -29,7 +29,7 @@
type=dnsdb key="test.ex"
database lookup required for test.ex
dnsdb key: test.ex
-passing test.ex on to res_search
+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")
@@ -84,7 +84,7 @@
type=dnsdb key="unknown"
database lookup required for unknown
dnsdb key: unknown
-passing unknown on to res_search
+passing unknown on to res_search()
DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
returning DNS_NOMATCH
lookup failed
@@ -114,7 +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
+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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 316 19 Sep 2005 10:13:39 -0000 1.3
+++ 316 4 Oct 2005 08:54:33 -0000 1.4
@@ -20,7 +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
+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()
@@ -108,7 +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
+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()
@@ -158,7 +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
+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()
@@ -208,7 +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
+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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 317 19 Sep 2005 10:13:39 -0000 1.6
+++ 317 4 Oct 2005 08:54:33 -0000 1.7
@@ -276,13 +276,13 @@
calling r2 router
r2 router called for unknown@???
domain = test.ex
-passing test.ex on to res_search
+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
+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
+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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 418 19 Sep 2005 10:13:39 -0000 1.6
+++ 418 4 Oct 2005 08:54:33 -0000 1.7
@@ -91,17 +91,17 @@
calling r1 router
r1 router called for kilos@thishost
domain = thishost
-passing thishost on to res_search
+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
+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
+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
+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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 442 19 Sep 2005 10:13:39 -0000 1.4
+++ 442 4 Oct 2005 08:54:33 -0000 1.5
@@ -38,29 +38,29 @@
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
+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
+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
+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
+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
+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
Index: 447
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/447,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 447 19 Sep 2005 10:13:39 -0000 1.6
+++ 447 4 Oct 2005 08:54:33 -0000 1.7
@@ -159,10 +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
+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
+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: 488
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/488,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 488 19 Sep 2005 10:13:39 -0000 1.3
+++ 488 4 Oct 2005 08:54:33 -0000 1.4
@@ -27,7 +27,7 @@
calling dnslookup router
dnslookup router called for k@???
domain = mxt13.test.ex
-passing mxt13.test.ex on to res_search
+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: 514
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/514,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 514 19 Sep 2005 10:13:39 -0000 1.3
+++ 514 4 Oct 2005 08:54:33 -0000 1.4
@@ -30,16 +30,16 @@
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
+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
+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
+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
@@ -191,16 +191,16 @@
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
+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
+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
+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
@@ -216,7 +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
+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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 519 19 Sep 2005 10:13:39 -0000 1.3
+++ 519 4 Oct 2005 08:54:33 -0000 1.4
@@ -9,13 +9,13 @@
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
+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
+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
+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
@@ -44,10 +44,10 @@
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
+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
+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
@@ -74,7 +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
+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()
@@ -104,7 +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
+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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 539 19 Sep 2005 10:13:39 -0000 1.3
+++ 539 4 Oct 2005 08:54:33 -0000 1.4
@@ -19,20 +19,20 @@
--------> all router <--------
local_part=x domain=argala
checking domains
-passing argala on to res_search
+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
+passing argala on to res_search()
DNS lookup of argala (MX) gave NO_DATA
returning DNS_NODATA
-passing argala on to res_search
+passing argala on to res_search()
DNS lookup of argala (AAAA) gave NO_DATA
returning DNS_NODATA
-passing argala on to res_search
+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
@@ -46,7 +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
+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
@@ -54,13 +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
+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
+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
+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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 546 19 Sep 2005 10:13:39 -0000 1.3
+++ 546 4 Oct 2005 08:54:33 -0000 1.4
@@ -21,12 +21,12 @@
calling r1 router
r1 router called for x@???
domain = mxt1c.test.ex
-passing mxt1c.test.ex on to res_search
+passing mxt1c.test.ex on to res_search()
DNS lookup of mxt1c.test.ex (MX) succeeded
-passing xoanon on to res_search
+passing xoanon on to res_search()
DNS lookup of xoanon (AAAA) gave HOST_NOT_FOUND
returning DNS_NOMATCH
-passing xoanon on to res_search
+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: 582
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/582,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 582 19 Sep 2005 10:13:39 -0000 1.3
+++ 582 4 Oct 2005 08:54:33 -0000 1.4
@@ -19,7 +19,7 @@
--------> r1 router <--------
local_part=ph domain=mxt1.test.ex
checking domains
-passing mxt1.test.ex on to res_search
+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:
@@ -28,7 +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
+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:
