[exim-cvs] cvs commit: exim/exim-doc/doc-misc WishList exim…

Góra strony
Delete this message
Reply to this message
Autor: Philip Hazel
Data:  
Dla: exim-cvs
Temat: [exim-cvs] cvs commit: exim/exim-doc/doc-misc WishList exim/exim-doc/doc-txt ChangeLog NewStuff exim/exim-src/exim_monitor em_main.c exim/exim-src/src exim.c functions.h host.c spool_in.c exim/exi
ph10 2005/08/09 14:31:54 BST

  Modified files:
    exim-doc/doc-misc    WishList 
    exim-doc/doc-txt     ChangeLog NewStuff 
    exim-src/exim_monitor em_main.c 
    exim-src/src         exim.c functions.h host.c spool_in.c 
    exim-src/src/routers rf_lookup_hostlist.c 
    exim-src/src/transports smtp.c 
    exim-test-orig/AutoTest runtest 
    exim-test-orig/AutoTest/log 085 086 096 132 145 206 207 238 
                                247 258 259 296 315 399 424 434 
                                451 521 524 530 537 555 557 558 
                                578 580 599 600 608 
    exim-test-orig/AutoTest/msglog 086.10HmaX-0005vi-00 
                                   096.10HmaX-0005vi-00 
                                   206.10HmaX-0005vi-00 
                                   206.10HmaY-0005vi-00 
                                   207.10HmaX-0005vi-00 
                                   580.10HmaY-0005vi-00 
    exim-test-orig/AutoTest/stderr 247 315 451 524 555 600 
  Added files:
    exim-test-orig/AutoTest/confs 618 
    exim-test-orig/AutoTest/log 618 
    exim-test-orig/AutoTest/scripts 618 
    exim-test-orig/AutoTest/stdout 618 
  Log:
  Allow port setting on lists of hosts in manualroute, queryprogram,
  fallback_hosts, and "hosts" in smtp.


  Revision  Changes    Path
  1.47      +0 -6      exim/exim-doc/doc-misc/WishList
  1.204     +6 -0      exim/exim-doc/doc-txt/ChangeLog
  1.63      +26 -0     exim/exim-doc/doc-txt/NewStuff
  1.3       +1 -1      exim/exim-src/exim_monitor/em_main.c
  1.24      +1 -1      exim/exim-src/src/exim.c
  1.19      +2 -1      exim/exim-src/src/functions.h
  1.12      +55 -2     exim/exim-src/src/host.c
  1.4       +21 -2     exim/exim-src/src/routers/rf_lookup_hostlist.c
  1.13      +2 -2      exim/exim-src/src/spool_in.c
  1.17      +32 -18    exim/exim-src/src/transports/smtp.c
  1.1       +50 -0     exim/exim-test-orig/AutoTest/confs/618 (new)
  1.4       +6 -6      exim/exim-test-orig/AutoTest/log/085
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/086
  1.3       +4 -4      exim/exim-test-orig/AutoTest/log/096
  1.4       +4 -4      exim/exim-test-orig/AutoTest/log/132
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/145
  1.3       +3 -3      exim/exim-test-orig/AutoTest/log/206
  1.3       +1 -1      exim/exim-test-orig/AutoTest/log/207
  1.4       +1 -1      exim/exim-test-orig/AutoTest/log/238
  1.3       +1 -1      exim/exim-test-orig/AutoTest/log/247
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/258
  1.2       +5 -5      exim/exim-test-orig/AutoTest/log/259
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/296
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/315
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/399
  1.5       +14 -14    exim/exim-test-orig/AutoTest/log/424
  1.3       +1 -1      exim/exim-test-orig/AutoTest/log/434
  1.3       +1 -1      exim/exim-test-orig/AutoTest/log/451
  1.2       +3 -3      exim/exim-test-orig/AutoTest/log/521
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/524
  1.4       +5 -5      exim/exim-test-orig/AutoTest/log/530
  1.4       +5 -5      exim/exim-test-orig/AutoTest/log/537
  1.3       +1 -1      exim/exim-test-orig/AutoTest/log/555
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/557
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/558
  1.5       +4 -4      exim/exim-test-orig/AutoTest/log/578
  1.4       +1 -1      exim/exim-test-orig/AutoTest/log/580
  1.3       +1 -1      exim/exim-test-orig/AutoTest/log/599
  1.4       +8 -8      exim/exim-test-orig/AutoTest/log/600
  1.4       +2 -2      exim/exim-test-orig/AutoTest/log/608
  1.1       +10 -0     exim/exim-test-orig/AutoTest/log/618 (new)
  1.2       +2 -2      exim/exim-test-orig/AutoTest/msglog/086.10HmaX-0005vi-00
  1.3       +4 -4      exim/exim-test-orig/AutoTest/msglog/096.10HmaX-0005vi-00
  1.2       +2 -2      exim/exim-test-orig/AutoTest/msglog/206.10HmaX-0005vi-00
  1.3       +1 -1      exim/exim-test-orig/AutoTest/msglog/206.10HmaY-0005vi-00
  1.2       +1 -1      exim/exim-test-orig/AutoTest/msglog/207.10HmaX-0005vi-00
  1.4       +1 -1      exim/exim-test-orig/AutoTest/msglog/580.10HmaY-0005vi-00
  1.9       +3 -2      exim/exim-test-orig/AutoTest/runtest
  1.1       +7 -0      exim/exim-test-orig/AutoTest/scripts/618 (new)
  1.6       +1 -1      exim/exim-test-orig/AutoTest/stderr/247
  1.4       +2 -2      exim/exim-test-orig/AutoTest/stderr/315
  1.9       +1 -1      exim/exim-test-orig/AutoTest/stderr/451
  1.5       +2 -2      exim/exim-test-orig/AutoTest/stderr/524
  1.7       +1 -1      exim/exim-test-orig/AutoTest/stderr/555
  1.6       +6 -6      exim/exim-test-orig/AutoTest/stderr/600
  1.1       +8 -0      exim/exim-test-orig/AutoTest/stdout/618 (new)


  Index: WishList
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-misc/WishList,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- WishList    8 Aug 2005 13:52:19 -0000    1.46
  +++ WishList    9 Aug 2005 13:31:52 -0000    1.47
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-misc/WishList,v 1.46 2005/08/08 13:52:19 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-misc/WishList,v 1.47 2005/08/09 13:31:52 ph10 Exp $


EXIM 4 WISH LIST
----------------
@@ -373,10 +373,6 @@
exim_dbmbuild to make them into DBM files.
------------------------------------------------------------------------------

-(174) 19-Sep-2000 S A way of using a different port for fallback hosts.
-Dean Brooks
-------------------------------------------------------------------------------
-
(181) 10-Nov-2000 S Compile-time options for ignoring Sendmail options

So that new ones could be accommodated easily.
@@ -506,8 +502,6 @@

. Options and/or a utility to enable non-privileged users to view the queue
(e.g. -bpp), manipulate their own messages, etc.
-
-. Specify a port along with a host in a route_list.

. A generalized "From" escaping scheme that also escapes >From so that the
whole thing can be reversed.

  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.203
  retrieving revision 1.204
  diff -u -r1.203 -r1.204
  --- ChangeLog    8 Aug 2005 15:02:48 -0000    1.203
  +++ ChangeLog    9 Aug 2005 13:31:52 -0000    1.204
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.203 2005/08/08 15:02:48 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.204 2005/08/09 13:31:52 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -76,6 +76,12 @@
   PH/20 If a delivery was routed to a non-standard port by means of an SRV
         record, the port was not correctly logged when the outgoing_port log
         selector was set (it logged the transort's default port).
  +
  +PH/21 Added support for host-specific ports to manualroute, queryprogram,
  +      fallback_hosts, and "hosts" in the smtp transport.
  +
  +PH/22 If the log selector "outgoing_port" is set, the port is now also given on
  +      host errors such as "Connection refused".



Exim version 4.52

  Index: NewStuff
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- NewStuff    8 Aug 2005 10:48:26 -0000    1.62
  +++ NewStuff    9 Aug 2005 13:31:52 -0000    1.63
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.62 2005/08/08 10:48:26 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.63 2005/08/09 13:31:52 ph10 Exp $


   New Features in Exim
   --------------------
  @@ -75,6 +75,32 @@
         verification to occur when the EHLO/HELO command was issued. The ACL just
         tested the remembered result. Now, if a previous verification attempt has
         not happened, "verify = helo" does it there and then.
  +
  +PH/06 It is now possible to specify a port number along with a host name or
  +      IP address in the list of hosts defined in the manualroute or
  +      queryprogram routers, fallback_hosts, or the "hosts" option of the smtp
  +      transport. These all override any port specification on the transport.
  +      The relatively standard syntax of using a colon separator has been
  +      adopted, but there are some gotchas that need attention:
  +
  +      * In all these lists of hosts, colon is the default separator, so either
  +        the colon that specifies a port must be doubled, or the separator must
  +        be changed. The following two examples have the same effect:
  +
  +          fallback_hosts = host1.tld::1225 : host2.tld::1226
  +          fallback_hosts = <; host1.tld:1225 ; host2.tld:1226
  +
  +      * When IPv6 addresses are involved, it gets worse, because they contain
  +        colons of their own. To make this case easier, it is permitted to
  +        enclose an IP address (either v4 or v6) in square brackets if a port
  +        number follows. Here's an example from a manualroute router:
  +
  +           route_list = * "</ [10.1.1.1]:1225 / [::1]:1226"
  +
  +      If the "/MX" feature is to be used as well as a port specifier, the port
  +      must come last. For example:
  +
  +           route_list = *  dom1.tld/mx::1225



Exim version 4.52

  Index: em_main.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/exim_monitor/em_main.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- em_main.c    4 Jan 2005 10:00:42 -0000    1.2
  +++ em_main.c    9 Aug 2005 13:31:52 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/exim_monitor/em_main.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/exim_monitor/em_main.c,v 1.3 2005/08/09 13:31:52 ph10 Exp $ */


   /*************************************************
   *                  Exim Monitor                  *
  @@ -200,7 +200,7 @@
   */


   int
  -host_extract_port(uschar *address)
  +host_address_extract_port(uschar *address)
   {
   int skip = -3;                     /* Skip 3 dots in IPv4 addresses */
   address--;


  Index: exim.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/exim.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- exim.c    1 Aug 2005 13:20:28 -0000    1.23
  +++ exim.c    9 Aug 2005 13:31:52 -0000    1.24
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/exim.c,v 1.23 2005/08/01 13:20:28 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/exim.c,v 1.24 2005/08/09 13:31:52 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -599,7 +599,7 @@
   static int
   check_port(uschar *address)
   {
  -int port = host_extract_port(address);
  +int port = host_address_extract_port(address);
   if (string_is_ip_address(address, NULL) == 0)
     {
     fprintf(stderr, "exim abandoned: \"%s\" is not an IP address\n", address);


  Index: functions.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/functions.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- functions.h    2 Aug 2005 15:19:20 -0000    1.18
  +++ functions.h    9 Aug 2005 13:31:52 -0000    1.19
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/functions.h,v 1.18 2005/08/02 15:19:20 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/functions.h,v 1.19 2005/08/09 13:31:52 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -107,19 +107,20 @@
   extern void    header_add(int, char *, ...);
   extern int     header_checkname(header_line *, BOOL);
   extern BOOL    header_match(uschar *, BOOL, BOOL, string_item *, int, ...);
  +extern int     host_address_extract_port(uschar *);
   extern uschar *host_and_ident(BOOL);
   extern int     host_aton(uschar *, int *);
   extern void    host_build_hostlist(host_item **, uschar *, BOOL);
   extern ip_address_item *host_build_ifacelist(uschar *, uschar *);
   extern void    host_build_log_info(void);
   extern void    host_build_sender_fullhost(void);
  -extern int     host_extract_port(uschar *);
   extern BOOL    host_find_byname(host_item *, uschar *, uschar **, BOOL);
   extern int     host_find_bydns(host_item *, uschar *, int, uschar *, uschar *,
                    uschar *,uschar **, BOOL *);
   extern ip_address_item *host_find_interfaces(void);
   extern BOOL    host_is_in_net(uschar *, uschar *, int);
   extern BOOL    host_is_tls_on_connect_port(int);
  +extern int     host_item_get_port(host_item *);
   extern void    host_mask(int, int *, int);
   extern int     host_name_lookup(void);
   extern int     host_nmtoa(int, int *, int, uschar *, int);


  Index: host.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/host.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- host.c    2 Aug 2005 09:01:44 -0000    1.11
  +++ host.c    9 Aug 2005 13:31:52 -0000    1.12
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/host.c,v 1.11 2005/08/02 09:01:44 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/host.c,v 1.12 2005/08/09 13:31:52 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -237,7 +237,7 @@
   */


int
-host_extract_port(uschar *address)
+host_address_extract_port(uschar *address)
{
int port = 0;
uschar *endptr;
@@ -281,6 +281,59 @@
}


  +/*************************************************
  +*         Get port from a host item's name       *
  +*************************************************/
  +
  +/* This function is called when finding the IP address for a host that is in a
  +list of hosts explicitly configured, such as in the manualroute router, or in a
  +fallback hosts list. We see if there is a port specification at the end of the
  +host name, and if so, remove it. A minimum length of 3 is required for the
  +original name; nothing shorter is recognized as having a port.
  +
  +We test for a name ending with a sequence of digits; if preceded by colon we
  +have a port if the character before the colon is ] and the name starts with [
  +or if there are no other colons in the name (i.e. it's not an IPv6 address).
  +
  +Arguments:  pointer to the host item
  +Returns:    a port number or PORT_NONE
  +*/
  +
  +int
  +host_item_get_port(host_item *h)
  +{
  +uschar *p;
  +int port, x;
  +int len = Ustrlen(h->name);
  +
  +if (len < 3 || (p = h->name + len - 1, !isdigit(*p))) return PORT_NONE;
  +
  +/* Extract potential port number */
  +
  +port = *p-- - '0';
  +x = 10;
  +
  +while (p > h->name + 1 && isdigit(*p))
  +  {
  +  port += (*p-- - '0') * x;
  +  x *= 10;
  +  }
  +
  +/* The smallest value of p at this point is h->name + 1. */
  +
  +if (*p != ':') return PORT_NONE;
  +
  +if (p[-1] == ']' && h->name[0] == '[')
  +  h->name = string_copyn(h->name + 1, p - h->name - 2);
  +else if (Ustrchr(h->name, ':') == p)
  +  h->name = string_copyn(h->name, p - h->name);
  +else return PORT_NONE;
  +
  +DEBUG(D_route|D_host_lookup) debug_printf("host=%s port=%d\n", h->name, port);
  +return port;
  +}
  +
  +


   #ifndef STAND_ALONE    /* Omit when standalone testing */


@@ -495,7 +548,7 @@

   while ((s = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
     {
  -  int port = host_extract_port(s);            /* Leaves just the IP address */
  +  int port = host_address_extract_port(s);            /* Leaves just the IP address */
     if (string_is_ip_address(s, NULL) == 0)
       log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Malformed IP address \"%s\" in %s",
         s, name);


  Index: spool_in.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/spool_in.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- spool_in.c    27 Jun 2005 14:29:44 -0000    1.12
  +++ spool_in.c    9 Aug 2005 13:31:53 -0000    1.13
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.12 2005/06/27 14:29:44 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.13 2005/08/09 13:31:53 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -448,13 +448,13 @@


     else if (Ustrncmp(big_buffer, "-host_address", 13) == 0)
       {
  -    sender_host_port = host_extract_port(big_buffer + 14);
  +    sender_host_port = host_address_extract_port(big_buffer + 14);
       sender_host_address = string_copy(big_buffer + 14);
       }


     else if (Ustrncmp(big_buffer, "-interface_address", 18) == 0)
       {
  -    interface_port = host_extract_port(big_buffer + 19);
  +    interface_port = host_address_extract_port(big_buffer + 19);
       interface_address = string_copy(big_buffer + 19);
       }



  Index: rf_lookup_hostlist.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/routers/rf_lookup_hostlist.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rf_lookup_hostlist.c    11 Jan 2005 15:51:03 -0000    1.3
  +++ rf_lookup_hostlist.c    9 Aug 2005 13:31:53 -0000    1.4
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/routers/rf_lookup_hostlist.c,v 1.3 2005/01/11 15:51:03 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/routers/rf_lookup_hostlist.c,v 1.4 2005/08/09 13:31:53 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -27,6 +27,12 @@
   replaces the incoming "host". In other words, "x/MX" is shorthand for "those
   hosts pointed to by x's MX records".


  +It is also possible for a port to be specified along with the host name or IP
  +address. The syntax is to add ":port" on to the end. This doesn't work with
  +IPv6 addresses, so we allow IP addresses to be enclosed in [] in order to make
  +this work. The specification of the port must come last, that is, after "/MX"
  +if that is present.
  +
   Arguments:
     rblock               the router block
     addr                 the address being routed
  @@ -61,7 +67,7 @@
   for (h = addr->host_list; h != NULL; prev = h, h = next_h)
     {
     uschar *canonical_name;
  -  int rc, len;
  +  int rc, len, port;


     next_h = h->next;
     if (h->address != NULL) continue;
  @@ -69,6 +75,11 @@
     DEBUG(D_route|D_host_lookup)
       debug_printf("finding IP address for %s\n", h->name);


  +  /* Handle any port setting that may be on the name; it will be removed
  +  from the end of the name. */
  +
  +  port = host_item_get_port(h);
  +
     /* If the name ends with "/MX", we interpret it to mean "the list of hosts
     pointed to by MX records with this name". */


  @@ -78,7 +89,7 @@
       DEBUG(D_route|D_host_lookup)
         debug_printf("doing DNS MX lookup for %s\n", h->name);


  -    h->name[len-3] = 0;
  +    h->name = string_copyn(h->name, len - 3);
       rc = host_find_bydns(h,
           ignore_target_hosts,
           HOST_FIND_BY_MX,                /* look only for MX records */
  @@ -157,6 +168,14 @@


       addr->special_action = SPECIAL_FREEZE;
       return DEFER;
  +    }
  +
  +  /* Deal with a port setting */
  +
  +  if (port != PORT_NONE)
  +    {
  +    host_item *hh;
  +    for (hh = h; hh != next_h; hh = hh->next) hh->port = port;
       }


     /* A local host gets chopped, with its successors, if there are previous


  Index: smtp.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/transports/smtp.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- smtp.c    8 Aug 2005 15:02:48 -0000    1.16
  +++ smtp.c    9 Aug 2005 13:31:53 -0000    1.17
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.16 2005/08/08 15:02:48 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.17 2005/08/09 13:31:53 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -329,8 +329,8 @@
   Returns:       nothing
   */


  -static
  -void set_errno(address_item *addrlist, int errno_value, uschar *msg, int rc,
  +static void
  +set_errno(address_item *addrlist, int errno_value, uschar *msg, int rc,
     BOOL pass_message)
   {
   address_item *addr;
  @@ -505,14 +505,14 @@
     }
   else
     {
  -  log_write(0, LOG_MAIN, "%s [%s]: %s",
  -    host->name,
  -    host->address,
  -    strerror(addr->basic_errno));
  -  deliver_msglog("%s %s [%s]: %s\n",
  -    tod_stamp(tod_log),
  -    host->name,
  -    host->address,
  +  uschar *msg =
  +    ((log_extra_selector & LX_outgoing_port) != 0)?
  +    string_sprintf("%s [%s]:%d", host->name, host->address,
  +      (host->port == PORT_NONE)? 25 : host->port)
  +    :
  +    string_sprintf("%s [%s]", host->name, host->address);
  +  log_write(0, LOG_MAIN, "%s %s", msg, strerror(addr->basic_errno));
  +  deliver_msglog("%s %s %s\n", tod_stamp(tod_log), msg,
       strerror(addr->basic_errno));
     }
   }
  @@ -2206,14 +2206,6 @@
       uschar *retry_message_key = NULL;
       uschar *serialize_key = NULL;


  -    /* Set up a string for adding to the retry key if the port number is not
  -    the standard SMTP port. A host may have its own port setting that overrides
  -    the default. */
  -
  -    pistring = string_sprintf(":%d", (host->port == PORT_NONE)?
  -      port : host->port);
  -    if (Ustrcmp(pistring, ":25") == 0) pistring = US"";
  -
       /* Default next host is next host. :-) But this can vary if the
       hosts_max_try limit is hit (see below). It may also be reset if a host
       address is looked up here (in case the host was multihomed). */
  @@ -2243,6 +2235,8 @@


       if (host->address == NULL)
         {
  +      int new_port;
  +      host_item *hh;
         uschar *canonical_name;


         if (host->status >= hstatus_unusable)
  @@ -2254,6 +2248,13 @@


         DEBUG(D_transport) debug_printf("getting address for %s\n", host->name);


  +      /* The host name is permitted to have an attached port. Find it, and
  +      strip it from the name. Just remember it for now. */
  +
  +      new_port = host_item_get_port(host);
  +
  +      /* Count hosts looked up */
  +
         hosts_looked_up++;


         /* Find by name if so configured, or if it's an IP address. We don't
  @@ -2270,6 +2271,11 @@
             &canonical_name, NULL);
           }


  +      /* Update the host (and any additional blocks, resulting from
  +      multihoming) with a host-specific port, if any. */
  +
  +      for (hh = host; hh != nexthost; hh = hh->next) hh->port = new_port;
  +
         /* Failure to find the host at this time (usually DNS temporary failure)
         is really a kind of routing failure rather than a transport failure.
         Therefore we add a retry item of the routing kind, not to stop us trying
  @@ -2362,6 +2368,14 @@


       deliver_host = host->name;
       deliver_host_address = host->address;
  +
  +    /* Set up a string for adding to the retry key if the port number is not
  +    the standard SMTP port. A host may have its own port setting that overrides
  +    the default. */
  +
  +    pistring = string_sprintf(":%d", (host->port == PORT_NONE)?
  +      port : host->port);
  +    if (Ustrcmp(pistring, ":25") == 0) pistring = US"";


       /* Select IPv4 or IPv6, and choose an outgoing interface. If the interface
       string changes upon expansion, we must add it to the key that is used for


  Index: runtest
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/runtest,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- runtest    23 Jun 2005 10:31:32 -0000    1.8
  +++ runtest    9 Aug 2005 13:31:53 -0000    1.9
  @@ -1,5 +1,5 @@
   #! /bin/sh
  -# $Cambridge: exim/exim-test-orig/AutoTest/runtest,v 1.8 2005/06/23 10:31:32 ph10 Exp $
  +# $Cambridge: exim/exim-test-orig/AutoTest/runtest,v 1.9 2005/08/09 13:31:53 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.
@@ -493,7 +493,8 @@

     s/space=\d+ inodes=\d+/space=xxxxx inodes=xxxxx/;  


  -  if (!/listening for SMTP on/ && !/Connecting to/ && !/=>/ && !/\*>/)
  +  if (!/listening for SMTP on/ && !/Connecting to/ && !/=>/ && !/\*>/ &&
  +      !/Connection refused/)
       { 
       s/\[([a-z\d:]+|\d+(?:\.\d+){3})\]:(\d+)/"[".$1."]:".new_value($2,"%s",\$next_port)/ie;
       }


Index: 618
====================================================================
# Exim test configuration 618

# Macros are set externally in order to get the path
# of the Exim that is being tested, and the directory
# in which the test data lives.

exim_path = EXIM_PATH
primary_hostname = myhost.test.ex
spool_directory = DIR/spool

# ----- Main settings -----

log_selector = +outgoing_port


# ----- Routers -----

begin routers

  r1:
    driver = manualroute
    route_list = * "<= 127.0.0.1:1225 = \
                       127.0.0.1:1226 = \
                       [127.0.0.1]:1227 = \
                       [::1]:1228 = \
                       localhost:1229"    


    fallback_hosts = <= 127.0.0.1:1230 = [::1]:1231 
    self = send 
    transport = t1 



# ----- Transports -----

begin transports

  t1:
    driver = smtp
    hosts_max_try = 20 
    allow_localhost 



# ----- Retry -----

begin retry

* * F,1d,1d


# End

Index: 618
====================================================================
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=251
1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]:1225 Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]:1226 Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]:1227 Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 ::1 [::1]:1228 Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 localhost [::1]:1229 Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 localhost [127.0.0.1]:1229 Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]:1230 Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 ::1 [::1]:1231 Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=r1 T=t1 defer (111): Connection refused

  Index: 085
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/085,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 085    28 Apr 2005 13:06:33 -0000    1.3
  +++ 085    9 Aug 2005 13:31:53 -0000    1.4
  @@ -21,7 +21,7 @@
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=282
  -1999-03-02 09:44:33 10HmbB-0005vi-00 10.0.0.0 [10.0.0.0]: Connection timed out
  +1999-03-02 09:44:33 10HmbB-0005vi-00 10.0.0.0 [10.0.0.0] Connection timed out
   1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
  @@ -31,11 +31,11 @@
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
  -1999-03-02 09:44:33 10HmbB-0005vi-00 10.0.0.0 [10.0.0.0]: Connection timed out
  +1999-03-02 09:44:33 10HmbB-0005vi-00 10.0.0.0 [10.0.0.0] Connection timed out
   1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=288
  -1999-03-02 09:44:33 10HmbD-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmbD-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@??? R=refused T=smtp_connect_refused defer (111): Connection refused
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? routing defer (-51): retry time not reached
  @@ -51,7 +51,7 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? routing defer (-51): retry time not reached
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? routing defer (-51): retry time not reached
   1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (-53): retry time not reached for any host
  -1999-03-02 09:44:33 10HmbD-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmbD-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@??? R=refused T=smtp_connect_refused defer (111): Connection refused
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  @@ -65,12 +65,12 @@
   1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=791 T="Warning: message 10HmaZ-0005vi-00 delayed by 0 minutes"
   1999-03-02 09:44:33 10HmbF-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmbB-0005vi-00 10.0.0.0 [10.0.0.0]: Connection timed out
  +1999-03-02 09:44:33 10HmbB-0005vi-00 10.0.0.0 [10.0.0.0] Connection timed out
   1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=656 T="Warning: message 10HmbB-0005vi-00 delayed by 0 minutes"
   1999-03-02 09:44:33 10HmbG-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmbD-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmbD-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@??? R=refused T=smtp_connect_refused defer (111): Connection refused
   1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=663 T="Warning: message 10HmbD-0005vi-00 delayed by 0 minutes"
   1999-03-02 09:44:33 10HmbH-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery


  Index: 086
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/086,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 086    8 Oct 2004 14:49:31 -0000    1.1
  +++ 086    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,10 +1,10 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=272
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=all T=smtp defer (111): Connection refused
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=all T=smtp defer (-53): retry time not reached for any host
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=all T=smtp defer (111): Connection refused
   1999-03-02 09:44:33 End queue run: pid=pppp


  Index: 096
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/096,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 096    22 Mar 2005 15:45:36 -0000    1.2
  +++ 096    9 Aug 2005 13:31:53 -0000    1.3
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=273
  -1999-03-02 09:44:33 10HmaX-0005vi-00 localhost [::1]: Connection refused
  -1999-03-02 09:44:33 10HmaX-0005vi-00 localhost [127.0.0.1]: Connection refused
  -1999-03-02 09:44:33 10HmaX-0005vi-00 xoanon.csi.cam.ac.uk [2001:630:200:8100:207:e9ff:fe5d:b693]: Connection refused
  -1999-03-02 09:44:33 10HmaX-0005vi-00 xoanon.csi.cam.ac.uk [131.111.10.206]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 localhost [::1] Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 localhost [127.0.0.1] Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 xoanon.csi.cam.ac.uk [2001:630:200:8100:207:e9ff:fe5d:b693] Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 xoanon.csi.cam.ac.uk [131.111.10.206] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == xx@??? R=remote T=smtp defer (111): Connection refused


  Index: 132
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/132,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 132    29 Jun 2005 14:17:02 -0000    1.3
  +++ 132    9 Aug 2005 13:31:53 -0000    1.4
  @@ -2,9 +2,9 @@
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmaX-0005vi-00 == c@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to /source/exim4/AutoTest/test-mail/c)
   1999-03-02 09:44:33 10HmaX-0005vi-00 == d@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to /source/exim4/AutoTest/test-mail/d)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=default T=smtp defer (110): Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.0 [10.0.0.0]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.0 [10.0.0.0] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == b@??? R=default T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** b@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@???: retry timeout exceeded
  @@ -18,7 +18,7 @@
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmaX-0005vi-00 == d@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to /source/exim4/AutoTest/test-mail/d)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=default T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@???: retry timeout exceeded
  @@ -29,7 +29,7 @@
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> U=ph10 P=local S=270
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmbA-0005vi-00 10.0.0.0 [10.0.0.0]: Connection timed out
  +1999-03-02 09:44:33 10HmbA-0005vi-00 10.0.0.0 [10.0.0.0] Connection timed out
   1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=default T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmbA-0005vi-00 b@???: error ignored


  Index: 145
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/145,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 145    8 Oct 2004 14:49:31 -0000    1.1
  +++ 145    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,5 +1,5 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=235
   1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=lookuphost defer (-1): lookup defer for mx_domains
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [10.0.0.2]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [10.0.0.3]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [10.0.0.2] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [10.0.0.3] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=lookuphost T=smtp defer (110): Connection timed out


  Index: 206
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/206,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 206    17 May 2005 15:00:04 -0000    1.2
  +++ 206    9 Aug 2005 13:31:53 -0000    1.3
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=270
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=checkcopy T=makecopy
   1999-03-02 09:44:33 10HmaX-0005vi-00 -> abcd@??? R=checkcopy T=makecopy
  -1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=passall T=pass_on defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@??? R=passall T=pass_on defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= doesn't@matter U=ph10 P=local-smtp S=264
  @@ -11,10 +11,10 @@
   1999-03-02 09:44:33 10HmaY-0005vi-00 == xyz@??? R=passall T=pass_on defer (-53): retry time not reached for any host
   1999-03-02 09:44:33 10HmaY-0005vi-00 == pqr@elsewhere R=passall T=pass_on defer (-53): retry time not reached for any host
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=passall T=pass_on defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@??? R=passall T=pass_on defer (110): Connection timed out
  -1999-03-02 09:44:33 10HmaY-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaY-0005vi-00 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaY-0005vi-00 == abc@??? R=passall T=pass_on defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaY-0005vi-00 == xyz@??? R=passall T=pass_on defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaY-0005vi-00 == pqr@elsewhere R=passall T=pass_on defer (110): Connection timed out


  Index: 207
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/207,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 207    17 May 2005 15:00:04 -0000    1.2
  +++ 207    9 Aug 2005 13:31:53 -0000    1.3
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local-bsmtp S=395 id=E10HmaY-0005vi-00@???
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** abcd@???: Unrouteable address
  -1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=check_file T=pass_on defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1229
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph10@??? R=passall T=pass_on defer (-53): retry time not reached for any host


  Index: 238
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/238,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 238    28 Apr 2005 13:06:33 -0000    1.3
  +++ 238    9 Aug 2005 13:31:53 -0000    1.4
  @@ -31,5 +31,5 @@
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmbA-0005vi-00 == ph@domain1 routing defer (-51): retry time not reached
   1999-03-02 09:44:33 End queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph@domain1 R=others T=smtp defer (111): Connection refused


  Index: 247
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/247,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 247    28 Apr 2005 13:06:33 -0000    1.2
  +++ 247    9 Aug 2005 13:31:53 -0000    1.3
  @@ -12,7 +12,7 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? F=<ph10@???> R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1102
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmbA-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmbA-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=client T=send_to_server defer (111): Connection refused
   1999-03-02 09:44:33 End queue run: pid=pppp -qq
   1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=260


  Index: 258
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/258,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 258    8 Oct 2004 14:49:31 -0000    1.1
  +++ 258    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,3 +1,3 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=251
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@??? R=all T=smtp defer (0): smtp transport found host ::1 to be local


  Index: 259
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/259,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 259    8 Oct 2004 14:49:31 -0000    1.1
  +++ 259    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=250
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ::1 [::1]: Connection refused
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ::1 [::1] Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=all T=smtp defer (111): Connection refused


  Index: 296
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/296,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 296    8 Oct 2004 14:49:31 -0000    1.1
  +++ 296    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,4 +1,4 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=259
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [10.0.0.1]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [10.0.0.2]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [10.0.0.1] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [10.0.0.2] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@??? R=all T=smtp defer (110): Connection timed out


  Index: 315
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/315,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 315    28 Apr 2005 13:06:33 -0000    1.2
  +++ 315    9 Aug 2005 13:31:53 -0000    1.3
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=253
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@??? R=r1 T=t1: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1091
  -1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaY-0005vi-00 ph10@???: error ignored
  @@ -10,7 +10,7 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=253
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph10@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
   1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1081
  -1999-03-02 09:44:33 10HmbA-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmbA-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmbA-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmbA-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmbA-0005vi-00 ph10@???: error ignored


  Index: 399
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/399,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 399    8 Oct 2004 14:49:31 -0000    1.1
  +++ 399    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,4 +1,4 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=260
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=all T=remote_smtp defer (111): Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=all T=remote_smtp defer (-53): retry time not reached for any host


  Index: 424
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/424,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 424    29 Jun 2005 14:17:02 -0000    1.4
  +++ 424    9 Aug 2005 13:31:53 -0000    1.5
  @@ -1,20 +1,20 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=271
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [10.0.0.1]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [10.0.0.2]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [10.0.0.3]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [10.0.0.4]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-5.test.ex [10.0.0.5]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 black-1.test.ex [10.11.12.13]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [10.0.0.1] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [10.0.0.2] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [10.0.0.3] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [10.0.0.4] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-5.test.ex [10.0.0.5] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 black-1.test.ex [10.11.12.13] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [10.0.0.1]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [10.0.0.2]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [10.0.0.3]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [10.0.0.4]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-5.test.ex [10.0.0.5]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-6.test.ex [10.0.0.6]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 black-1.test.ex [10.11.12.13]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 black-2.test.ex [10.11.12.14]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [10.0.0.1] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [10.0.0.2] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [10.0.0.3] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [10.0.0.4] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-5.test.ex [10.0.0.5] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-6.test.ex [10.0.0.6] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 black-1.test.ex [10.11.12.13] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 black-2.test.ex [10.11.12.14] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1060


  Index: 434
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/434,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 434    28 Apr 2005 13:06:33 -0000    1.2
  +++ 434    9 Aug 2005 13:31:53 -0000    1.3
  @@ -16,6 +16,6 @@
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 == c1@??? R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == d2@??? R=ut4 T=ut4 defer (111): Connection refused
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


  Index: 451
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/451,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 451    28 Apr 2005 13:06:33 -0000    1.2
  +++ 451    9 Aug 2005 13:31:53 -0000    1.3
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=251
   1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  -1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.0 [10.0.0.0]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.0 [10.0.0.0] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=r1 T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@y: retry timeout exceeded
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1026


  Index: 521
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/521,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 521    8 Oct 2004 14:49:31 -0000    1.1
  +++ 521    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,12 +1,12 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=253
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=263


  Index: 524
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/524,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 524    8 Oct 2004 14:49:31 -0000    1.1
  +++ 524    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=263
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 End queue run: pid=pppp


  Index: 530
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/530,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 530    29 Jun 2005 14:17:02 -0000    1.3
  +++ 530    9 Aug 2005 13:31:53 -0000    1.4
  @@ -1,11 +1,11 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=271
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [10.0.0.1]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [10.0.0.2]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [10.0.0.3]: Connection timed out
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [10.0.0.4]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [10.0.0.1] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [10.0.0.2] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [10.0.0.3] Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [10.0.0.4] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1060


  Index: 537
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/537,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 537    29 Jun 2005 14:17:02 -0000    1.3
  +++ 537    9 Aug 2005 13:31:53 -0000    1.4
  @@ -1,16 +1,16 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=267
  -1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=267
  -1999-03-02 09:44:33 10HmaY-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaY-0005vi-00 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=267
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local S=267
  -1999-03-02 09:44:33 10HmbA-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmbA-0005vi-00 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmbA-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out
   1999-03-02 09:44:33 10HmbA-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1032
  @@ -18,10 +18,10 @@
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=267
  -1999-03-02 09:44:33 10HmbC-0005vi-00 10.0.0.2 [10.0.0.2]: Connection timed out
  +1999-03-02 09:44:33 10HmbC-0005vi-00 10.0.0.2 [10.0.0.2] Connection timed out
   1999-03-02 09:44:33 10HmbC-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmbC-0005vi-00 10.0.0.2 [10.0.0.2]: Connection timed out
  +1999-03-02 09:44:33 10HmbC-0005vi-00 10.0.0.2 [10.0.0.2] Connection timed out
   1999-03-02 09:44:33 10HmbC-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out
   1999-03-02 09:44:33 10HmbC-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1032


  Index: 555
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/555,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 555    28 Apr 2005 13:06:33 -0000    1.2
  +++ 555    9 Aug 2005 13:31:53 -0000    1.3
  @@ -5,7 +5,7 @@
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph1@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<ph1@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1198
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph2@??? R=r1 T=t1 defer (-53): retry time not reached for any host


  Index: 557
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/557,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 557    8 Oct 2004 14:49:31 -0000    1.1
  +++ 557    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,3 +1,3 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=276
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Cannot assign requested address
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Cannot assign requested address
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph@??? R=r1 T=t1 defer (99): Cannot assign requested address


  Index: 558
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/558,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 558    8 Oct 2004 14:49:31 -0000    1.1
  +++ 558    9 Aug 2005 13:31:53 -0000    1.2
  @@ -6,9 +6,9 @@
   ******** SERVER ********
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -q1h, listening for SMTP on port 1225 (IPv6 and IPv4)
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == 10.0.0.1@??? R=r1 T=t1 defer (110): Connection timed out
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=localhost (xoanon.csi.cam.ac.uk) [127.0.0.1] U=exim P=esmtp S=485 id=E10HmaY-0005vi-00@???
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 10.0.0.2 [10.0.0.2]: Connection timed out
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 10.0.0.2 [10.0.0.2] Connection timed out
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == 127.0.0.1@??? R=r1 T=t1 defer (110): Connection timed out


  Index: 578
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/578,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 578    28 Jun 2005 10:23:35 -0000    1.4
  +++ 578    9 Aug 2005 13:31:53 -0000    1.5
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=301
  -1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  -1999-03-02 09:44:33 10HmaY-0005vi-00 ::1 [::1]: Connection refused
  +1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
  +1999-03-02 09:44:33 10HmaY-0005vi-00 ::1 [::1] Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** xyz@??? R=r9 T=t1: Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=262
  @@ -45,8 +45,8 @@
   1999-03-02 09:44:33 10HmbJ-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbK-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=285
  -1999-03-02 09:44:33 10HmbK-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  -1999-03-02 09:44:33 10HmbK-0005vi-00 ::1 [::1]: Connection refused
  +1999-03-02 09:44:33 10HmbK-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
  +1999-03-02 09:44:33 10HmbK-0005vi-00 ::1 [::1] Connection refused
   1999-03-02 09:44:33 10HmbK-0005vi-00 ** a@??? R=r9 T=t1: Connection refused
   1999-03-02 09:44:33 10HmbK-0005vi-00 ** b@??? R=r9 T=t1: Connection refused
   1999-03-02 09:44:33 10HmbK-0005vi-00 Completed


  Index: 580
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/580,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 580    29 Jun 2005 14:17:02 -0000    1.3
  +++ 580    9 Aug 2005 13:31:53 -0000    1.4
  @@ -2,6 +2,6 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1041
  -1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 599
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/599,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 599    28 Apr 2005 13:06:33 -0000    1.2
  +++ 599    9 Aug 2005 13:31:53 -0000    1.3
  @@ -16,7 +16,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph24@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph25@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=18801
  -1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaY-0005vi-00 ph10@???: error ignored


  Index: 600
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/600,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 600    29 Jun 2005 14:17:02 -0000    1.3
  +++ 600    9 Aug 2005 13:31:53 -0000    1.4
  @@ -1,11 +1,11 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=267
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.2 [127.0.0.2]: Connection refused
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.3 [127.0.0.3]: Connection refused
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.4 [127.0.0.4]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.2 [127.0.0.2] Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.3 [127.0.0.3] Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.4 [127.0.0.4] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1074
  @@ -14,11 +14,11 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=267
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.2 [127.0.0.2]: Connection refused
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.2 [127.0.0.2] Connection refused
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1074


  Index: 608
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/608,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 608    29 Jun 2005 14:17:02 -0000    1.3
  +++ 608    9 Aug 2005 13:31:53 -0000    1.4
  @@ -1,9 +1,9 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=267
  -1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-32): failed to lookup IP address for non-exist.test.ex
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1074
  -1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (-32): failed to lookup IP address for non-exist.test.ex
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaY-0005vi-00 ph10@???: error ignored


  Index: 086.10HmaX-0005vi-00
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/086.10HmaX-0005vi-00,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 086.10HmaX-0005vi-00    8 Oct 2004 14:49:49 -0000    1.1
  +++ 086.10HmaX-0005vi-00    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,5 +1,5 @@
   1999-03-02 09:44:33 Received from ph10@??? U=ph10 P=local S=272
  -1999-03-02 09:44:33 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 ph10@??? R=all T=smtp defer (111): Connection refused
  -1999-03-02 09:44:33 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 ph10@??? R=all T=smtp defer (111): Connection refused


  Index: 096.10HmaX-0005vi-00
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/096.10HmaX-0005vi-00,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 096.10HmaX-0005vi-00    22 Mar 2005 15:45:36 -0000    1.2
  +++ 096.10HmaX-0005vi-00    9 Aug 2005 13:31:53 -0000    1.3
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 Received from ph10@??? U=ph10 P=local S=273
  -1999-03-02 09:44:33 localhost [::1]: Connection refused
  -1999-03-02 09:44:33 localhost [127.0.0.1]: Connection refused
  -1999-03-02 09:44:33 xoanon.csi.cam.ac.uk [2001:630:200:8100:207:e9ff:fe5d:b693]: Connection refused
  -1999-03-02 09:44:33 xoanon.csi.cam.ac.uk [131.111.10.206]: Connection refused
  +1999-03-02 09:44:33 localhost [::1] Connection refused
  +1999-03-02 09:44:33 localhost [127.0.0.1] Connection refused
  +1999-03-02 09:44:33 xoanon.csi.cam.ac.uk [2001:630:200:8100:207:e9ff:fe5d:b693] Connection refused
  +1999-03-02 09:44:33 xoanon.csi.cam.ac.uk [131.111.10.206] Connection refused
   1999-03-02 09:44:33 xx@??? R=remote T=smtp defer (111): Connection refused


  Index: 206.10HmaX-0005vi-00
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/206.10HmaX-0005vi-00,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 206.10HmaX-0005vi-00    8 Oct 2004 14:49:49 -0000    1.1
  +++ 206.10HmaX-0005vi-00    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,9 +1,9 @@
   1999-03-02 09:44:33 Received from ph10@??? U=ph10 P=local S=270
   1999-03-02 09:44:33 ph10@??? <ph10@???>: makecopy transport succeeded
   1999-03-02 09:44:33 abcd@??? <abcd@???>: makecopy transport succeeded
  -1999-03-02 09:44:33 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 ph10@??? R=passall T=pass_on defer (110): Connection timed out
   1999-03-02 09:44:33 abcd@??? R=passall T=pass_on defer (110): Connection timed out
  -1999-03-02 09:44:33 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 ph10@??? R=passall T=pass_on defer (110): Connection timed out
   1999-03-02 09:44:33 abcd@??? R=passall T=pass_on defer (110): Connection timed out


  Index: 206.10HmaY-0005vi-00
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/206.10HmaY-0005vi-00,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 206.10HmaY-0005vi-00    17 May 2005 15:00:05 -0000    1.2
  +++ 206.10HmaY-0005vi-00    9 Aug 2005 13:31:53 -0000    1.3
  @@ -4,7 +4,7 @@
   1999-03-02 09:44:33 abc@??? R=passall T=pass_on defer (-53): retry time not reached for any host
   1999-03-02 09:44:33 xyz@??? R=passall T=pass_on defer (-53): retry time not reached for any host
   1999-03-02 09:44:33 pqr@elsewhere R=passall T=pass_on defer (-53): retry time not reached for any host
  -1999-03-02 09:44:33 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 abc@??? R=passall T=pass_on defer (110): Connection timed out
   1999-03-02 09:44:33 xyz@??? R=passall T=pass_on defer (110): Connection timed out
   1999-03-02 09:44:33 pqr@elsewhere R=passall T=pass_on defer (110): Connection timed out


  Index: 207.10HmaX-0005vi-00
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/207.10HmaX-0005vi-00,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 207.10HmaX-0005vi-00    8 Oct 2004 14:49:49 -0000    1.1
  +++ 207.10HmaX-0005vi-00    9 Aug 2005 13:31:53 -0000    1.2
  @@ -1,4 +1,4 @@
   1999-03-02 09:44:33 Received from ph10@??? U=ph10 P=local-bsmtp S=395 id=E10HmaY-0005vi-00@???
   1999-03-02 09:44:33 routing failed for abcd@???: Unrouteable address
  -1999-03-02 09:44:33 10.0.0.1 [10.0.0.1]: Connection timed out
  +1999-03-02 09:44:33 10.0.0.1 [10.0.0.1] Connection timed out
   1999-03-02 09:44:33 ph10@??? R=check_file T=pass_on defer (110): Connection timed out


  Index: 580.10HmaY-0005vi-00
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/580.10HmaY-0005vi-00,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 580.10HmaY-0005vi-00    29 Jun 2005 14:17:02 -0000    1.3
  +++ 580.10HmaY-0005vi-00    9 Aug 2005 13:31:53 -0000    1.4
  @@ -1,3 +1,3 @@
   1999-03-02 09:44:33 Received from <> R=10HmaX-0005vi-00 U=exim P=local S=1041
  -1999-03-02 09:44:33 127.0.0.1 [127.0.0.1]: Connection refused
  +1999-03-02 09:44:33 127.0.0.1 [127.0.0.1] Connection refused
   1999-03-02 09:44:33 ph10@??? R=r1 T=t1 defer (111): Connection refused


Index: 618
====================================================================
0 port specifications in list of hosts
exim -bt x@y
****
0
exim -odi x@y
****
no_msglog_check

  Index: 247
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/247,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 247    1 Aug 2005 13:20:29 -0000    1.5
  +++ 247    9 Aug 2005 13:31:54 -0000    1.6
  @@ -101,7 +101,7 @@
   delivering 10HmbA-0005vi-00 (queue run pid ppppp)
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.1 [127.0.0.1]: Connection refused
  +  127.0.0.1 [127.0.0.1] Connection refused
   LOG: MAIN
     == b@??? R=client T=send_to_server defer (111): Connection refused
   LOG: queue_run MAIN


  Index: 315
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/315,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 315    28 Apr 2005 13:06:34 -0000    1.3
  +++ 315    9 Aug 2005 13:31:54 -0000    1.4
  @@ -21,7 +21,7 @@
   delivering 10HmaY-0005vi-00
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.1 [127.0.0.1]: Connection refused
  +  127.0.0.1 [127.0.0.1] Connection refused
   LOG: MAIN
     == ph10@??? R=r1 T=t1 defer (111): Connection refused
   LOG: MAIN
  @@ -54,7 +54,7 @@
   delivering 10HmbA-0005vi-00
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.1 [127.0.0.1]: Connection refused
  +  127.0.0.1 [127.0.0.1] Connection refused
   LOG: MAIN
     == ph10@??? R=r1 T=t1 defer (111): Connection refused
   LOG: MAIN


  Index: 451
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/451,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- 451    1 Aug 2005 13:20:29 -0000    1.8
  +++ 451    9 Aug 2005 13:31:54 -0000    1.9
  @@ -134,7 +134,7 @@
   set_process_info: 21680 delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish
   Connecting to 10.0.0.0 [10.0.0.0]:1225 ... failed: Connection timed out (timeout=2s)
   LOG: MAIN
  -  10.0.0.0 [10.0.0.0]: Connection timed out
  +  10.0.0.0 [10.0.0.0] Connection timed out
   set_process_info: 21680 delivering 10HmaX-0005vi-00: just tried 10.0.0.0 [10.0.0.0] for x@y: result DEFER
   added retry item for T:10.0.0.0:10.0.0.0:1225: errno=110 more_errno=1,A flags=2
   all IP addresses skipped or deferred at least one address


  Index: 524
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/524,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 524    1 Aug 2005 13:20:29 -0000    1.4
  +++ 524    9 Aug 2005 13:31:54 -0000    1.5
  @@ -27,7 +27,7 @@
   delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (ph10@???)
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.1 [127.0.0.1]: Connection refused
  +  127.0.0.1 [127.0.0.1] Connection refused
   added retry item for T:127.0.0.1:127.0.0.1:1225: errno=111 more_errno=0,A flags=2
   all IP addresses skipped or deferred at least one address
   Leaving t1 transport
  @@ -57,7 +57,7 @@
   delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (ph10@???)
   Connecting to 127.0.0.1 [127.0.0.1]:1226 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.1 [127.0.0.1]: Connection refused
  +  127.0.0.1 [127.0.0.1] Connection refused
   added retry item for T:127.0.0.1:127.0.0.1:1226: errno=111 more_errno=0,A flags=2
   all IP addresses skipped or deferred at least one address
   Leaving t1 transport


  Index: 555
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/555,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- 555    1 Aug 2005 13:20:29 -0000    1.6
  +++ 555    9 Aug 2005 13:31:54 -0000    1.7
  @@ -91,7 +91,7 @@
   set_process_info: 21680 delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (ph10@???)
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.1 [127.0.0.1]: Connection refused
  +  127.0.0.1 [127.0.0.1] Connection refused
   set_process_info: 21680 delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for ph10@???: result DEFER
   added retry item for T:127.0.0.1:127.0.0.1:1225: errno=111 more_errno=0,A flags=2
   all IP addresses skipped or deferred at least one address


  Index: 600
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/600,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 600    1 Aug 2005 13:20:29 -0000    1.5
  +++ 600    9 Aug 2005 13:31:54 -0000    1.6
  @@ -20,7 +20,7 @@
   hosts_max_try limit reached with this host
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.1 [127.0.0.1]: Connection refused
  +  127.0.0.1 [127.0.0.1] Connection refused
   added retry item for T:127.0.0.1:127.0.0.1:1225: errno=111 more_errno=0,A flags=2
   temporary delivery error(s) override hosts_max_try (message older than host's retry time)
   getting address for 127.0.0.2
  @@ -32,7 +32,7 @@
   hosts_max_try limit reached with this host
   Connecting to 127.0.0.2 [127.0.0.2]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.2 [127.0.0.2]: Connection refused
  +  127.0.0.2 [127.0.0.2] Connection refused
   added retry item for T:127.0.0.2:127.0.0.2:1225: errno=111 more_errno=0,A flags=2
   temporary delivery error(s) override hosts_max_try (message older than host's retry time)
   getting address for 127.0.0.3
  @@ -44,7 +44,7 @@
   hosts_max_try limit reached with this host
   Connecting to 127.0.0.3 [127.0.0.3]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.3 [127.0.0.3]: Connection refused
  +  127.0.0.3 [127.0.0.3] Connection refused
   added retry item for T:127.0.0.3:127.0.0.3:1225: errno=111 more_errno=0,A flags=2
   temporary delivery error(s) override hosts_max_try (message older than host's retry time)
   getting address for 127.0.0.4
  @@ -56,7 +56,7 @@
   hosts_max_try limit reached with this host
   Connecting to 127.0.0.4 [127.0.0.4]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.4 [127.0.0.4]: Connection refused
  +  127.0.0.4 [127.0.0.4] Connection refused
   added retry item for T:127.0.0.4:127.0.0.4:1225: errno=111 more_errno=0,A flags=2
   all IP addresses skipped or deferred at least one address
   Leaving t1 transport
  @@ -116,7 +116,7 @@
   hosts_max_try limit reached with this host
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.1 [127.0.0.1]: Connection refused
  +  127.0.0.1 [127.0.0.1] Connection refused
   added retry item for T:127.0.0.1:127.0.0.1:1225: errno=111 more_errno=0,A flags=2
   temporary delivery error(s) override hosts_max_try (message older than host's retry time)
   getting address for 127.0.0.2
  @@ -128,7 +128,7 @@
   hosts_max_try limit reached with this host
   Connecting to 127.0.0.2 [127.0.0.2]:1225 ... failed: Connection refused
   LOG: MAIN
  -  127.0.0.2 [127.0.0.2]: Connection refused
  +  127.0.0.2 [127.0.0.2] Connection refused
   added retry item for T:127.0.0.2:127.0.0.2:1225: errno=111 more_errno=0,A flags=2
   temporary delivery error(s) override hosts_max_try (message older than host's retry time)
   all IP addresses skipped or deferred at least one address


  Index: 618
  ====================================================================
  x@y
    router = r1, transport = t1
    host 127.0.0.1 [127.0.0.1]  port=1225
    host 127.0.0.1 [127.0.0.1]  port=1226
    host 127.0.0.1 [127.0.0.1]  port=1227
    host ::1       [::1]        port=1228
    host localhost [::1]        port=1229
    host localhost [127.0.0.1]  port=1229