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
tidying
[exim.git]
/
src
/
src
/
routers
/
dnslookup.c
diff --git
a/src/src/routers/dnslookup.c
b/src/src/routers/dnslookup.c
index 6ab08d7baa0a043aaab9e1576460b2ac14dc22cd..33939be4c26cc0c30d337a15c9376e61a6286e00 100644
(file)
--- a/
src/src/routers/dnslookup.c
+++ b/
src/src/routers/dnslookup.c
@@
-183,7
+183,7
@@
DEBUG(D_route)
if (ob->check_srv)
{
if ( !(srv_service = expand_string(ob->check_srv))
if (ob->check_srv)
{
if ( !(srv_service = expand_string(ob->check_srv))
- && !expand_string_forcedfail)
+ && !
f.
expand_string_forcedfail)
{
addr->message = string_sprintf("%s router: failed to expand \"%s\": %s",
rblock->name, ob->check_srv, expand_string_message);
{
addr->message = string_sprintf("%s router: failed to expand \"%s\": %s",
rblock->name, ob->check_srv, expand_string_message);
@@
-266,12
+266,12
@@
for (;;)
if ( ob->ipv4_only
&& expand_check_condition(ob->ipv4_only, rblock->name, US"router"))
flags = flags & ~HOST_FIND_BY_AAAA | HOST_FIND_IPV4_ONLY;
if ( ob->ipv4_only
&& expand_check_condition(ob->ipv4_only, rblock->name, US"router"))
flags = flags & ~HOST_FIND_BY_AAAA | HOST_FIND_IPV4_ONLY;
- else if (search_find_defer)
+ else if (
f.
search_find_defer)
return DEFER;
if ( ob->ipv4_prefer
&& expand_check_condition(ob->ipv4_prefer, rblock->name, US"router"))
flags |= HOST_FIND_IPV4_FIRST;
return DEFER;
if ( ob->ipv4_prefer
&& expand_check_condition(ob->ipv4_prefer, rblock->name, US"router"))
flags |= HOST_FIND_IPV4_FIRST;
- else if (search_find_defer)
+ else if (
f.
search_find_defer)
return DEFER;
/* Set up the rest of the initial host item. Others may get chained on if
return DEFER;
/* Set up the rest of the initial host item. Others may get chained on if
@@
-300,7
+300,9
@@
for (;;)
rc = host_find_bydns(&h, CUS rblock->ignore_target_hosts, flags,
srv_service, ob->srv_fail_domains, ob->mx_fail_domains,
rc = host_find_bydns(&h, CUS rblock->ignore_target_hosts, flags,
srv_service, ob->srv_fail_domains, ob->mx_fail_domains,
- &rblock->dnssec, &fully_qualified_name, &removed);
+ &rblock->dnssec,
+ &fully_qualified_name, &removed);
+
if (removed) setflag(addr, af_local_host_removed);
/* If host found with only address records, test for the domain's being in
if (removed) setflag(addr, af_local_host_removed);
/* If host found with only address records, test for the domain's being in
@@
-397,7
+399,7
@@
for (;;)
/* If there's a syntax error, do not continue with any widening, and note
the error. */
/* If there's a syntax error, do not continue with any widening, and note
the error. */
- if (host_find_failed_syntax)
+ if (
f.
host_find_failed_syntax)
{
addr->message = string_sprintf("mail domain \"%s\" is syntactically "
"invalid", h.name);
{
addr->message = string_sprintf("mail domain \"%s\" is syntactically "
"invalid", h.name);
@@
-457,7
+459,7
@@
else if (ob->check_secondary_mx && !testflag(addr, af_local_host_removed))
rc = rf_get_errors_address(addr, rblock, verify, &addr->prop.errors_address);
if (rc != OK) return rc;
rc = rf_get_errors_address(addr, rblock, verify, &addr->prop.errors_address);
if (rc != OK) return rc;
-/* Set up the additional and remov
e
able headers for this address. */
+/* Set up the additional and removable headers for this address. */
rc = rf_get_munge_headers(addr, rblock, &addr->prop.extra_headers,
&addr->prop.remove_headers);
rc = rf_get_munge_headers(addr, rblock, &addr->prop.extra_headers,
&addr->prop.remove_headers);