[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Top Page
Delete this message
Reply to this message
Author: Philip Hazel
Date:  
To: exim-cvs
Subject: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src host.c exim/exim-test runtest exim/exim-test/confs 0366 0455 0499 exim/exim-test/stderr 0499 exim/exim-test/stdout 0467
ph10 2006/03/17 16:51:46 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         host.c 
    exim-test            runtest 
    exim-test/confs      0366 0455 0499 
    exim-test/stderr     0499 
    exim-test/stdout     0467 
  Log:
  Fix address sorting untidiness for the test suite.


  Revision  Changes    Path
  1.334     +3 -0      exim/exim-doc/doc-txt/ChangeLog
  1.23      +8 -6      exim/exim-src/src/host.c
  1.2       +1 -0      exim/exim-test/confs/0366
  1.2       +1 -0      exim/exim-test/confs/0455
  1.2       +1 -0      exim/exim-test/confs/0499
  1.6       +3 -1      exim/exim-test/runtest
  1.3       +0 -1      exim/exim-test/stderr/0499
  1.3       +1 -1      exim/exim-test/stdout/0467


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.333
  retrieving revision 1.334
  diff -u -r1.333 -r1.334
  --- ChangeLog    17 Mar 2006 09:39:00 -0000    1.333
  +++ ChangeLog    17 Mar 2006 16:51:45 -0000    1.334
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.333 2006/03/17 09:39:00 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.334 2006/03/17 16:51:45 ph10 Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -322,6 +322,9 @@
PH/65 Added configuration files for NetBSD3.

   PH/66 Updated OS/Makefile-HP-UX for gcc 4.1.0 with HP-UX 11.
  +
  +PH/67 Fixed minor infelicity in the sorting of addresses to ensure that IPv6
  +      is preferred over IPv4.



Exim version 4.60

  Index: host.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/host.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- host.c    16 Feb 2006 10:05:33 -0000    1.22
  +++ host.c    17 Mar 2006 16:51:45 -0000    1.23
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/host.c,v 1.22 2006/02/16 10:05:33 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/host.c,v 1.23 2006/03/17 16:51:45 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -2876,17 +2876,19 @@
   addresses of a multihomed host, but that should not matter. */


   #if HAVE_IPV6
  -if (h != last)
  +if (h != last && !disable_ipv6)
     {
     for (h = host; h != last; h = h->next)
       {
       host_item temp;
       host_item *next = h->next;
  -    if (h->mx != next->mx ||                /* If next is different MX value */
  -        (h->sort_key % 1000) < 500 ||       /* OR this one is IPv6 */
  -        (next->sort_key % 1000) >= 500)     /* OR next is IPv4 */
  -      continue;                             /* move on to next */
  -    temp = *h;
  +    if (h->mx != next->mx ||                   /* If next is different MX */
  +        h->address == NULL ||                  /* OR this one is unset */
  +        Ustrchr(h->address, ':') != NULL ||    /* OR this one is IPv6 */
  +        (next->address != NULL &&
  +         Ustrchr(next->address, ':') == NULL)) /* OR next is IPv4 */
  +      continue;                                /* move on to next */
  +    temp = *h;                                 /* otherwise, swap */
       temp.next = next->next;
       *h = *next;
       h->next = next;


  Index: runtest
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/runtest,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- runtest    16 Feb 2006 14:34:42 -0000    1.5
  +++ runtest    17 Mar 2006 16:51:45 -0000    1.6
  @@ -1,6 +1,6 @@
   #! /usr/bin/perl -w


-# $Cambridge: exim/exim-test/runtest,v 1.5 2006/02/16 14:34:42 ph10 Exp $
+# $Cambridge: exim/exim-test/runtest,v 1.6 2006/03/17 16:51:45 ph10 Exp $

###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
@@ -648,9 +648,11 @@

     if ($is_stdout)
       {
  -    # Skip translate_ip_address in -bP output because it ain't always there
  +    # Skip translate_ip_address and use_classresources in -bP output because
  +    # they aren't always there.


       next if /translate_ip_address =/;
  +    next if /use_classresources/;


       # In certain filter tests, remove initial filter lines because they just
       # clog up by repetition.


  Index: 0366
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/confs/0366,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0366    7 Feb 2006 10:34:26 -0000    1.1
  +++ 0366    17 Mar 2006 16:51:45 -0000    1.2
  @@ -14,6 +14,7 @@


ignore_bounce_errors_after = 0s
qualify_domain = test.ex
+disable_ipv6

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


  Index: 0455
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/confs/0455,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0455    7 Feb 2006 10:34:26 -0000    1.1
  +++ 0455    17 Mar 2006 16:51:46 -0000    1.2
  @@ -16,6 +16,7 @@


ignore_bounce_errors_after = 0s
qualify_domain = test.ex
+disable_ipv6


# ----- ACLs -----

  Index: 0499
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/confs/0499,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0499    7 Feb 2006 10:34:26 -0000    1.1
  +++ 0499    17 Mar 2006 16:51:46 -0000    1.2
  @@ -12,6 +12,7 @@
   # ----- Main settings -----


domainlist anymx = @mx_any
+disable_ipv6


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

  Index: 0499
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0499,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0499    7 Feb 2006 16:36:25 -0000    1.2
  +++ 0499    17 Mar 2006 16:51:46 -0000    1.3
  @@ -27,7 +27,6 @@
   checking "condition"
   DNS lookup of mxt1.test.ex (MX) using fakens
   DNS lookup of mxt1.test.ex (MX) succeeded
  -DNS lookup of eximtesthost.test.ex-AAAA: using cached value DNS_NODATA
   DNS lookup of eximtesthost.test.ex (A) using fakens
   DNS lookup of eximtesthost.test.ex (A) succeeded
   local host has lowest MX


  Index: 0467
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0467,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0467    16 Feb 2006 10:05:34 -0000    1.2
  +++ 0467    17 Mar 2006 16:51:46 -0000    1.3
  @@ -5,8 +5,8 @@
     host ten-1.test.ex [V4NET.0.0.1] MX=0 port=25
   x@???
     router = r1, transport = t1
  -  host v6.test.ex [unknown] MX=10 ** unusable **
     host ten-1.test.ex [V4NET.0.0.1] MX=10
  +  host v6.test.ex [unknown] MX=10 ** unusable **
   x@???
     router = r1, transport = t1
     host ten-1.test.ex [V4NET.0.0.1] MX=1 port=99