Fix bug introduced with +ignore_defer and +include_defer.

diff --git a/src/src/match.c b/src/src/match.c
index ae1d90149b27034dd08e2a93e401adc4d9017c16..8b25d2e13dae09c0c1c3d126bc2479816ef49dcf 100644 (file)
--- a/src/src/match.c
+++ b/src/src/match.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/match.c,v 1.18 2007/06/26 09:23:34 ph10 Exp $ */
+/* $Cambridge: exim/src/src/match.c,v 1.19 2007/06/26 13:50:41 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -730,7 +730,7 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
 
     else
       {
 
     else
       {

-      uschar *error;
+      uschar *error = NULL;

       switch ((func)(arg, ss, valueptr, &error))
         {
         case OK:
       switch ((func)(arg, ss, valueptr, &error))
         {
         case OK:


@@ -747,8 +747,6 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
             error);
           break;
           }
             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);
         if (include_defer)
           {
           log_write(0, LOG_MAIN, "%s: accepted by +include_defer", error);


@@ -862,8 +860,6 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
           break;
           }
         (void)fclose(f);
           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);
         if (include_defer)
           {
           log_write(0, LOG_MAIN, "%s: accepted by +include_defer", error);

diff --git a/test/stderr/0069 b/test/stderr/0069
index 72ef492baa73c6a7881e9097393e0febd67d4241..bd1621da11212e407b94da99698b6c11787c1cfc 100644 (file)
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -133,7 +133,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> processing "deny"
 >>> check hosts = +include_defer : test.again.dns
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> 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@myhost.test.ex> rejected RCPT <a@test.ex>
 LOG: DNS lookup of test.again.dns deferred: accepted by +include_defer
 >>> deny: condition test succeeded
 LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>


@@ -153,7 +152,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> processing "accept"
 >>> check hosts = test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> 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@test.ex> temporarily rejected RCPT <b@test.ex>
 >>> 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@test.ex> temporarily rejected RCPT <b@test.ex>