diff options
| author | Todd Lyons <tlyons@exim.org> | 2014-04-29 17:07:04 -0700 |
|---|---|---|
| committer | Todd Lyons <tlyons@exim.org> | 2014-04-29 17:07:04 -0700 |
| commit | eea58ada63dde3265728daccc037d3a376b25f45 (patch) | |
| tree | b7b4a63c3c6c21d8e169d9ee12fdae3108c86800 /src | |
| parent | d2af03f4c11273d6f52c9043119e24e732080885 (diff) | |
| parent | 578897ea8764001d0538b8b645d161524ba1fa4e (diff) | |
Merge branch 'master' of ssh://git.exim.org/home/git/exim
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/transports/smtp.c | 10 | ||||
| -rw-r--r-- | src/src/transports/smtp.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index 57b66b881..9e0ab1556 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -55,6 +55,10 @@ optionlist smtp_transport_options[] = { (void *)offsetof(smtp_transport_options_block, dns_qualify_single) }, { "dns_search_parents", opt_bool, (void *)offsetof(smtp_transport_options_block, dns_search_parents) }, + { "dnssec_request_domains", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, dnssec_request_domains) }, + { "dnssec_require_domains", opt_stringptr, + (void *)offsetof(smtp_transport_options_block, dnssec_require_domains) }, { "dscp", opt_stringptr, (void *)offsetof(smtp_transport_options_block, dscp) }, { "fallback_hosts", opt_stringptr, @@ -213,6 +217,8 @@ smtp_transport_options_block smtp_transport_option_defaults = { FALSE, /* gethostbyname */ TRUE, /* dns_qualify_single */ FALSE, /* dns_search_parents */ + NULL, /* dnssec_request_domains */ + NULL, /* dnssec_require_domains */ TRUE, /* delay_after_cutoff */ FALSE, /* hosts_override */ FALSE, /* hosts_randomize */ @@ -2816,7 +2822,7 @@ for (cutoff_retry = 0; expired && rc = host_find_byname(host, NULL, flags, &canonical_name, TRUE); else rc = host_find_bydns(host, NULL, flags, NULL, NULL, NULL, - NULL, NULL, /*XXX todo: smtp tpt hosts_require_dnssec */ + ob->dnssec_request_domains, ob->dnssec_require_domains, &canonical_name, NULL); /* Update the host (and any additional blocks, resulting from @@ -3429,4 +3435,6 @@ DEBUG(D_transport) debug_printf("Leaving %s transport\n", tblock->name); return TRUE; /* Each address has its status */ } +/* vi: aw ai sw=2 +*/ /* End of transport/smtp.c */ diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h index 6d33802ab..6912ad83e 100644 --- a/src/src/transports/smtp.h +++ b/src/src/transports/smtp.h @@ -46,6 +46,8 @@ typedef struct { BOOL gethostbyname; BOOL dns_qualify_single; BOOL dns_search_parents; + uschar *dnssec_request_domains; + uschar *dnssec_require_domains; BOOL delay_after_cutoff; BOOL hosts_override; BOOL hosts_randomize; |