ph10 2005/09/14 10:40:55 BST
Modified files:
exim-src/src verify.c
exim-test-orig/AutoTest runtest
exim-test-orig/AutoTest/confs 617
exim-test-orig/AutoTest/scripts 617
exim-test-orig/AutoTest/stdout 617
Log:
Update one test to avoid prodding the live Exim for a callout (can now
do with port in manualroute). Added comment in the code.
Revision Changes Path
1.27 +7 -3 exim/exim-src/src/verify.c
1.2 +1 -1 exim/exim-test-orig/AutoTest/confs/617
1.10 +2 -2 exim/exim-test-orig/AutoTest/runtest
1.2 +12 -0 exim/exim-test-orig/AutoTest/scripts/617
1.2 +14 -0 exim/exim-test-orig/AutoTest/stdout/617
Index: verify.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/verify.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- verify.c 6 Sep 2005 13:17:36 -0000 1.26
+++ verify.c 14 Sep 2005 09:40:55 -0000 1.27
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/verify.c,v 1.26 2005/09/06 13:17:36 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/verify.c,v 1.27 2005/09/14 09:40:55 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -410,18 +410,22 @@
host_af = (Ustrchr(host->address, ':') == NULL)? AF_INET:AF_INET6;
- /* Expand and interpret the interface and port strings. This has to
- be delayed till now, because they may expand differently for different
- hosts. If there's a failure, log it, but carry on with the defaults. */
+ /* Expand and interpret the interface and port strings. The latter will not
+ be used if there is a host-specific port (e.g. from a manualroute router).
+ This has to be delayed till now, because they may expand differently for
+ different hosts. If there's a failure, log it, but carry on with the
+ defaults. */
deliver_host = host->name;
deliver_host_address = host->address;
deliver_domain = addr->domain;
+
if (!smtp_get_interface(tf->interface, host_af, addr, NULL, &interface,
US"callout") ||
!smtp_get_port(tf->port, addr, &port, US"callout"))
log_write(0, LOG_MAIN|LOG_PANIC, "<%s>: %s", addr->address,
addr->message);
+
deliver_host = deliver_host_address = NULL;
deliver_domain = save_deliver_domain;
Index: runtest
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/runtest,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- runtest 9 Aug 2005 13:31:53 -0000 1.9
+++ runtest 14 Sep 2005 09:40:55 -0000 1.10
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/exim-test-orig/AutoTest/runtest,v 1.9 2005/08/09 13:31:53 ph10 Exp $
+# $Cambridge: exim/exim-test-orig/AutoTest/runtest,v 1.10 2005/09/14 09:40:55 ph10 Exp $
# A script to run some automatic testing of Exim. This has been needed for
# quite some time. I am finally thinking about it in February 1999.
@@ -137,7 +137,7 @@
while(<IN>)
{
s/>>>running<<</<<<testing>>>/;
- s/(\d+\.\d+(?:\.\d+)?\0<<eximversion>>)/"x.yz\0" . ("*" x (length($1) - 5))/e;
+ s/(\d+\.\d+(?:\.\d+)?(-RC\d+)?\0<<eximversion>>)/"x.yz\0" . ("*" x (length($1) - 5))/e;
s/%d(?=\0<<eximcnumber>>)/nn/;
print OUT;
}
Index: 617
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/617,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 617 23 Jun 2005 10:02:13 -0000 1.1
+++ 617 14 Sep 2005 09:40:55 -0000 1.2
@@ -27,7 +27,7 @@
r1:
driver = manualroute
- route_list = * 127.0.0.1
+ route_list = * "<= 127.0.0.1:1225"
self = send
verify_only
Index: 617
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/617,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 617 23 Jun 2005 10:02:13 -0000 1.1
+++ 617 14 Sep 2005 09:40:55 -0000 1.2
@@ -1,4 +1,16 @@
0 callout with no transport
+server 1225
+220 Welcome
+HELO
+250 Hi
+MAIL FROM
+250 OK
+RCPT TO
+550 unrouteable address
+QUIT
+221 Bye
+****
+0
exim -bs
mail from:<unknown@???>
rcpt to:<unknown@???>
Index: 617
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/617,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 617 23 Jun 2005 10:02:13 -0000 1.1
+++ 617 14 Sep 2005 09:40:55 -0000 1.2
@@ -6,3 +6,17 @@
550-Response: 550 unrouteable address
550 Sender verify failed
221 myhost.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1225 ...
+Connection request from [127.0.0.1]
+220 Welcome
+HELO myhost.test.ex
+250 Hi
+MAIL FROM:<>
+250 OK
+RCPT TO:<unknown@???>
+550 unrouteable address
+QUIT
+221 Bye
+End of script
