diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2020-05-04 16:10:57 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2020-05-04 16:10:57 +0100 |
| commit | 40bffa31bd7057a0e88e29bb76fa63382d4aa1bc (patch) | |
| tree | 58b5c625fc31653d67e944862b6541ae42e383c8 /doc | |
| parent | 6f585046cf0b00509f0ff7c8f8a48b9cf7c2ab75 (diff) | |
Make {bounce,warn}_message_file expanded. Bug 2522
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 20 | ||||
| -rw-r--r-- | doc/doc-txt/NewStuff | 2 | ||||
| -rw-r--r-- | doc/doc-txt/OptionLists.txt | 4 |
3 files changed, 20 insertions, 6 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index edd745174..828b757bb 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -15015,12 +15015,18 @@ just the command name, it is not a complete command line. If an argument is required, it must come from the &%-oA%& command line option. -.option bounce_message_file main string unset +.option bounce_message_file main string&!! unset .cindex "bounce message" "customizing" .cindex "customizing" "bounce message" This option defines a template file containing paragraphs of text to be used for constructing bounce messages. Details of the file's contents are given in -chapter &<<CHAPemsgcust>>&. See also &%warn_message_file%&. +chapter &<<CHAPemsgcust>>&. +.new +.cindex bounce_message_file "tainted data" +The option is expanded to give the file path, which must be +absolute and untainted. +.wen +See also &%warn_message_file%&. .option bounce_message_text main string unset @@ -18366,14 +18372,20 @@ regular expression by a parenthesized subpattern. The default value for See &%uucp_from_pattern%& above. -.option warn_message_file main string unset +.option warn_message_file main string&!! unset .cindex "warning of delay" "customizing the message" .cindex "customizing" "warning message" This option defines a template file containing paragraphs of text to be used for constructing the warning message which is sent by Exim when a message has been in the queue for a specified amount of time, as specified by &%delay_warning%&. Details of the file's contents are given in chapter -&<<CHAPemsgcust>>&. See also &%bounce_message_file%&. +&<<CHAPemsgcust>>&. +.new +.cindex warn_message_file "tainted data" +The option is expanded to give the file path, which must be +absolute and untainted. +.wen +See also &%bounce_message_file%&. .option write_rejectlog main boolean true diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index b79802103..6676e0b9f 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -61,6 +61,8 @@ Version 4.94 18. dkim_verify_min_keysizes, a list of minimum acceptable public-key sizes. +19. bounce_message_file and warn_message_file are now expanded before use. + Version 4.93 diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index ce0c901a9..f15ccd553 100644 --- 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 -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 @@ -640,7 +640,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 -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 |