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
struct dnssec_domains
[exim.git]
/
src
/
src
/
routers
/
dnslookup.c
diff --git
a/src/src/routers/dnslookup.c
b/src/src/routers/dnslookup.c
index 8ef4e0da97af339a8c0991cc684d4cbd7bc12064..b4ad5eafd426f95eaa4a98d44a9b4510a76c5442 100644
(file)
--- a/
src/src/routers/dnslookup.c
+++ b/
src/src/routers/dnslookup.c
@@
-18,10
+18,6
@@
optionlist dnslookup_router_options[] = {
(void *)(offsetof(dnslookup_router_options_block, check_secondary_mx)) },
{ "check_srv", opt_stringptr,
(void *)(offsetof(dnslookup_router_options_block, check_srv)) },
(void *)(offsetof(dnslookup_router_options_block, check_secondary_mx)) },
{ "check_srv", opt_stringptr,
(void *)(offsetof(dnslookup_router_options_block, check_srv)) },
- { "dnssec_request_domains", opt_stringptr,
- (void *)(offsetof(dnslookup_router_options_block, dnssec_request_domains)) },
- { "dnssec_require_domains", opt_stringptr,
- (void *)(offsetof(dnslookup_router_options_block, dnssec_require_domains)) },
{ "fail_defer_domains", opt_stringptr,
(void *)(offsetof(dnslookup_router_options_block, fail_defer_domains)) },
{ "mx_domains", opt_stringptr,
{ "fail_defer_domains", opt_stringptr,
(void *)(offsetof(dnslookup_router_options_block, fail_defer_domains)) },
{ "mx_domains", opt_stringptr,
@@
-60,8
+56,6
@@
dnslookup_router_options_block dnslookup_router_option_defaults = {
NULL, /* mx_fail_domains */
NULL, /* srv_fail_domains */
NULL, /* check_srv */
NULL, /* mx_fail_domains */
NULL, /* srv_fail_domains */
NULL, /* check_srv */
- NULL, /* dnssec_request_domains */
- NULL, /* dnssec_require_domains */
NULL /* fail_defer_domains */
};
NULL /* fail_defer_domains */
};
@@
-271,8
+265,7
@@
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,
- ob->dnssec_request_domains, ob->dnssec_require_domains,
- &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
@@
-421,13
+414,13
@@
else if (ob->check_secondary_mx && !testflag(addr, af_local_host_removed))
/* Set up the errors address, if any. */
/* Set up the errors address, if any. */
-rc = rf_get_errors_address(addr, rblock, verify, &
(addr->p.errors_address)
);
+rc = rf_get_errors_address(addr, rblock, verify, &
addr->prop.errors_address
);
if (rc != OK) return rc;
/* Set up the additional and removeable headers for this address. */
if (rc != OK) return rc;
/* Set up the additional and removeable headers for this address. */
-rc = rf_get_munge_headers(addr, rblock, &
(addr->p.extra_headers)
,
- &
(addr->p.remove_headers)
);
+rc = rf_get_munge_headers(addr, rblock, &
addr->prop.extra_headers
,
+ &
addr->prop.remove_headers
);
if (rc != OK) return rc;
/* Get store in which to preserve the original host item, chained on
if (rc != OK) return rc;
/* Get store in which to preserve the original host item, chained on