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

Góra strony
Delete this message
Reply to this message
Autor: Philip Hazel
Data:  
Dla: exim-cvs
Temat: [exim-cvs] cvs commit: exim/exim-src/src match.c exim/exim-test/stderr 0069
ph10 2007/06/26 14:50:41 BST

  Modified files:
    exim-src/src         match.c 
    exim-test/stderr     0069 
  Log:
  Fix bug introduced with +ignore_defer and +include_defer.


  Revision  Changes    Path
  1.19      +1 -5      exim/exim-src/src/match.c
  1.4       +0 -2      exim/exim-test/stderr/0069


  Index: match.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/match.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- match.c    26 Jun 2007 09:23:34 -0000    1.18
  +++ match.c    26 Jun 2007 13:50:41 -0000    1.19
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/match.c,v 1.18 2007/06/26 09:23:34 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/match.c,v 1.19 2007/06/26 13:50:41 ph10 Exp $ */


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


       else
         {
  -      uschar *error;
  +      uschar *error = NULL;
         switch ((func)(arg, ss, valueptr, &error))
           {
           case OK:
  @@ -747,8 +747,6 @@
               error);
             break;
             }
  -        HDEBUG(D_lists) debug_printf("%s %s (%s)\n", ot,
  -          include_defer? "yes":"no", error);
           if (include_defer)
             {
             log_write(0, LOG_MAIN, "%s: accepted by +include_defer", error);
  @@ -862,8 +860,6 @@
             break;
             }
           (void)fclose(f);
  -        HDEBUG(D_lists) debug_printf("%s %s (%s)\n", ot,
  -          include_defer? "yes":"no", error);
           if (include_defer)
             {
             log_write(0, LOG_MAIN, "%s: accepted by +include_defer", error);


  Index: 0069
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0069,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0069    26 Jun 2007 09:23:34 -0000    1.3
  +++ 0069    26 Jun 2007 13:50:41 -0000    1.4
  @@ -133,7 +133,6 @@
   >>> processing "deny"
   >>> check hosts = +include_defer : test.again.dns
   >>> test.again.dns in dns_again_means_nonexist? no (option unset)
  ->>> host in "+include_defer : test.again.dns"? yes (DNS lookup of test.again.dns deferred)
   LOG: DNS lookup of test.again.dns deferred: accepted by +include_defer
   >>> deny: condition test succeeded
   LOG: H=[V4NET.0.0.13] F=<userx@???> rejected RCPT <a@???>
  @@ -153,7 +152,6 @@
   >>> processing "accept"
   >>> check hosts = test.again.dns : V4NET.0.0.13
   >>> test.again.dns in dns_again_means_nonexist? no (option unset)
  ->>> host in "test.again.dns : V4NET.0.0.13"? no (DNS lookup of test.again.dns deferred)
   >>> host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
   >>> accept: condition test deferred
   LOG: H=[V4NET.0.0.13] F=<userx@???> temporarily rejected RCPT <b@???>