git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug introduced with +ignore_defer and +include_defer.
[exim.git]
/
src
/
src
/
match.c
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.1
8 2007/06/26 09:23:34
ph10 Exp $ */
+/* $Cambridge: exim/src/src/match.c,v 1.1
9 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);