git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: fix testcase for SPF empty-mailfrom-use-helo. Bug 467
[users/heiko/exim.git]
/
doc
/
doc-txt
/
OptionLists.txt
diff --git
a/doc/doc-txt/OptionLists.txt
b/doc/doc-txt/OptionLists.txt
index 717f87e571a90e9238197b3330ca9603727b9b84..183f6b7220e3c0e12ab6e328709972bc26bb3408 100644
(file)
--- a/
doc/doc-txt/OptionLists.txt
+++ b/
doc/doc-txt/OptionLists.txt
@@
-98,7
+98,7
@@
batch_max integer 100 appendfile
bcc string* unset autoreply
bi_command string unset main
body_only boolean false transports 2.05
bcc string* unset autoreply
bi_command string unset main
body_only boolean false transports 2.05
-bounce_message_file string
unset main 4.00
+bounce_message_file string
* unset main 4.00 expanded from 4.94
bounce_message_text string unset main 4.00
bounce_return_body boolean true main 4.23
bounce_return_message boolean true main 4.00
bounce_message_text string unset main 4.00
bounce_return_body boolean true main 4.23
bounce_return_message boolean true main 4.00
@@
-176,6
+176,7
@@
dkim_strict string* unset smtp
dkim_timestamps integer* unset smtp 4.92
dkim_verify_hashes string sha256:sha512:sha1 main 4.93
dkim_verify_keytypes string ed25519:rsa main 4.93
dkim_timestamps integer* unset smtp 4.92
dkim_verify_hashes string sha256:sha512:sha1 main 4.93
dkim_verify_keytypes string ed25519:rsa main 4.93
+dkim_verify_min_keysizes string list "rsa=1024 ed25519=250" main 4.94
dkim_verify_minimal boolean false main 4.93
dkim_verify_signers string* $dkim_signers main 4.70
directory string* unset appendfile
dkim_verify_minimal boolean false main 4.93
dkim_verify_signers string* $dkim_signers main 4.70
directory string* unset appendfile
@@
-381,6
+382,7
@@
message_body_newlines boolean false main
message_body_visible integer 500 main
message_id_header_domain string* unset main 4.11
message_id_header_text string* unset main
message_body_visible integer 500 main
message_id_header_domain string* unset main 4.11
message_id_header_text string* unset main
+message_linelength_limit integer 998 smtp 4.94
message_logs boolean true main 4.10
message_prefix string* + appendfile 4.00 replaces prefix
string* unset pipe 4.00 replaces prefix
message_logs boolean true main 4.10
message_prefix string* + appendfile 4.00 replaces prefix
string* unset pipe 4.00 replaces prefix
@@
-442,6
+444,7
@@
qualify_recipient string + main
qualify_single boolean true dnslookup 4.00
query string* + iplookup 4.00
queue_domains domain list unset main 4.00
qualify_single boolean true dnslookup 4.00
query string* + iplookup 4.00
queue_domains domain list unset main 4.00
+queue_fasst_ramp boolean false main 4.95
queue_list_requires_admin boolean true main 1.95
queue_only boolean false main
queue_only_file string unset main 2.05
queue_list_requires_admin boolean true main 1.95
queue_only boolean false main
queue_only_file string unset main 2.05
@@
-552,9
+555,14
@@
smtp_reserve_hosts host list unset main
smtp_return_error_details boolean false main 4.11
socket string* unset lmtp 4.11
spamd_address string* + main 4.50 with content scan
smtp_return_error_details boolean false main 4.11
socket string* unset lmtp 4.11
spamd_address string* + main 4.50 with content scan
+spf_guess string "v=spf1 a/24 mx/24 ptr ?all"
+ main 4.91 with SUPPORT_SPF
+spf_smtp_comment_template string* "Please see http://www.open-spf.org/Why"
+ main 4.94 with SUPPORT_SPF
split_spool_directory boolean false main 1.70
spool_directory string ++ main
spool_wireformat boolean false main 4.90
split_spool_directory boolean false main 1.70
spool_directory string ++ main
spool_wireformat boolean false main 4.90
+sqlite_dbfile string* unset main 4.94 with LOOKUP_SQLITE
sqlite_lock_timeout time 5s main 4.53
strict_acl_vars boolean false main 4.64
srv_fail_domains domain list unset dnslookup 4.43
sqlite_lock_timeout time 5s main 4.53
strict_acl_vars boolean false main 4.64
srv_fail_domains domain list unset dnslookup 4.43
@@
-600,6
+608,8
@@
tls_privatekey string* unset main
tls_remember_emstp boolean false main 4.21
tls_require_ciphers string* unset smtp 4.00 replaces tls_verify_ciphers
string* unset main 4.33
tls_remember_emstp boolean false main 4.21
tls_require_ciphers string* unset smtp 4.00 replaces tls_verify_ciphers
string* unset main 4.33
+tls_resumption_hosts host list* unset main 4.95
+ host list* unset smtp 4.95
tls_sni string* unset main 4.80
tls_tempfail_tryclear boolean true smtp 4.05
tls_try_verify_hosts host list unset main 4.00
tls_sni string* unset main 4.80
tls_tempfail_tryclear boolean true smtp 4.05
tls_try_verify_hosts host list unset main 4.00
@@
-638,7
+648,7
@@
verify boolean true routers
verify_only boolean false routers 4.00
verify_recipient boolean true routers 4.00
verify_sender boolean true routers 4.00
verify_only boolean false routers 4.00
verify_recipient boolean true routers 4.00
verify_sender boolean true routers 4.00
-warn_message_file string
unset main 4.00
+warn_message_file string
* unset main 4.00 expanded from 4.94
widen_domains string list unset dnslookup 4.00
write_rejectlog boolean true main 4.31
widen_domains string list unset dnslookup 4.00
write_rejectlog boolean true main 4.31
git://git.exim.org / users / heiko / exim.git / blobdiff