X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/f5ee670dc5eb90c68ee684f478598bd9af6fbf36..539410bc9241afc004e89d3d35b32af1df46c195:/doc/doc-docbook/spec.xfpt?ds=sidebyside diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 9a49373f3..e938703ee 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -4441,6 +4441,27 @@ of the syntax, and how it interacts with configuration file options, are given in chapter &<>&. When &%-oX%& is used to start a daemon, no pid file is written unless &%-oP%& is also present to specify a pid filename. +.new +.vitem &%-oY%& +.oindex &%-oY%& +.cindex "daemon notifier socket" +This option controls the creation of an inter-process communications endpoint +by the Exim daemon. +It is only relevant when the &%-bd%& (start listening daemon) option is also +given. +Normally the daemon creates this socket, unless a &%-oX%& and &*no*& &%-oP%& +option is also present. +If this option is given then the socket will not be created. This could be +required if the system is running multiple daemons. + +The socket is currently used for +.ilist +fast ramp-up of queue runner processes +.next +obtaining a current queue size +.endlist +.wen + .vitem &%-pd%& .oindex "&%-pd%&" .cindex "Perl" "starting the interpreter" @@ -6671,11 +6692,11 @@ causes a second lookup to occur. The lookup type may optionally be followed by a comma and a comma-separated list of options. Each option is a &"name=value"& pair. -Whether an option is meaningful depands on the lookup type. +Whether an option is meaningful depends on the lookup type. All lookups support the option &"cache=no_rd"&. If this is given then the cache that Exim manages for lookup results -is not checked before diong the lookup. +is not checked before doing the lookup. The result of the lookup is still written to the cache. .wen @@ -6859,6 +6880,13 @@ the implicit key is the host's IP address rather than its name (see section &*Warning 3*&: Do not use an IPv4-mapped IPv6 address for a key; use the IPv4, in dotted-quad form. (Exim converts IPv4-mapped IPv6 addresses to this notation before executing the lookup.) + +.new +One option is supported, "ret=full", to request the return of the entire line +rather than omitting the key porttion. +Note however that the key portion will have been de-quoted. +.wen + .next .cindex lookup json .cindex json "lookup type" @@ -9423,6 +9451,9 @@ become case-sensitive after &"+caseful"& has been seen. .section "Local part lists" "SECTlocparlis" .cindex "list" "local part list" .cindex "local part" "list" +These behave in the same way as domain and host lists, with the following +changes: + Case-sensitivity in local part lists is handled in the same way as for address lists, as just described. The &"+caseful"& item can be used if required. In a setting of the &%local_parts%& option in a router with &%caseful_local_part%& @@ -11628,6 +11659,11 @@ condition is true if the named file (or directory) exists. The existence test is done by calling the &[stat()]& function. The use of the &%exists%& test in users' filter files may be locked out by the system administrator. +.new +&*Note:*& Testing a path using this condition is not a sufficient way of +de-tainting it. +.wen + .vitem &*first_delivery*& .cindex "delivery" "first" .cindex "first delivery" @@ -13104,6 +13140,8 @@ The name of the spool queue in use; empty for the default queue. .cindex "spool" "number of messages" This variable contains the number of messages queued. It is evaluated on demand, but no more often than once every minute. +If there is no daemon notifier socket open, the value will be +an empty string. .vitem &$r_...$& .vindex &$r_...$& @@ -16680,10 +16718,16 @@ should need to modify the default. The option is expanded before use. If the platform supports Linux-style abstract socket names, the result is used with a nul byte prefixed. -Otherwise, it should be a full path name and use a directory accessible +Otherwise, +.new "if nonempty," +it should be a full path name and use a directory accessible to Exim. -If the Exim command line uses a &%-oX%& option and does not use &%-oP%& +.new +If this option is set as empty, +or the command line &%-oY%& option is used, or +.wen +the command line uses a &%-oX%& option and does not use &%-oP%&, then a notifier socket is not created. @@ -22823,6 +22867,11 @@ If &%file%& or &%directory%& is set for a delivery from a redirection, it is used to determine the file or directory name for the delivery. Normally, the contents of &$address_file$& are used in some way in the string expansion. .endlist +If the &%create_file%& option is set to a path which +matches (see the option definition below for details) +a file or directory name +for the delivery, that name becomes de-tainted. + .cindex "tainted data" "in filenames" .cindex appendfile "tainted data" Tainted data may not be used for a file or directory name. @@ -22970,14 +23019,34 @@ directories defined by the &%directory%& option. In the case of maildir delivery, it applies to the top level directory, not the maildir directories beneath. +.new The option must be set to one of the words &"anywhere"&, &"inhome"&, or -&"belowhome"&. In the second and third cases, a home directory must have been -set for the transport. This option is not useful when an explicit filename is +&"belowhome"&, or to an absolute path. +.wen + +In the second and third cases, a home directory must have been +set for the transport, and the file or directory being created must +reside within it. +The "belowhome" checking additionally checks for attempts to use "../" +to evade the testing. +This option is not useful when an explicit filename is given for normal mailbox deliveries. It is intended for the case when filenames are generated from users' &_.forward_& files. These are usually handled by an &(appendfile)& transport called &%address_file%&. See also &%file_must_exist%&. +.new +In the fourth case, +the value given for this option must be an absolute path for an +existing directory. +The value is used for checking instead of a home directory; +checking is done in "belowhome" mode. + +.cindex "tainted data" "de-tainting" +If "belowhome" checking is used, the file or directory path +becomes de-tainted. +.wen + .option directory appendfile string&!! unset This option is mutually exclusive with the &%file%& option, but one of &%file%& @@ -22990,6 +23059,11 @@ appended to a single mailbox file. A number of different formats are provided (see &%maildir_format%& and &%mailstore_format%&), and see section &<>& for further details of this form of delivery. +.new +The result of expansion must not be tainted, unless the &%create_file%& option +specifies a path. +.wen + .option directory_file appendfile string&!! "see below" .cindex "base62" @@ -23022,6 +23096,11 @@ specifies a single file, to which the message is appended. One or more of &%use_fcntl_lock%&, &%use_flock_lock%&, or &%use_lockfile%& must be set with &%file%&. +.new +The result of expansion must not be tainted, unless the &%create_file%& option +specifies a path. +.wen + .cindex "NFS" "lock file" .cindex "locking files" .cindex "lock files" @@ -41569,7 +41648,7 @@ mean, refer to the DMARC website above. Valid strings are: &'reject '& The DMARC check failed and the library recommends rejecting the email. &'quarantine '& The DMARC check failed and the library recommends keeping it for further inspection. &'none '& The DMARC check passed and the library recommends no specific action, neutral. -&'norecord '& No policy section in the DMARC record for this sender domain. +&'norecord '& No policy section in the DMARC record for this RFC5322.From field &'nofrom '& Unable to determine the domain of the sender. &'temperror '& Library error or dns error. &'off '& The DMARC check was disabled for this email.