diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-06-26 13:50:41 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-06-26 13:50:41 +0000 |
| commit | 321f3596d3d1a331feae4c5b4e520f47ce7d8890 (patch) | |
| tree | f8e7d8c21ad832fbc76db26829728de14255b316 | |
| parent | c46cc0a465098c30e03323bb1918cf6d5bcd3c3f (diff) | |
Fix bug introduced with +ignore_defer and +include_defer.
| -rw-r--r-- | src/src/match.c | 8 | ||||
| -rw-r--r-- | test/stderr/0069 | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/src/match.c b/src/src/match.c index ae1d90149..8b25d2e13 100644 --- 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 * @@ -730,7 +730,7 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL) else { - uschar *error; + uschar *error = NULL; switch ((func)(arg, ss, valueptr, &error)) { case OK: @@ -747,8 +747,6 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL) 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 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL) 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); diff --git a/test/stderr/0069 b/test/stderr/0069 index 72ef492ba..bd1621da1 100644 --- 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) ->>> 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> @@ -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) ->>> 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> |