[exim-cvs] cvs commit: exim/exim-src/src match.c version.c …

Páxina inicial
Borrar esta mensaxe
Responder a esta mensaxe
Autor: Philip Hazel
Data:  
Para: exim-cvs
Asunto: [exim-cvs] cvs commit: exim/exim-src/src match.c version.c exim/exim-test/stderr 0475 3202 3204 3205 3208 3210
ph10 2006/04/04 10:48:50 BST

  Modified files:
    exim-src/src         match.c version.c 
    exim-test/stderr     0475 3202 3204 3205 3208 3210 
  Log:
  Change misleading debugging wording "lookup deferred" -> "list match
  deferred" (because it isn't necessarily a lookup in the Exim sense).


  Revision  Changes    Path
  1.13      +3 -3      exim/exim-src/src/match.c
  1.15      +1 -1      exim/exim-src/src/version.c
  1.3       +1 -1      exim/exim-test/stderr/0475
  1.2       +3 -3      exim/exim-test/stderr/3202
  1.2       +1 -1      exim/exim-test/stderr/3204
  1.2       +2 -2      exim/exim-test/stderr/3205
  1.2       +7 -7      exim/exim-test/stderr/3208
  1.2       +3 -3      exim/exim-test/stderr/3210


  Index: match.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/match.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- match.c    7 Feb 2006 11:19:00 -0000    1.12
  +++ match.c    4 Apr 2006 09:48:50 -0000    1.13
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/match.c,v 1.12 2006/02/07 11:19:00 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/match.c,v 1.13 2006/04/04 09:48:50 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -425,7 +425,7 @@
                  FAIL  if expansion force-failed
                  FAIL  if matched a negated item
                  FAIL  if hit end of list after a non-negated item
  -               DEFER if a lookup deferred or expansion failed
  +               DEFER if a something deferred or expansion failed
   */


   int
  @@ -844,10 +844,10 @@
     debug_printf("%s %s (end of list)\n", ot, (yield == OK)? "no":"yes");
   return (yield == OK)? FAIL : OK;


-/* Handle lookup defer */
+/* Something deferred */

DEFER_RETURN:
-HDEBUG(D_lists) debug_printf("%s lookup deferred for %s\n", ot, sss);
+HDEBUG(D_lists) debug_printf("%s list match deferred for %s\n", ot, sss);
return DEFER;
}


  Index: version.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/version.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- version.c    20 Mar 2006 10:55:21 -0000    1.14
  +++ version.c    4 Apr 2006 09:48:50 -0000    1.15
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/version.c,v 1.14 2006/03/20 10:55:21 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/version.c,v 1.15 2006/04/04 09:48:50 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -12,7 +12,7 @@
   #include "exim.h"



-#define THIS_VERSION "4.61-RC1"
+#define THIS_VERSION "4.61"


/* The header file cnumber.h contains a single line containing the

  Index: 3202
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/3202,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3202    7 Feb 2006 10:47:31 -0000    1.1
  +++ 3202    4 Apr 2006 09:48:50 -0000    1.2
  @@ -9,7 +9,7 @@
   >>> using ACL "acl_1_1_1"
   >>> processing "accept"
   >>> check hosts = net-testdb;defer
  ->>> host in "net-testdb;defer"? lookup deferred for net-testdb;defer
  +>>> host in "net-testdb;defer"? list match deferred for net-testdb;defer
   >>> accept: condition test deferred
   LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
   >>> host in hosts_connection_nolog? no (option unset)
  @@ -23,7 +23,7 @@
   >>> using ACL "acl_1_1_2"
   >>> processing "deny"
   >>> check domains = testdb;defer
  ->>> y in "testdb;defer"? lookup deferred for testdb;defer
  +>>> y in "testdb;defer"? list match deferred for testdb;defer
   >>> deny: condition test deferred
   LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
   >>> host in hosts_connection_nolog? no (option unset)
  @@ -37,6 +37,6 @@
   >>> using ACL "acl_1_1_3"
   >>> processing "require"
   >>> check local_parts = testdb;defer
  ->>> x in "testdb;defer"? lookup deferred for testdb;defer
  +>>> x in "testdb;defer"? list match deferred for testdb;defer
   >>> require: condition test deferred
   LOG: H=[1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER


  Index: 0475
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0475,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0475    13 Feb 2006 11:13:37 -0000    1.2
  +++ 0475    4 Apr 2006 09:48:50 -0000    1.3
  @@ -10,7 +10,7 @@
   >>> processing "deny"
   >>> check hosts = 1.2.3.4 : <; 1.2.3.4::5.6.7.8
   LOG: unknown lookup type "<" in host list item "<; 1.2.3.4:5.6.7.8"
  ->>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? lookup deferred for <; 1.2.3.4:5.6.7.8
  +>>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? list match deferred for <; 1.2.3.4:5.6.7.8
   >>> deny: condition test deferred
   LOG: H=[V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<"
   >>> using ACL "a2"


  Index: 3204
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/3204,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3204    7 Feb 2006 10:47:31 -0000    1.1
  +++ 3204    4 Apr 2006 09:48:50 -0000    1.2
  @@ -9,6 +9,6 @@
   >>> using ACL "check_recipient"
   >>> processing "deny"
   >>> check senders = testdb;defer
  ->>> userx@??? in "testdb;defer"? lookup deferred for testdb;defer
  +>>> userx@??? in "testdb;defer"? list match deferred for testdb;defer
   >>> deny: condition test deferred
   LOG: H=[1.2.3.4] F=<userx@???> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER


  Index: 3205
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/3205,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3205    7 Feb 2006 10:47:31 -0000    1.1
  +++ 3205    4 Apr 2006 09:48:50 -0000    1.2
  @@ -9,7 +9,7 @@
   >>> using ACL "acl_1_2_3_4"
   >>> processing "deny"
   >>> check senders = testdb;defer
  ->>> userx@??? in "testdb;defer"? lookup deferred for testdb;defer
  +>>> userx@??? in "testdb;defer"? list match deferred for testdb;defer
   >>> deny: condition test deferred
   LOG: H=[1.2.3.4] F=<userx@???> temporarily rejected RCPT <userx@???>: testdb lookup forced DEFER
   >>> host in hosts_connection_nolog? no (option unset)
  @@ -27,6 +27,6 @@
   >>> accept: condition test failed
   >>> processing "deny"
   >>> check hosts = testdb;defer
  ->>> host in "testdb;defer"? lookup deferred for testdb;defer
  +>>> host in "testdb;defer"? list match deferred for testdb;defer
   >>> deny: condition test deferred
   LOG: H=[4.3.2.1] F=<userx@???> temporarily rejected RCPT <userx@???>: testdb lookup forced DEFER


  Index: 3208
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/3208,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3208    7 Feb 2006 10:47:31 -0000    1.1
  +++ 3208    4 Apr 2006 09:48:50 -0000    1.2
  @@ -19,10 +19,10 @@
   >>> test.ex in "!*relay.ex : test.ex : testhack.ex : testhack2.ex : testdb;defer"? yes (matched "test.ex")
   >>> test.ex in "+local_domains"? yes (matched "+local_domains")
   >>> accept: condition test succeeded
  ->>> other.ex in percent_hack_domains? lookup deferred for testdb;defer
  +>>> other.ex in percent_hack_domains? list match deferred for testdb;defer
   LOG: H=(remote.host) [V4NET.0.0.1] F=<user@???> temporarily rejected RCPT <a@???>: defer in percent_hack_domains check
   >>> testhack.ex in percent_hack_domains? yes (matched "testhack.ex")
  ->>> b in percent_hack_domains? lookup deferred for testdb;defer
  +>>> b in percent_hack_domains? list match deferred for testdb;defer
   LOG: H=(remote.host) [V4NET.0.0.1] F=<user@???> temporarily rejected RCPT <a%b@???>: defer in percent_hack_domains check
   >>> test.ex in percent_hack_domains? no (matched "!test.ex")
   >>> using ACL "check_recipient"
  @@ -35,7 +35,7 @@
   >>> test.ex in "!*relay.ex : test.ex : testhack.ex : testhack2.ex : testdb;defer"? yes (matched "test.ex")
   >>> test.ex in "+local_domains"? yes (matched "+local_domains")
   >>> accept: condition test succeeded
  ->>> testhack2.ex in percent_hack_domains? lookup deferred for testdb;defer
  +>>> testhack2.ex in percent_hack_domains? list match deferred for testdb;defer
   LOG: H=(remote.host) [V4NET.0.0.1] F=<user@???> temporarily rejected RCPT <a%b@???>: defer in percent_hack_domains check
   >>> yesrelay.ex in percent_hack_domains? no (matched "!*relay.ex")
   >>> using ACL "check_recipient"
  @@ -66,8 +66,8 @@
   >>> accept: condition test failed
   >>> processing "accept"
   >>> check domains = +relay_domains
  ->>> norelay.ex in "test.ex : testhack.ex : testhack2.ex : yesrelay.ex : testdb;defer"? lookup deferred for testdb;defer
  ->>> norelay.ex in "+relay_domains"? lookup deferred for +relay_domains
  +>>> norelay.ex in "test.ex : testhack.ex : testhack2.ex : yesrelay.ex : testdb;defer"? list match deferred for testdb;defer
  +>>> norelay.ex in "+relay_domains"? list match deferred for +relay_domains
   >>> accept: condition test deferred
   LOG: H=(remote.host) [V4NET.0.0.1] F=<user@???> temporarily rejected RCPT <a@???>: testdb lookup forced DEFER
   >>> testhack.ex in percent_hack_domains? yes (matched "testhack.ex")
  @@ -101,7 +101,7 @@
   >>> accept: condition test failed
   >>> processing "accept"
   >>> check domains = +relay_domains
  ->>> norelay.ex in "test.ex : testhack.ex : testhack2.ex : yesrelay.ex : testdb;defer"? lookup deferred for testdb;defer
  ->>> norelay.ex in "+relay_domains"? lookup deferred for +relay_domains
  +>>> norelay.ex in "test.ex : testhack.ex : testhack2.ex : yesrelay.ex : testdb;defer"? list match deferred for testdb;defer
  +>>> norelay.ex in "+relay_domains"? list match deferred for +relay_domains
   >>> accept: condition test deferred
   LOG: H=(remote.host) [V4NET.0.0.1] F=<user@???> temporarily rejected RCPT <a%norelay.ex@???>: testdb lookup forced DEFER


  Index: 3210
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/3210,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3210    7 Feb 2006 10:47:31 -0000    1.1
  +++ 3210    4 Apr 2006 09:48:50 -0000    1.2
  @@ -24,9 +24,9 @@
   database lookup required for defer
   testdb lookup forced DEFER
   lookup deferred: testdb lookup forced DEFER
  -test.ex in "testdb;defer"? lookup deferred for testdb;defer
  -test.ex in "+defer_lookup : test.ex"? lookup deferred for +defer_lookup
  -test.ex in "! +local_domains"? lookup deferred for ! +local_domains
  +test.ex in "testdb;defer"? list match deferred for testdb;defer
  +test.ex in "+defer_lookup : test.ex"? list match deferred for +defer_lookup
  +test.ex in "! +local_domains"? list match deferred for ! +local_domains
   domains check lookup or other defer
   search_tidyup called
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=1 >>>>>>>>>>>>>>>>