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
Support REQUIRETLS
[exim.git]
/
src
/
src
/
verify.c
diff --git
a/src/src/verify.c
b/src/src/verify.c
index c7c769a164746d22eb372e1bdca4c6d57519af19..35b21a54d6737f5574383e1be104d6cbef767910 100644
(file)
--- a/
src/src/verify.c
+++ b/
src/src/verify.c
@@
-172,7
+172,6
@@
else
if ( cache_record->result == ccache_reject
|| *from_address == 0 && cache_record->result == ccache_reject_mfnull)
{
if ( cache_record->result == ccache_reject
|| *from_address == 0 && cache_record->result == ccache_reject_mfnull)
{
- setflag(addr, af_verify_nsfail);
HDEBUG(D_verify)
debug_printf("callout cache: domain gave initial rejection, or "
"does not accept HELO or MAIL FROM:<>\n");
HDEBUG(D_verify)
debug_printf("callout cache: domain gave initial rejection, or "
"does not accept HELO or MAIL FROM:<>\n");
@@
-990,6
+989,13
@@
no_conn:
done = TRUE;
}
break;
done = TRUE;
}
break;
+#endif
+#if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
+ case ERRNO_REQUIRETLS:
+ addr->user_message = US"530 5.7.4 REQUIRETLS support required";
+ yield = FAIL;
+ done = TRUE;
+ break;
#endif
case ECONNREFUSED:
sx.send_quit = FALSE;
#endif
case ECONNREFUSED:
sx.send_quit = FALSE;
@@
-1901,16
+1907,16
@@
while (addr_new)
(void)host_find_byname(host, NULL, flags, NULL, TRUE);
else
{
(void)host_find_byname(host, NULL, flags, NULL, TRUE);
else
{
-
dnssec_domains * dnssec_domains
= NULL;
+
const dnssec_domains * dsp
= NULL;
if (Ustrcmp(tp->driver_name, "smtp") == 0)
{
smtp_transport_options_block * ob =
(smtp_transport_options_block *) tp->options_block;
if (Ustrcmp(tp->driver_name, "smtp") == 0)
{
smtp_transport_options_block * ob =
(smtp_transport_options_block *) tp->options_block;
- d
nssec_domains
= &ob->dnssec;
+ d
sp
= &ob->dnssec;
}
(void) host_find_bydns(host, NULL, flags, NULL, NULL, NULL,
}
(void) host_find_bydns(host, NULL, flags, NULL, NULL, NULL,
- d
nssec_domains
, NULL, NULL);
+ d
sp
, NULL, NULL);
}
}
}
}
}
}
@@
-1941,7
+1947,7
@@
while (addr_new)
else
{
HDEBUG(D_verify) debug_printf("Cannot do callout: neither router nor "
else
{
HDEBUG(D_verify) debug_printf("Cannot do callout: neither router nor "
- "transport provided a host list\n");
+ "transport provided a host list
, or transport is not smtp
\n");
}
}
}
}
}
}