chiark
/
gitweb
/
~mdw
/
exim-config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base.m4: Explicitly disable the `CHUNKING' extension.
[exim-config]
/
base.m4
diff --git
a/base.m4
b/base.m4
index cb0f7a602baa848585c21b50150b187a84b5e11b..9e07bf7d92b22797a6bdd59c445f7e611ff1248e 100644
(file)
--- a/
base.m4
+++ b/
base.m4
@@
-59,6
+59,8
@@
gecos_name = $1
gecos_pattern = ([^,:]*)
SECTION(global, incoming)m4_dnl
gecos_pattern = ([^,:]*)
SECTION(global, incoming)m4_dnl
+rfc1413_hosts = *
+rfc1413_query_timeout = 10s
received_header_text = Received: \
${if def:sender_rcvhost \
{from $sender_rcvhost\n\t} \
received_header_text = Received: \
${if def:sender_rcvhost \
{from $sender_rcvhost\n\t} \
@@
-73,13
+75,20
@@
received_header_text = Received: \
${if def:sender_address \
{(envelope-from $sender_address\
${if def:authenticated_id \
${if def:sender_address \
{(envelope-from $sender_address\
${if def:authenticated_id \
- {; auth=$authenticated_id}})\n\t}}\
+ {; auth=${quote_local_part:$authenticated_id}} \
+ {${if and {{def:authenticated_sender} \
+ {match_address{$authenticated_sender} \
+ {*@CONF_master_domain}}} \
+ {; auth=${quote_local_part:\
+ ${local_part:\
+ $authenticated_sender}}}}}})\n\t}}\
id $message_exim_id\
${if def:received_for {\n\tfor $received_for}}
SECTION(global, smtp)m4_dnl
smtp_return_error_details = true
accept_8bitmime = true
id $message_exim_id\
${if def:received_for {\n\tfor $received_for}}
SECTION(global, smtp)m4_dnl
smtp_return_error_details = true
accept_8bitmime = true
+chunking_advertise_hosts =
SECTION(global, env)m4_dnl
keep_environment =
SECTION(global, env)m4_dnl
keep_environment =
@@
-412,7
+421,7
@@
smtp:
driver = smtp
APPLY_HEADER_CHANGES
tls_require_ciphers = CONF_acceptable_ciphers
driver = smtp
APPLY_HEADER_CHANGES
tls_require_ciphers = CONF_acceptable_ciphers
- tls_dh_min_bits =
1020
+ tls_dh_min_bits =
508
tls_tempfail_tryclear = true
m4_define(<:SMTP_TRANS_DHBITS:>,
tls_tempfail_tryclear = true
m4_define(<:SMTP_TRANS_DHBITS:>,
@@
-435,10
+444,14
@@
m4_define(<:SMTP_TRANS_DHBITS:>,
{CONF_acceptable_ciphers})
tls_dh_min_bits = $1
tls_tempfail_tryclear = true:>)m4_dnl
{CONF_acceptable_ciphers})
tls_dh_min_bits = $1
tls_tempfail_tryclear = true:>)m4_dnl
+smtp_dhbits_512:
+ SMTP_TRANS_DHBITS(508)
+smtp_dhbits_768:
+ SMTP_TRANS_DHBITS(764)
smtp_dhbits_1024:
SMTP_TRANS_DHBITS(1020)
smtp_dhbits_2048:
smtp_dhbits_1024:
SMTP_TRANS_DHBITS(1020)
smtp_dhbits_2048:
- SMTP_TRANS_DHBITS(204
6
)
+ SMTP_TRANS_DHBITS(204
4
)
## Transport to a local SMTP server; use TLS and perform client
## authentication.
## Transport to a local SMTP server; use TLS and perform client
## authentication.
@@
-452,9
+465,11
@@
smtp_local:
tls_require_ciphers = CONF_good_ciphers
tls_dh_min_bits = 2046
tls_tempfail_tryclear = false
tls_require_ciphers = CONF_good_ciphers
tls_dh_min_bits = 2046
tls_tempfail_tryclear = false
- authenticated_sender = ${if def:authenticated_id \
- {$authenticated_id@CONF_master_domain} \
- fail}
+ authenticated_sender_force = true
+ authenticated_sender = \
+ ${if def:acl_m_user {$acl_m_user@CONF_master_domain} \
+ {${if def:authenticated_sender {$authenticated_sender} \
+ fail}}}
## A standard transport for local delivery.
deliver:
## A standard transport for local delivery.
deliver: