X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=doc%2Fdoc-docbook%2Fspec.xfpt;h=4ebeaa0c605fc43af98bfec117622eb9b68ef274;hp=7b5e3ccd57b3a05264cc335a4efa681fe0c65a57;hb=ff5929e3b91747e2ecb600711d17a7d0e21749ad;hpb=1e4519cc46416c1c81b9f468ce0ca5b88146037b diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 7b5e3ccd5..4ebeaa0c6 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -5136,7 +5136,11 @@ with the characters &"0x"&, in which case the remainder is interpreted as a hexadecimal number. If an integer value is followed by the letter K, it is multiplied by 1024; if -it is followed by the letter M, it is multiplied by 1024x1024. When the values +it is followed by the letter M, it is multiplied by 1024x1024; +.new +if by the letter G, 1024x1024x1024. +.wen +When the values of integer option settings are output, values which are an exact multiple of 1024 or 1024x1024 are sometimes, but not always, printed using the letters K and M. The printing style is independent of the actual input format that was @@ -10158,6 +10162,15 @@ escape sequences starting with a backslash. Whether characters with the most significant bit set (so-called &"8-bit characters"&) count as printing or not is controlled by the &%print_topbitchars%& option. +.new +.vitem &*${escape8bit:*&<&'string'&>&*}*& +.cindex "expansion" "escaping 8-bit characters" +.cindex "&%escape8bit%& expansion item" +If the string contains and characters with the most significant bit set, +they are converted to escape sequences starting with a backslash. +Backslashes and DEL characters are also converted. +.wen + .vitem &*${eval:*&<&'string'&>&*}*&&~and&~&*${eval10:*&<&'string'&>&*}*& .cindex "expansion" "expression evaluation" @@ -12990,8 +13003,7 @@ or external command, as described above. It is also used during a .vitem &$verify_mode$& .vindex "&$verify_mode$&" -While a router or transport is being run in verify mode -or for cutthrough delivery, +While a router or transport is being run in verify mode or for cutthrough delivery, contains "S" for sender-verification or "R" for recipient-verification. Otherwise, empty. @@ -28115,7 +28127,7 @@ provides a means of specifying an &"and"& conjunction between conditions. For example: .code deny dnslists = list1.example -dnslists = list2.example + dnslists = list2.example .endd If there are no conditions, the verb is always obeyed. Exim stops evaluating the conditions and modifiers when it reaches a condition that fails. What @@ -28137,8 +28149,8 @@ after &%endpass%&, the ACL returns &"deny"&. Consider this statement, used to check a RCPT command: .code accept domains = +local_domains -endpass -verify = recipient + endpass + verify = recipient .endd If the recipient domain does not match the &%domains%& condition, control passes to the next statement. If it does match, the recipient is verified, and @@ -28789,7 +28801,7 @@ Notice that we put back the lower cased version afterwards, assuming that is what is wanted for subsequent tests. -.vitem &*control&~=&~cutthrough_delivery*& +.vitem &*control&~=&~cutthrough_delivery/*&<&'options'&> .cindex "&ACL;" "cutthrough routing" .cindex "cutthrough" "requesting" This option requests delivery be attempted while the item is being received. @@ -28829,11 +28841,20 @@ It is not supported for messages received with the SMTP PRDR option in use. Should the ultimate destination system positively accept or reject the mail, a corresponding indication is given to the source system and nothing is queued. -If there is a temporary error the item is queued for later delivery in the -usual fashion. If the item is successfully delivered in cutthrough mode +If the item is successfully delivered in cutthrough mode the delivery log lines are tagged with ">>" rather than "=>" and appear before the acceptance "<=" line. +.new +If there is a temporary error the item is queued for later delivery in the +usual fashion. +This behaviour can be adjusted by appending the option &*defer=*&<&'value'&> +to the control; the default value is &"spool"& and the alternate value +&"pass"& copies an SMTP defer response from the target back to the initiator +and does not queue the message. +Note that this is independent of any receipient verify conditions in the ACL. +.wen + Delivery in this mode avoids the generation of a bounce mail to a (possibly faked) sender when the destination system is doing content-scan based rejection. @@ -38092,14 +38113,14 @@ DKIM is documented in RFC 4871. DKIM support is compiled into Exim by default if TLS support is present. It can be disabled by setting DISABLE_DKIM=yes in &_Local/Makefile_&. -Exim's DKIM implementation allows to +Exim's DKIM implementation allows for .olist -Sign outgoing messages: This function is implemented in the SMTP transport. +Signing outgoing messages: This function is implemented in the SMTP transport. It can co-exist with all other Exim features (including transport filters) except cutthrough delivery. .next -Verify signatures in incoming messages: This is implemented by an additional +Verifying signatures in incoming messages: This is implemented by an additional ACL (acl_smtp_dkim), which can be called several times per message, with different signature contexts. .endlist @@ -38238,6 +38259,7 @@ available (from most to least important): The signer that is being evaluated in this ACL run. This can be a domain or an identity. This is one of the list items from the expanded main option &%dkim_verify_signers%& (see above). + .vitem &%$dkim_verify_status%& A string describing the general status of the signature. One of .ilist @@ -38252,6 +38274,7 @@ available in &%$dkim_verify_reason%&. .next &%pass%&: The signature passed verification. It is valid. .endlist + .vitem &%$dkim_verify_reason%& A string giving a little bit more detail when &%$dkim_verify_status%& is either "fail" or "invalid". One of @@ -38271,51 +38294,73 @@ could not be verified. This may mean that headers were modified, re-written or otherwise changed in a way which is incompatible with DKIM verification. It may of course also mean that the signature is forged. .endlist + .vitem &%$dkim_domain%& The signing domain. IMPORTANT: This variable is only populated if there is an actual signature in the message for the current domain or identity (as reflected by &%$dkim_cur_signer%&). + .vitem &%$dkim_identity%& The signing identity, if present. IMPORTANT: This variable is only populated if there is an actual signature in the message for the current domain or identity (as reflected by &%$dkim_cur_signer%&). + .vitem &%$dkim_selector%& The key record selector string. + .vitem &%$dkim_algo%& The algorithm used. One of 'rsa-sha1' or 'rsa-sha256'. + .vitem &%$dkim_canon_body%& The body canonicalization method. One of 'relaxed' or 'simple'. + .vitem &%dkim_canon_headers%& The header canonicalization method. One of 'relaxed' or 'simple'. + .vitem &%$dkim_copiedheaders%& A transcript of headers and their values which are included in the signature (copied from the 'z=' tag of the signature). +.new +Note that RFC6376 requires that verification fail if the From: header is +not included in the signature. Exim does not enforce this; sites wishing +strict enforcement should code the check explicitly. +.wen + .vitem &%$dkim_bodylength%& The number of signed body bytes. If zero ("0"), the body is unsigned. If no limit was set by the signer, "9999999999999" is returned. This makes sure that this variable always expands to an integer value. + .vitem &%$dkim_created%& UNIX timestamp reflecting the date and time when the signature was created. When this was not specified by the signer, "0" is returned. + .vitem &%$dkim_expires%& UNIX timestamp reflecting the date and time when the signer wants the signature to be treated as "expired". When this was not specified by the signer, "9999999999999" is returned. This makes it possible to do useful integer size comparisons against this value. + .vitem &%$dkim_headernames%& A colon-separated list of names of headers included in the signature. + .vitem &%$dkim_key_testing%& "1" if the key record has the "testing" flag set, "0" if not. + .vitem &%$dkim_key_nosubdomains%& "1" if the key record forbids subdomaining, "0" otherwise. + .vitem &%$dkim_key_srvtype%& Service type (tag s=) from the key record. Defaults to "*" if not specified in the key record. + .vitem &%$dkim_key_granularity%& Key granularity (tag g=) from the key record. Defaults to "*" if not specified in the key record. + .vitem &%$dkim_key_notes%& Notes from the key record (tag n=). + .vitem &%$dkim_key_length%& Number of bits in the key. .endlist