git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright year bumps for substantive changes 2017
[users/jgh/exim.git]
/
src
/
src
/
match.c
diff --git
a/src/src/match.c
b/src/src/match.c
index 5bf4ef5d802a07e19209fb604ea08fc90e8e6e3d..fa42187dd1be5bbb22d1a65989582db5033e3d19 100644
(file)
--- a/
src/src/match.c
+++ b/
src/src/match.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
09
*/
+/* Copyright (c) University of Cambridge 1995 - 20
15
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for matching strings */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for matching strings */
@@
-221,8
+221,7
@@
if (cb->at_is_special && pattern[0] == '@')
NULL, /* service name not relevant */
NULL, /* srv_fail_domains not relevant */
NULL, /* mx_fail_domains not relevant */
NULL, /* service name not relevant */
NULL, /* srv_fail_domains not relevant */
NULL, /* mx_fail_domains not relevant */
- NULL, /* no dnssec request XXX ? */
- NULL, /* no dnssec require XXX ? */
+ NULL, /* no dnssec request/require XXX ? */
NULL, /* no feedback FQDN */
&removed); /* feedback if local removed */
NULL, /* no feedback FQDN */
&removed); /* feedback if local removed */
@@
-740,7
+739,7
@@
while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
case DEFER:
if (error == NULL)
case DEFER:
if (error == NULL)
- error = string_sprintf("DNS lookup of
%s
deferred", ss);
+ error = string_sprintf("DNS lookup of
\"%s\"
deferred", ss);
if (ignore_defer)
{
HDEBUG(D_lists) debug_printf("%s: item ignored by +ignore_defer\n",
if (ignore_defer)
{
HDEBUG(D_lists) debug_printf("%s: item ignored by +ignore_defer\n",
@@
-752,6
+751,7
@@
while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
log_write(0, LOG_MAIN, "%s: accepted by +include_defer", error);
return OK;
}
log_write(0, LOG_MAIN, "%s: accepted by +include_defer", error);
return OK;
}
+ if (!search_error_message) search_error_message = error;
goto DEFER_RETURN;
/* The ERROR return occurs when checking hosts, when either a forward
goto DEFER_RETURN;
/* The ERROR return occurs when checking hosts, when either a forward
@@
-771,7
+771,7
@@
while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
include_unknown? "yes":"no", error);
if (!include_unknown)
{
include_unknown? "yes":"no", error);
if (!include_unknown)
{
- if (
(log_extra_selector & LX_unknown_in_list) != 0
)
+ if (
LOGGING(unknown_in_list)
)
log_write(0, LOG_MAIN, "list matching forced to fail: %s", error);
return FAIL;
}
log_write(0, LOG_MAIN, "list matching forced to fail: %s", error);
return FAIL;
}
@@
-880,7
+880,7
@@
while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
(void)fclose(f);
if (!include_unknown)
{
(void)fclose(f);
if (!include_unknown)
{
- if (
(log_extra_selector & LX_unknown_in_list) != 0
)
+ if (
LOGGING(unknown_in_list)
)
log_write(0, LOG_MAIN, "list matching forced to fail: %s", error);
return FAIL;
}
log_write(0, LOG_MAIN, "list matching forced to fail: %s", error);
return FAIL;
}