X-Git-Url: http://git.hcoop.net/hcoop/debian/exim4.git/blobdiff_plain/493d55f6840d04ef186778724fc67530b1600113..0baa7b9df9e8d0188307c635776394b0db691e7d:/doc/exim.8 diff --git a/doc/exim.8 b/doc/exim.8 index 09dad3c..11f8e6b 100644 --- a/doc/exim.8 +++ b/doc/exim.8 @@ -163,7 +163,7 @@ continuations. As in Exim's run time configuration, white space at the start of continuation lines is ignored. Each argument or data line is passed through the string expansion mechanism, and the result is output. Variable values from the configuration file (for example, \fI$qualify_domain\fP) are available, but no -message\-specific values (such as \fI$sender_domain\fP) are set, because no message +message\-specific values (such as \fI$message_exim_id\fP) are set, because no message is being processed (but see \fB\-bem\fP and \fB\-Mset\fP). .sp \fBNote\fP: If you use this mechanism to test lookups, and you change the data @@ -370,7 +370,8 @@ preference to the address taken from the message. The caller of Exim must be a trusted user for the sender of a message to be set in this way. .TP 10 \fB\-bmalware\fP <\fIfilename\fP> -This debugging option causes Exim to scan the given file, +This debugging option causes Exim to scan the given file or directory +(depending on the used scanner interface), using the malware scanning framework. The option of \fBav_scanner\fP influences this option, so if \fBav_scanner\fP's value is dependent upon an expansion then the expansion should have defaults which apply to this invocation. ACLs are @@ -419,8 +420,12 @@ users, the output is as in this example: .sp mysql_servers = .sp -If \fBconfigure_file\fP is given as an argument, the name of the run time -configuration file is output. +If \fBconfig\fP is given as an argument, the config is +output, as it was parsed, any include file resolved, any comment removed. +.sp +If \fBconfig_file\fP is given as an argument, the name of the run time +configuration file is output. (\fBconfigure_file\fP works too, for +backward compatibility.) If a list of configuration files was supplied, the value that is output here is the name of the file that was actually used. .sp @@ -454,7 +459,7 @@ settings can be obtained by using \fBrouters\fP, \fBtransports\fP, or \fBauthenticators\fP. .sp If \fBenvironment\fP is given as an argument, the set of environment -variables is output, line by line. Using the \fB\-n\fP flag supresses the value of the +variables is output, line by line. Using the \fB\-n\fP flag suppresses the value of the variables. .sp If invoked by an admin user, then \fBmacro\fP, \fBmacro_list\fP and \fBmacros\fP @@ -728,8 +733,6 @@ name, but it can be a colon\-separated list of names. In this case, the first file that exists is used. Failure to open an existing file stops Exim from proceeding any further along the list, and an error is generated. .sp -The file names need to be absolute names. -.sp When this option is used by a caller other than root, and the list is different from the compiled\-in list, Exim gives up its root privilege immediately, and runs with the real and effective uid and gid set to those of the caller. @@ -796,6 +799,7 @@ example: exim '\-D ABC = something' ... .sp \fB\-D\fP may be repeated up to 10 times on a command line. +Only macro names up to 22 letters long can be set. .TP 10 \fB\-d\fP<\fIdebug options\fP> This option causes debugging information to be written to the standard @@ -1009,6 +1013,16 @@ This option is not intended for use by external callers. It is used internally by Exim in conjunction with the \fB\-MC\fP option. It signifies that the connection to the remote host has been authenticated. .TP 10 +\fB\-MCD\fP +This option is not intended for use by external callers. It is used internally +by Exim in conjunction with the \fB\-MC\fP option. It signifies that the +remote host supports the ESMTP DSN extension. +.TP 10 +\fB\-MCG\fP +This option is not intended for use by external callers. It is used internally +by Exim in conjunction with the \fB\-MC\fP option. It signifies that an +alternate queue is used, named by the following option. +.TP 10 \fB\-MCP\fP This option is not intended for use by external callers. It is used internally by Exim in conjunction with the \fB\-MC\fP option. It signifies that the server to @@ -1147,7 +1161,8 @@ for that message. \fB\-n\fP This option is interpreted by Sendmail to mean "no aliasing". For normal modes of operation, it is ignored by Exim. -When combined with \fB\-bP\fP it suppresses the name of an option from being output. +When combined with \fB\-bP\fP it makes the output more terse (suppresses +option names, environment values and config pretty printing). .TP 10 \fB\-O\fP <\fIdata\fP> This option is interpreted by Sendmail to mean set option. It is ignored by @@ -1410,7 +1425,8 @@ configuration option called \fBprod_requires_admin\fP which can be set false to relax this restriction (and also the same requirement for the \fB\-M\fP, \fB\-R\fP, and \fB\-S\fP options). .sp -The \fB\-q\fP option starts one queue runner process. This scans the queue of +If other commandline options do not specify an action, +the \fB\-q\fP option starts one queue runner process. This scans the queue of waiting messages, and runs a delivery process for each one in turn. It waits for each delivery process to finish before starting the next one. A delivery process may not actually do any deliveries if the retry times for the addresses @@ -1475,6 +1491,21 @@ The \fIl\fP (the letter "ell") flag specifies that only local deliveries are to be done. If a message requires any remote deliveries, it remains on the queue for later delivery. .TP 10 +\fB\-q[q][i][f[f]][l][G[/