From 30e06f4e22dd730f97f814f46fd1dacb80380728 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Sun, 28 Sep 2014 00:00:00 -0500 Subject: [PATCH] postfix-2.12-20140928 --- postfix/.indent.pro | 7 +- postfix/HISTORY | 61 +++++++ postfix/Makefile.in | 2 +- postfix/README_FILES/MILTER_README | 46 ++++- postfix/README_FILES/SMTPD_POLICY_README | 51 +++++- postfix/RELEASE_NOTES | 42 +++++ postfix/WISHLIST | 7 + postfix/html/MILTER_README.html | 60 ++++++- postfix/html/Makefile.in | 2 +- postfix/html/SMTPD_POLICY_README.html | 67 +++++++- postfix/html/bounce.5.html | 48 +++--- postfix/html/bounce.8.html | 20 +-- postfix/html/cleanup.8.html | 46 ++--- postfix/html/defer.8.html | 20 +-- postfix/html/flush.8.html | 16 +- postfix/html/lmtp.8.html | 78 ++++----- postfix/html/local.8.html | 98 +++++------ postfix/html/mailq.1.html | 62 +++---- postfix/html/newaliases.1.html | 62 +++---- postfix/html/oqmgr.8.html | 78 ++++----- postfix/html/pcre_table.5.html | 8 +- postfix/html/pickup.8.html | 6 +- postfix/html/postconf.1.html | 100 +++++------ postfix/html/postdrop.1.html | 18 +- postfix/html/postscreen.8.html | 52 +++--- postfix/html/proxymap.8.html | 18 +- postfix/html/qmgr.8.html | 74 ++++---- postfix/html/qmqp-sink.1.html | 6 +- postfix/html/qmqpd.8.html | 14 +- postfix/html/regexp_table.5.html | 4 +- postfix/html/sendmail.1.html | 62 +++---- postfix/html/smtp-sink.1.html | 38 ++--- postfix/html/smtp.8.html | 78 ++++----- postfix/html/smtpd.8.html | 140 ++++++++-------- postfix/html/trace.8.html | 20 +-- postfix/html/trivial-rewrite.8.html | 38 ++--- postfix/html/verify.8.html | 28 ++-- postfix/man/man5/pcre_table.5 | 11 +- postfix/man/man5/regexp_table.5 | 5 +- postfix/proto/MILTER_README.html | 60 ++++++- postfix/proto/Makefile.in | 2 +- postfix/proto/SMTPD_POLICY_README.html | 67 +++++++- postfix/proto/pcre_table | 13 +- postfix/proto/regexp_table | 5 +- postfix/src/global/Makefile.in | 16 +- postfix/src/global/attr_override.c | 205 +++++++++++++++++++++++ postfix/src/global/attr_override.h | 56 +++++++ postfix/src/global/mail_conf.h | 3 + postfix/src/global/mail_conf_int.c | 11 +- postfix/src/global/mail_conf_str.c | 13 +- postfix/src/global/mail_conf_time.c | 15 +- postfix/src/global/mail_version.h | 2 +- postfix/src/master/master_ent.c | 7 +- postfix/src/milter/Makefile.in | 2 + postfix/src/milter/milter.c | 73 +++++++- postfix/src/milter/milter8.c | 2 +- postfix/src/postconf/Makefile.in | 18 +- postfix/src/postconf/postconf_dbms.c | 31 ++-- postfix/src/postconf/postconf_edit.c | 2 + postfix/src/postconf/postconf_master.c | 91 +++++++++- postfix/src/postconf/postconf_misc.c | 9 +- postfix/src/postconf/test58.ref | 4 +- postfix/src/postconf/test59.ref | 8 + postfix/src/smtpd/Makefile.in | 1 + postfix/src/smtpd/smtpd_check.c | 128 ++++++++++++-- postfix/src/util/Makefile.in | 11 +- postfix/src/util/argv.c | 7 +- postfix/src/util/extpar.c | 99 +++++++++++ postfix/src/util/stringops.h | 4 + 69 files changed, 1850 insertions(+), 708 deletions(-) create mode 100644 postfix/src/global/attr_override.c create mode 100644 postfix/src/global/attr_override.h create mode 100644 postfix/src/postconf/test59.ref create mode 100644 postfix/src/util/extpar.c diff --git a/postfix/.indent.pro b/postfix/.indent.pro index e9b56d685..eca753160 100644 --- a/postfix/.indent.pro +++ b/postfix/.indent.pro @@ -1,4 +1,3 @@ --TDICT_UNION -TABOUNCE -TADDR_MATCH_LIST -TADDR_PATTERN @@ -12,6 +11,9 @@ -TASN1_INTEGER -TASN1_OBJECT -TATTR_CLNT +-TATTR_OVER_INT +-TATTR_OVER_STR +-TATTR_OVER_TIME -TATTR_TABLE -TAUTHORITY_KEYID -TAUTO_CLNT @@ -56,6 +58,7 @@ -TCONFIG_STR_TABLE -TCONFIG_TIME_FN_TABLE -TCONFIG_TIME_TABLE +-TCONST_CHAR_STAR -TCRYPTO_EX_DATA -TCTABLE -TCTABLE_ENTRY @@ -119,6 +122,7 @@ -TDICT_TCP -TDICT_TEXT -TDICT_THASH +-TDICT_UNION -TDICT_UNIX -TDNS_FIXED -TDNS_REPLY @@ -298,6 +302,7 @@ -TSMTPD_CMD -TSMTPD_DEFER -TSMTPD_ENDPT_LOOKUP_INFO +-TSMTPD_POLICY_CLNT -TSMTPD_PROXY -TSMTPD_RBL_EXPAND_CONTEXT -TSMTPD_RBL_STATE diff --git a/postfix/HISTORY b/postfix/HISTORY index 096e7fb3a..d5bf5e963 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -20445,3 +20445,64 @@ Apologies for any names omitted. domain names in permit_mx_backup, check_mumble_{a,mx,ns}_access and reject_unknown_{sender,recipient}_domain. Mark Martinec. File: smtpd/smtpd_check.c. + +20140925 + + Cleanup: support for per-Milter settings, for example: + smtpd_milters = {inet:host:port, default_action=accept, + ...}. Specify the Milter endpoint address followed by zero + or more attribute=value pairs separated by comma or space. + The supported attributes are command_timeout, connect_timeout, + content_timeout, default_action, and protocol. These have + the same names as the corresponding main.cf parameters, + minus the "milter_" prefix. Files: global/mail_conf_over.c, + global/mail_conf_str.c, global/mail_conf_time.c, + global/mail_conf.h, milter/milters.c. + +20140927 + + Cleanup: specify { name = value } in per-Milter settings, to support + space around the "=" or comma/space within the value. Files: + global/attr_over.[hc]. + + Cleanup: "postconf -n" now only shows config_directory when + an override is in effect (environment, -c or -o). + + Cleanup: support for master.cf arguments inside {}, to + protect arguments that contain whitespace. File: + master/master_ent.c, postconf/postconf_master.c, + postconf/test59.ref. + + Cleanup: support for per-policy client settings, for example: + check_policy_service {inet:host:port, default_action=dunno, + timeout=50s, ...}. Specify the policy server endpoint address + followed by zero or more attribute=value pairs separated + by comma or space. Specify { name = value } for attributes + that contain whitespace; otherwise, space is not allowed + around the "=". The supported attributes are default_action, + max_idle, max_ttl, request_limit, retry_delay, timeout, and + try_limit. These have the same names as the corresponding + main.cf parameters, minus the "smtpd_policy_service_" prefix. + Files: global/mail_conf_int.c, global/mail_conf.h, + global/attr_override.[hc], smtpd/smtpd_check.c. + +20140928 + + Cleanup: extpar.c module to reduce code duplication. Files: + global/attr_override.c, master/master_ent.c, milter/milter.c, + postconf/postconf_dbms.c, postconf/postconf_master.c, + smtpd/smtpd_check.c, util/extpar.c, util/stringops.h. + + Cleanup: the table-driven code for per-Milter and per-policy + overrides now updates stack-based variables, instead of + (ugh) statically-allocated variables. Files: + global/attr_override.[hc], smtpd/smtpd_check.c, milter/milter.c. + + Documentation: added advanced configuration sections for + how to use per-Milter and per-policy settings. Files: + proto/SMTPD_POLICY_README.html, proto/MILTER_README.html. + + Cleanup: force LANG=C to prevent groff from outputting + non-ASCII cruft into the HTML-ized manpages. Files: + html/Makefile.in, proto/Makefile.in, many HTML output + files. diff --git a/postfix/Makefile.in b/postfix/Makefile.in index 34a98c7aa..47b1d699d 100644 --- a/postfix/Makefile.in +++ b/postfix/Makefile.in @@ -1,7 +1,7 @@ SHELL = /bin/sh WARN = -Wmissing-prototypes -Wformat -Wno-comment OPTS = 'WARN=$(WARN)' -DIRS = src/util src/global src/dns src/tls src/xsasl src/milter src/master \ +DIRS = src/util src/global src/dns src/tls src/xsasl src/master src/milter \ src/postfix src/fsstone src/smtpstone \ src/sendmail src/error src/pickup src/cleanup src/smtpd src/local \ src/trivial-rewrite src/qmgr src/oqmgr src/smtp src/bounce \ diff --git a/postfix/README_FILES/MILTER_README b/postfix/README_FILES/MILTER_README index 8e2a68759..b1fda465d 100644 --- a/postfix/README_FILES/MILTER_README +++ b/postfix/README_FILES/MILTER_README @@ -142,10 +142,9 @@ Please specify a userid value that isn't used for other applications (not CCoonnffiigguurriinngg PPoossttffiixx Like Sendmail, Postfix has a lot of configuration options that control how it -talks to Milter applications. With the initial Postfix Milter protocol -implementation, many options are global, that is, they apply to all Milter -applications. Future Postfix versions may support per-Milter timeouts, per- -Milter error handling, etc. +talks to Milter applications. Besides global options that apply to all Milter +applications, Postfix 2.12 and later support per-Milter timeouts, per-Milter +error handling, etc. Information in this section: @@ -154,6 +153,7 @@ Information in this section: * Milter error handling * Milter protocol version * Milter protocol timeouts + * Different settings for different Milter applications * Sendmail macro emulation SSMMTTPP--OOnnllyy MMiilltteerr aapppplliiccaattiioonnss @@ -263,6 +263,9 @@ the message in the "hold" queue, and is available with Postfix 2.6 or later. # or quarantine (Postfix 2.6 or later). milter_default_action = tempfail +See "Different settings for different Milter applications" for advanced +configuration options. + MMiilltteerr pprroottooccooll vveerrssiioonn As Postfix is not built with the Sendmail libmilter library, you may need to @@ -298,6 +301,9 @@ The remedy is to lower the Postfix milter_protocol version number. Postfix 2.8 and later will automatically turn off protocol features that the application's libmilter library does not expect. +See "Different settings for different Milter applications" for advanced +configuration options. + MMiilltteerr pprroottooccooll ttiimmeeoouuttss Postfix uses different time limits at different Milter protocol stages. The @@ -319,6 +325,38 @@ lookups. However, if you increase the above timeouts too much, remote SMTP clients may hang up and mail may be delivered multiple times. This is an inherent problem with before-queue filtering. +See "Different settings for different Milter applications" for advanced +configuration options. + +DDiiffffeerreenntt sseettttiinnggss ffoorr ddiiffffeerreenntt MMiilltteerr aapppplliiccaattiioonnss + +The previous sections list a number of Postfix main.cf parameters that control +time limits and other settings for all Postfix Milter clients. This is +sufficient for simple configurations. With more complex configurations it +becomes desirable to have different settings for different Milter clients. This +is supported with Postfix 2.12 and later. + +The following example shows a "non-critical" Milter client with a short connect +timeout, and with "accept" as default action when the service is unvailable. + + 1 /etc/postfix/main.cf: + 2 smtpd_milters = { inet:host:port, + 3 connect_timeout=10s, default_action=accept } + +Instead of a server endpoint, we now have a list enclosed in {}. + + * Line 2: The first item in the list is the server endpoint. This supports + the exact same "inet" and "unix" syntax as described earlier. + + * Line 3: The remainder of the list contains per-Milter settings. These + settings override global main.cf parameters, and have the same name as + those parameters, without the "milter_" prefix. + +Inside the list, syntax is similar to what we already know from main.cf: items +separated by space or comma. There is one difference: yyoouu mmuusstt eenncclloossee aa +sseettttiinngg iinn ppaarreenntthheesseess,, aass iinn ""{{ nnaammee == vvaalluuee }}"",, iiff yyoouu wwaanntt ttoo hhaavvee ssppaaccee +wwiitthhiinn aa vvaalluuee oorr aarroouunndd ""=="". + SSeennddmmaaiill mmaaccrroo eemmuullaattiioonn Postfix emulates a limited number of Sendmail macros, as shown in the table. diff --git a/postfix/README_FILES/SMTPD_POLICY_README b/postfix/README_FILES/SMTPD_POLICY_README index 590d60505..4b0e238ec 100644 --- a/postfix/README_FILES/SMTPD_POLICY_README +++ b/postfix/README_FILES/SMTPD_POLICY_README @@ -26,7 +26,8 @@ incoming SMTP connections. This document covers the following topics: * Policy protocol description - * Policy client/server configuration + * Simple policy client/server configuration + * Advanced policy client configuration * Example: greylist policy server * Greylisting mail from frequently forged domains * Greylisting all your mail @@ -166,7 +167,7 @@ In case of trouble the policy server must not send a reply. Instead the server must log a warning and disconnect. Postfix will retry the request at some later time. -PPoolliiccyy cclliieenntt//sseerrvveerr ccoonnffiigguurraattiioonn +SSiimmppllee ppoolliiccyy cclliieenntt//sseerrvveerr ccoonnffiigguurraattiioonn The Postfix delegated policy client can connect to a TCP socket or to a UNIX- domain socket. Examples: @@ -283,6 +284,52 @@ protocol: the service name of the master.cf entry for the policy daemon service. In the above examples, the service name is "policy" or "127.0.0.1:9998". +AAddvvaanncceedd ppoolliiccyy cclliieenntt ccoonnffiigguurraattiioonn + +The previous section lists a number of Postfix main.cf parameters that control +time limits and other settings for all policy clients. This is sufficient for +simple configurations. With more complex configurations it becomes desirable to +have different settings per policy client. This is supported with Postfix 2.12 +and later. + +The following example shows a "non-critical" policy service with a short +timeout, and with "DUNNO" as default action when the service is unvailable. The +"DUNNO" action causes Postfix to ignore the result. + + 1 /etc/postfix/main.cf: + 2 smtpd_recipient_restrictions = + 3 ... + 4 reject_unauth_destination + 5 check_policy_service { inet:host:port, + 6 timeout=10s, default_action=DUNNO } + 8 ... + +Instead of a server endpoint, we now have a list enclosed in {}. + + * Line 5: The first item in the list is the server endpoint. This supports + the exact same "inet" and "unix" syntax as described earlier. + + * Line 6: The remainder of the list contains per-client settings. These + settings override global main.cf parameters, and have the same name as + those parameters, without the "smtpd_policy_service_" prefix. + +Inside the list, syntax is similar to what we already know from main.cf: items +separated by space or comma. There is one difference: yyoouu mmuusstt eenncclloossee aa +sseettttiinngg iinn ppaarreenntthheesseess,, aass iinn ""{{ nnaammee == vvaalluuee }}"",, iiff yyoouu wwaanntt ttoo hhaavvee ssppaaccee +wwiitthhiinn aa vvaalluuee oorr aarroouunndd ""=="". This comes in handy when different policy servers +require different default actions with different SMTP status codes or text: + + 1 /etc/postfix/main.cf: + 2 smtpd_recipient_restrictions = + 3 ... + 4 reject_unauth_destination + 5 check_policy_service { + 6 inet:host:port1, + 7 { default_action = 451 4.3.5 See http://www.example.com/ + support1 } + 8 } + 9 ... + EExxaammppllee:: ggrreeyylliisstt ppoolliiccyy sseerrvveerr Greylisting is a defense against junk email that is described at http:// diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 45b23efb7..24e5a1bd0 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -41,6 +41,48 @@ Maintainers may also benefit from the makedefs documentation (mantools/srctoman - makedefs | nroff -man | less) with information about build options that are not described in the INSTALL instructions. +Major changes with snapshot 20140928 +==================================== + +Support for per-Milter settings that override main.cf parameters. +For details see the section "Advanced policy client configuration" +in the SMTPD_POLICY_README document. + +Here is an example that uses both old and new syntax: + + smtpd_milters = { inet:127.0.0.1:port1, default_action=accept, ... }, + inet:127.0.0.1:port2, ... + +The per-milter settings are specified as attribute=value pairs +separated by comma or space; specify { name = value } to allow +spaces around the "=" or within an attribute value. + +The supported attribute names are: command_timeout, connect_timeout, +content_timeout, default_action, and protocol. These have the same +names as the corresponding main.cf parameters, without the "milter_" +prefix. + +Support for per-policy service settings that override main.cf +parameters. For details see the section "Different settings for +different Milter applications" in the MILTER_README document. + +Here is an example that uses both old and new syntax: + +smtpd_recipient_restrictions = ... + check_policy_service { inet:127.0.0.1:port3, default_action=DUNNO } + check_policy_service inet:127.0.0.1:port4 + ... + +The per-policy service settings are specified as attribute=value pairs +separated by comma or space; specify { name = value } to allow +spaces around the "=" or within an attribute value. + +The supported attribute names are: default_action, max_idle, max_ttl, +request_limit, retry_delay, timeout, try_limit. These have the same +names as the corresponding main.cf parameters, without the +"smtpd_policy_service_" prefix. + + Major changes with snapshot 20140921 ==================================== diff --git a/postfix/WISHLIST b/postfix/WISHLIST index 46ff863f5..87fbb5992 100644 --- a/postfix/WISHLIST +++ b/postfix/WISHLIST @@ -13,11 +13,18 @@ Wish list: up-convert myhostname to UTF-8 in MIME boundary strings? + Eliminate code duplication between pcf_print_master_field() + and pcf_print_master_entry(). + Introduce constants to replace all the ad-hoc ", \t\r\n" etc. for tokenization. That will have to go into an "util" file because match_strings(3), dict_pipe(3) and dict_random(3) depend on these definitions. + Error reporting: see if pcf_check_master_entry() and children + can return error descriptions instread of terminating with + a fatal error. + Make sure that proxy: can handle random:, pipe:, and other multimaps. diff --git a/postfix/html/MILTER_README.html b/postfix/html/MILTER_README.html index d0dc9e81a..f424f13e4 100644 --- a/postfix/html/MILTER_README.html +++ b/postfix/html/MILTER_README.html @@ -285,9 +285,8 @@ applications (not "postfix", not "www", etc.).

Configuring Postfix

Like Sendmail, Postfix has a lot of configuration options that -control how it talks to Milter applications. With the initial Postfix -Milter protocol implementation, many options are global, that is, -they apply to all Milter applications. Future Postfix versions may +control how it talks to Milter applications. Besides global options +that apply to all Milter applications, Postfix 2.12 and later support per-Milter timeouts, per-Milter error handling, etc.

Information in this section:

@@ -304,6 +303,9 @@ support per-Milter timeouts, per-Milter error handling, etc.

  • Milter protocol timeouts +
  • Different settings for different Milter +applications +
  • Sendmail macro emulation @@ -449,6 +451,9 @@ in the "hold" queue, and is availabl +

    See "Different settings for different +Milter applications" for advanced configuration options.

    +

    Milter protocol version

    As Postfix is not built with the Sendmail libmilter library, @@ -499,6 +504,9 @@ number. Postfix 2.8 and later will automatically turn off protocol features that the application's libmilter library does not expect.

    +

    See "Different settings for different +Milter applications" for advanced configuration options.

    +

    Milter protocol timeouts

    Postfix uses different time limits at different Milter protocol @@ -532,6 +540,52 @@ too much, remote SMTP clients may hang up and mail may be delivered multiple times. This is an inherent problem with before-queue filtering.

    +

    See "Different settings for different +Milter applications" for advanced configuration options.

    + +

    Different settings for different Milter +applications

    + +

    The previous sections list a number of Postfix main.cf parameters +that control time limits and other settings for all Postfix Milter +clients. This is sufficient for simple configurations. With more +complex configurations it becomes desirable to have different +settings for different Milter clients. This is supported with Postfix +2.12 and later.

    + +

    The following example shows a "non-critical" Milter client with +a short connect timeout, and with "accept" as default action when +the service is unvailable.

    + +
    +
    +1 /etc/postfix/main.cf:
+2     smtpd_milters = { inet:host:port,
+3         connect_timeout=10s, default_action=accept }
+
    +
    + +

    Instead of a server endpoint, we now have a list enclosed in {}.

    + + + +

    Inside the list, syntax is similar to what we already know from +main.cf: items separated by space or comma. There is one difference: +you must enclose a setting in parentheses, as in "{ name = value +}", if you want to have space within a value or around "=". +

    +

    Sendmail macro emulation

    Postfix emulates a limited number of Sendmail macros, as shown diff --git a/postfix/html/Makefile.in b/postfix/html/Makefile.in index 5a2ae6b37..23d355749 100644 --- a/postfix/html/Makefile.in +++ b/postfix/html/Makefile.in @@ -26,7 +26,7 @@ CONFIG = access.5.html aliases.5.html canonical.5.html relocated.5.html \ OTHER = postfix-manuals.html AWK = awk '{ print; if (NR == 2) print ".pl 99999\n.ll 78" }' MAN2HTML = man2html -t "Postfix manual - `IFS=.; set \`echo $@\`; echo \"$$1($$2)\"`" -NROFF = GROFF_NO_SGR=1 nroff +NROFF = LANG=C GROFF_NO_SGR=1 nroff update: $(DAEMONS) $(COMMANDS) $(CONFIG) $(OTHER) diff --git a/postfix/html/SMTPD_POLICY_README.html b/postfix/html/SMTPD_POLICY_README.html index bd28f9037..a783310f6 100644 --- a/postfix/html/SMTPD_POLICY_README.html +++ b/postfix/html/SMTPD_POLICY_README.html @@ -47,7 +47,9 @@ multiple times, for up to $max_use incomin

  • Policy protocol description -
  • Policy client/server configuration +
  • Simple policy client/server configuration + +
  • Advanced policy client configuration
  • Example: greylist policy server @@ -229,7 +231,7 @@ the request permanently.

    Instead the server must log a warning and disconnect. Postfix will retry the request at some later time.

    -

    Policy client/server configuration

    +

    Simple policy client/server configuration

    The Postfix delegated policy client can connect to a TCP socket or to a UNIX-domain socket. Examples:

    @@ -380,6 +382,67 @@ examples, the service name is "policy" or "127.0.0.1:9998".

    +

    Advanced policy client configuration

    + +

    The previous section lists a number of Postfix main.cf parameters +that control time limits and other settings for all policy clients. +This is sufficient for simple configurations. With more complex +configurations it becomes desirable to have different settings per +policy client. This is supported with Postfix 2.12 and later.

    + +

    The following example shows a "non-critical" policy service +with a short timeout, and with "DUNNO" as default action when the +service is unvailable. The "DUNNO" action causes Postfix to ignore +the result.

    + +
    +
    +1 /etc/postfix/main.cf:
+2     smtpd_recipient_restrictions = 
+3         ...
+4         reject_unauth_destination
+5         check_policy_service { inet:host:port, 
+6             timeout=10s, default_action=DUNNO }
+8         ...
+
    +
    + +

    Instead of a server endpoint, we now have a list enclosed in {}.

    + + + +

    Inside the list, syntax is similar to what we already know from +main.cf: items separated by space or comma. There is one difference: +you must enclose a setting in parentheses, as in "{ name = value +}", if you want to have space within a value or around "=". +This comes in handy when different policy servers require different +default actions with different SMTP status codes or text:

    + +
    +
    +1 /etc/postfix/main.cf:
+2     smtpd_recipient_restrictions = 
+3         ...
+4         reject_unauth_destination
+5         check_policy_service {
+6           inet:host:port1, 
+7           { default_action = 451 4.3.5 See http://www.example.com/support1 }
+8         } 
+9         ...
+
    +
    +

    Example: greylist policy server

    Greylisting is a defense against junk email that is described at diff --git a/postfix/html/bounce.5.html b/postfix/html/bounce.5.html index 18051cd40..7042a7c6e 100644 --- a/postfix/html/bounce.5.html +++ b/postfix/html/bounce.5.html @@ -16,16 +16,16 @@ BOUNCE(5) BOUNCE(5) DESCRIPTION The Postfix bounce(8) server produces delivery status notification - (DSN) messages for undeliverable mail, delayed mail, successful deliv‐ + (DSN) messages for undeliverable mail, delayed mail, successful deliv- ery or address verification requests. By default, these notifications are generated from built-in templates with message headers and message text. Sites can override the built-in - information by specifying a bounce template file with the bounce_tem‐‐ - plate_file configuration parameter. + information by specifying a bounce template file with the bounce_tem- + plate_file configuration parameter. - This document describes the general procedure to create a bounce tem‐ - plate file, followed by the specific details of bounce template for‐ + This document describes the general procedure to create a bounce tem- + plate file, followed by the specific details of bounce template for- mats. GENERAL PROCEDURE @@ -44,7 +44,7 @@ BOUNCE(5) BOUNCE(5) expansion of time value parameters that appear in the delayed mail notification text. - Once the result is satisfactory, copy the template to the Postfix con‐ + Once the result is satisfactory, copy the template to the Postfix con- figuration directory and specify in main.cf something like: /etc/postfix/main.cf: @@ -53,13 +53,13 @@ BOUNCE(5) BOUNCE(5) TEMPLATE FILE FORMAT The template file can specify templates for failed mail, delayed mail, successful delivery or for address verification. These templates are - named failure_template, delay_template, success_template and ver‐‐ + named failure_template, delay_template, success_template and ver- ify_template, respectively. You can but do not have to specify all four templates in a bounce template file. Each template starts with "template_name = <<EOF" and ends with a line that contains the word "EOF" only. You can change the word EOF, but you - can't enclose it in quotes as with the shell or with Perl (tem‐ + can't enclose it in quotes as with the shell or with Perl (tem- plate_name = <<'EOF'). Here is an example: # The failure template is used for undeliverable mail. @@ -83,16 +83,16 @@ BOUNCE(5) BOUNCE(5) The mail system EOF - The usage and specification of bounce templates is subject to the fol‐ + The usage and specification of bounce templates is subject to the fol- lowing restrictions: - · No special meaning is given to the backslash character or to + o No special meaning is given to the backslash character or to leading whitespace; these are always taken literally. - · Inside the << context, the "$" character is special. To produce + o Inside the << context, the "$" character is special. To produce a "$" character as output, specify "$$". - · Outside the << context, lines beginning with "#" are ignored, as + o Outside the << context, lines beginning with "#" are ignored, as are empty lines, and lines consisting of whitespace only. Examples of all templates can be found in the file bounce.cf.default in @@ -100,7 +100,7 @@ BOUNCE(5) BOUNCE(5) TEMPLATE HEADER FORMAT The first portion of a bounce template consists of optional template - headers. Some become message headers in the delivery status notifica‐ + headers. Some become message headers in the delivery status notifica- tion; some control the formatting of that notification. Headers not specified in a template will be left at their default value. @@ -114,26 +114,26 @@ BOUNCE(5) BOUNCE(5) notification. Subject: - The subject in the message header of the delivery status notifi‐ + The subject in the message header of the delivery status notifi- cation that is returned to the sender. Postmaster-Subject: - The subject that will be used in Postmaster copies of undeliver‐ + The subject that will be used in Postmaster copies of undeliver- able or delayed mail notifications. These copies are sent under control of the notify_classes configuration parameter. The usage and specification of template message headers is subject to the following restrictions: - · Template message header names can be specified in upper case, + o Template message header names can be specified in upper case, lower case or mixed case. Postfix always produces bounce message header labels of the form "From:" and "Subject:". - · Template message headers must not span multiple lines. + o Template message headers must not span multiple lines. - · Template message headers do not support $parameter expansions. + o Template message headers do not support $parameter expansions. - · Template message headers must contain ASCII characters only, and + o Template message headers must contain ASCII characters only, and must not contain ASCII null characters. TEMPLATE MESSAGE TEXT FORMAT @@ -154,14 +154,14 @@ BOUNCE(5) BOUNCE(5) delay_warning_time for possible suffix values. mydomain - Expands into the value of the mydomain parameter. With "smt‐ + Expands into the value of the mydomain parameter. With "smt- putf8_enable = yes", this replaces ACE labels (xn--mumble) with their UTF-8 equivalent. This feature is available in Postfix 2.12. myhostname - Expands into the value of the myhostname parameter. With "smt‐ + Expands into the value of the myhostname parameter. With "smt- putf8_enable = yes", this replaces ACE labels (xn--mumble) with their UTF-8 equivalent. @@ -170,13 +170,13 @@ BOUNCE(5) BOUNCE(5) The usage and specification of template message text is subject to the following restrictions: - · The template message text is not sent in Postmaster copies of + o The template message text is not sent in Postmaster copies of delivery status notifications. - · If the template message text contains non-ASCII characters, + o If the template message text contains non-ASCII characters, Postfix requires that the Charset: template header is updated. Specify an appropriate superset of US-ASCII. A superset is - needed because Postfix appends ASCII text after the message tem‐ + needed because Postfix appends ASCII text after the message tem- plate when it sends a delivery status notification. SEE ALSO diff --git a/postfix/html/bounce.8.html b/postfix/html/bounce.8.html index 13264ac98..19402070a 100644 --- a/postfix/html/bounce.8.html +++ b/postfix/html/bounce.8.html @@ -13,7 +13,7 @@ BOUNCE(8) BOUNCE(8) bounce [generic Postfix daemon options] DESCRIPTION - The bounce(8) daemon maintains per-message log files with delivery sta‐ + The bounce(8) daemon maintains per-message log files with delivery sta- tus information. Each log file is named after the queue file that it corresponds to, and is kept in a queue subdirectory named after the service name in the master.cf file (either bounce, defer or trace). @@ -21,15 +21,15 @@ BOUNCE(8) BOUNCE(8) The bounce(8) daemon processes two types of service requests: - · Append a recipient (non-)delivery status record to a per-message + o Append a recipient (non-)delivery status record to a per-message log file. - · Enqueue a delivery status notification message, with a copy of a + o Enqueue a delivery status notification message, with a copy of a per-message log file and of the corresponding message. When the delivery status notification message is enqueued successfully, the per-message log file is deleted. - The software does a best notification effort. A non-delivery notifica‐ + The software does a best notification effort. A non-delivery notifica- tion is sent even when the log file or the original message cannot be read. @@ -70,8 +70,8 @@ BOUNCE(8) BOUNCE(8) Postfix versions before 2.0. bounce_notice_recipient (postmaster) - The recipient of postmaster notifications with the message head‐ - ers of mail that Postfix did not deliver and of SMTP conversa‐ + The recipient of postmaster notifications with the message head- + ers of mail that Postfix did not deliver and of SMTP conversa- tion transcripts of mail that Postfix did not receive. bounce_size_limit (50000) @@ -82,7 +82,7 @@ BOUNCE(8) BOUNCE(8) Pathname of a configuration file with bounce message templates. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -90,7 +90,7 @@ BOUNCE(8) BOUNCE(8) request before it is terminated by a built-in watchdog timer. delay_notice_recipient (postmaster) - The recipient of postmaster notifications with the message head‐ + The recipient of postmaster notifications with the message head- ers of mail that cannot be delivered within $delay_warning_time time units. @@ -140,13 +140,13 @@ BOUNCE(8) BOUNCE(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". Available in Postfix 2.12 and later: smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci‐ + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. FILES diff --git a/postfix/html/cleanup.8.html b/postfix/html/cleanup.8.html index 6bb8491b4..a3489bd6b 100644 --- a/postfix/html/cleanup.8.html +++ b/postfix/html/cleanup.8.html @@ -18,28 +18,28 @@ CLEANUP(8) CLEANUP(8) The cleanup(8) daemon always performs the following transformations: - · Insert missing message headers: (Resent-) From:, To:, Message- + o Insert missing message headers: (Resent-) From:, To:, Message- Id:, and Date:. - · Transform envelope and header addresses to the standard - user@fully-qualified-domain form that is expected by other Post‐ + o Transform envelope and header addresses to the standard + user@fully-qualified-domain form that is expected by other Post- fix programs. This task is delegated to the trivial-rewrite(8) daemon. - · Eliminate duplicate envelope recipient addresses. + o Eliminate duplicate envelope recipient addresses. The following address transformations are optional: - · Optionally, rewrite all envelope and header addresses according + o Optionally, rewrite all envelope and header addresses according to the mappings specified in the canonical(5) lookup tables. - · Optionally, masquerade envelope sender addresses and message + o Optionally, masquerade envelope sender addresses and message header addresses (i.e. strip host or domain information below all domains listed in the masquerade_domains parameter, except for user names listed in masquerade_exceptions). By default, address masquerading does not affect envelope recipients. - · Optionally, expand envelope recipients according to information + o Optionally, expand envelope recipients according to information found in the virtual(5) lookup tables. The cleanup(8) daemon performs sanity checks on the content of each @@ -107,7 +107,7 @@ CLEANUP(8) CLEANUP(8) header_checks (empty) Optional lookup tables for content inspection of primary non- - MIME message headers, as specified in the header_checks(5) man‐ + MIME message headers, as specified in the header_checks(5) man- ual page. Available in Postfix version 2.0 and later: @@ -122,18 +122,18 @@ CLEANUP(8) CLEANUP(8) page. nested_header_checks ($header_checks) - Optional lookup tables for content inspection of non-MIME mes‐ + Optional lookup tables for content inspection of non-MIME mes- sage headers in attached messages, as described in the header_checks(5) manual page. Available in Postfix version 2.3 and later: message_reject_characters (empty) - The set of characters that Postfix will reject in message con‐ + The set of characters that Postfix will reject in message con- tent. message_strip_characters (empty) - The set of characters that Postfix will remove from message con‐ + The set of characters that Postfix will remove from message con- tent. BEFORE QUEUE MILTER CONTROLS @@ -147,7 +147,7 @@ CLEANUP(8) CLEANUP(8) does not arrive via the Postfix smtpd(8) server. milter_protocol (6) - The mail filter protocol version and optional protocol exten‐ + The mail filter protocol version and optional protocol exten- sions for communication with a Milter application; prior to Postfix 2.6 the default protocol is 2. @@ -156,14 +156,14 @@ CLEANUP(8) CLEANUP(8) unavailable or mis-configured. milter_macro_daemon_name ($myhostname) - The {daemon_name} macro value for Milter (mail filter) applica‐ + The {daemon_name} macro value for Milter (mail filter) applica- tions. milter_macro_v ($mail_name $mail_version) The {v} macro value for Milter (mail filter) applications. milter_connect_timeout (30s) - The time limit for connecting to a Milter (mail filter) applica‐ + The time limit for connecting to a Milter (mail filter) applica- tion, and for negotiating protocol options. milter_command_timeout (30s) @@ -233,7 +233,7 @@ CLEANUP(8) CLEANUP(8) Reject mail with 8-bit text in message headers. strict_8bitmime_body (no) - Reject 8-bit message body text without 8-bit MIME content encod‐ + Reject 8-bit message body text without 8-bit MIME content encod- ing information. strict_mime_encoding_domain (no) @@ -243,7 +243,7 @@ CLEANUP(8) CLEANUP(8) Available in Postfix version 2.5 and later: detect_8bit_encoding_header (yes) - Automatically detect 8BITMIME body content by looking at Con‐ + Automatically detect 8BITMIME body content by looking at Con- tent-Transfer-Encoding: message headers; historically, this behavior was hard-coded to be "always on". @@ -293,8 +293,8 @@ CLEANUP(8) CLEANUP(8) masquerade_exceptions (empty) Optional list of user names that are not subjected to address - masquerading, even when their address matches $masquer‐ - ade_domains. + masquerading, even when their address matches $masquer- + ade_domains. propagate_unmatched_extensions (canonical, virtual) What address lookup tables copy an address extension from the @@ -325,7 +325,7 @@ CLEANUP(8) CLEANUP(8) mapping. sender_canonical_classes (envelope_sender, header_sender) - What addresses are subject to sender_canonical_maps address map‐ + What addresses are subject to sender_canonical_maps address map- ping. remote_header_rewrite_domain (empty) @@ -335,7 +335,7 @@ CLEANUP(8) CLEANUP(8) RESOURCE AND RATE CONTROLS duplicate_filter_limit (1000) - The maximal number of addresses remembered by the address dupli‐ + The maximal number of addresses remembered by the address dupli- cate filter for aliases(5) or virtual(5) alias expansion, or for showq(8) queue displays. @@ -382,7 +382,7 @@ CLEANUP(8) CLEANUP(8) MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -390,7 +390,7 @@ CLEANUP(8) CLEANUP(8) request before it is terminated by a built-in watchdog timer. delay_logging_resolution_limit (2) - The maximal number of digits after the decimal point when log‐ + The maximal number of digits after the decimal point when log- ging sub-second delay values. delay_warning_time (0h) @@ -434,7 +434,7 @@ CLEANUP(8) CLEANUP(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". Available in Postfix version 2.1 and later: diff --git a/postfix/html/defer.8.html b/postfix/html/defer.8.html index 13264ac98..19402070a 100644 --- a/postfix/html/defer.8.html +++ b/postfix/html/defer.8.html @@ -13,7 +13,7 @@ BOUNCE(8) BOUNCE(8) bounce [generic Postfix daemon options] DESCRIPTION - The bounce(8) daemon maintains per-message log files with delivery sta‐ + The bounce(8) daemon maintains per-message log files with delivery sta- tus information. Each log file is named after the queue file that it corresponds to, and is kept in a queue subdirectory named after the service name in the master.cf file (either bounce, defer or trace). @@ -21,15 +21,15 @@ BOUNCE(8) BOUNCE(8) The bounce(8) daemon processes two types of service requests: - · Append a recipient (non-)delivery status record to a per-message + o Append a recipient (non-)delivery status record to a per-message log file. - · Enqueue a delivery status notification message, with a copy of a + o Enqueue a delivery status notification message, with a copy of a per-message log file and of the corresponding message. When the delivery status notification message is enqueued successfully, the per-message log file is deleted. - The software does a best notification effort. A non-delivery notifica‐ + The software does a best notification effort. A non-delivery notifica- tion is sent even when the log file or the original message cannot be read. @@ -70,8 +70,8 @@ BOUNCE(8) BOUNCE(8) Postfix versions before 2.0. bounce_notice_recipient (postmaster) - The recipient of postmaster notifications with the message head‐ - ers of mail that Postfix did not deliver and of SMTP conversa‐ + The recipient of postmaster notifications with the message head- + ers of mail that Postfix did not deliver and of SMTP conversa- tion transcripts of mail that Postfix did not receive. bounce_size_limit (50000) @@ -82,7 +82,7 @@ BOUNCE(8) BOUNCE(8) Pathname of a configuration file with bounce message templates. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -90,7 +90,7 @@ BOUNCE(8) BOUNCE(8) request before it is terminated by a built-in watchdog timer. delay_notice_recipient (postmaster) - The recipient of postmaster notifications with the message head‐ + The recipient of postmaster notifications with the message head- ers of mail that cannot be delivered within $delay_warning_time time units. @@ -140,13 +140,13 @@ BOUNCE(8) BOUNCE(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". Available in Postfix 2.12 and later: smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci‐ + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. FILES diff --git a/postfix/html/flush.8.html b/postfix/html/flush.8.html index 2921c0263..6c915a336 100644 --- a/postfix/html/flush.8.html +++ b/postfix/html/flush.8.html @@ -20,12 +20,12 @@ FLUSH(8) FLUSH(8) process manager. The record is implemented as a per-destination logfile with as contents - the queue IDs of deferred mail. A logfile is append-only, and is trun‐ + the queue IDs of deferred mail. A logfile is append-only, and is trun- cated when delivery is requested for the corresponding destination. A destination is the part on the right-hand side of the right-most @ in an email address. - Per-destination logfiles of deferred mail are maintained only for eli‐ + Per-destination logfiles of deferred mail are maintained only for eli- gible destinations. The list of eligible destinations is specified with the fast_flush_domains configuration parameter, which defaults to $relay_domains. @@ -37,7 +37,7 @@ FLUSH(8) FLUSH(8) queue ID is queued for the specified destination. send_site sitename - Request delivery of mail that is queued for the specified desti‐ + Request delivery of mail that is queued for the specified desti- nation. send_file queueid @@ -67,7 +67,7 @@ FLUSH(8) FLUSH(8) Fast flush logfiles are truncated only after a "send" request, not when mail is actually delivered, and therefore can accumulate outdated or redundant data. In order to maintain sanity, "refresh" must be executed - periodically. This can be automated with a suitable wakeup timer set‐ + periodically. This can be automated with a suitable wakeup timer set- ting in the master.cf configuration file. Upon receipt of a request to deliver mail for an eligible destination, @@ -86,7 +86,7 @@ FLUSH(8) FLUSH(8) more details including examples. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -94,7 +94,7 @@ FLUSH(8) FLUSH(8) request before it is terminated by a built-in watchdog timer. fast_flush_domains ($relay_domains) - Optional list of destinations that are eligible for per-destina‐ + Optional list of destinations that are eligible for per-destina- tion logfiles with mail that is queued to those destinations. fast_flush_refresh_time (12h) @@ -102,7 +102,7 @@ FLUSH(8) FLUSH(8) "fast flush" logfile needs to be refreshed. fast_flush_purge_time (7d) - The time after which an empty per-destination "fast flush" log‐ + The time after which an empty per-destination "fast flush" log- file is deleted. ipc_timeout (3600s) @@ -136,7 +136,7 @@ FLUSH(8) FLUSH(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". FILES diff --git a/postfix/html/lmtp.8.html b/postfix/html/lmtp.8.html index 0356f23da..92a57e071 100644 --- a/postfix/html/lmtp.8.html +++ b/postfix/html/lmtp.8.html @@ -14,7 +14,7 @@ SMTP(8) SMTP(8) DESCRIPTION The Postfix SMTP+LMTP client implements the SMTP and LMTP mail delivery - protocols. It processes message delivery requests from the queue man‐ + protocols. It processes message delivery requests from the queue man- ager. Each request specifies a queue file, a sender address, a domain or host to deliver to, and recipient information. This program expects to be run from the master(8) process manager. @@ -46,7 +46,7 @@ SMTP(8) SMTP(8) domainname domainname:port - Look up the mail exchangers for the specified domain, and con‐ + Look up the mail exchangers for the specified domain, and con- nect to the specified port (default: smtp). [hostname] @@ -59,7 +59,7 @@ SMTP(8) SMTP(8) [address]:port Connect to the host at the specified address, and connect to the - specified port (default: smtp). An IPv6 address must be format‐ + specified port (default: smtp). An IPv6 address must be format- ted as [ipv6:address]. LMTP DESTINATION SYNTAX @@ -115,7 +115,7 @@ SMTP(8) SMTP(8) files are marked so that the queue manager can move them to the corrupt queue for further inspection. - Depending on the setting of the notify_classes parameter, the postmas‐ + Depending on the setting of the notify_classes parameter, the postmas- ter is notified of bounces, protocol problems, and of other trouble. BUGS @@ -133,7 +133,7 @@ SMTP(8) SMTP(8) there is no support for TLS, and connections are cached in-process, making it ineffective when the client is used for multiple domains. - Most smtp_xxx configuration parameters have an lmtp_xxx "mirror" param‐ + Most smtp_xxx configuration parameters have an lmtp_xxx "mirror" param- eter for the equivalent LMTP feature. This document describes only those LMTP-related parameters that aren't simply "mirror" parameters. @@ -244,7 +244,7 @@ SMTP(8) SMTP(8) send_cyrus_sasl_authzid (no) When authenticating to a remote SMTP or LMTP server with the default setting "no", send no SASL authoriZation ID (authzid); - send only the SASL authentiCation ID (authcid) plus the auth‐ + send only the SASL authentiCation ID (authcid) plus the auth- cid's password. Available in Postfix version 2.5 and later: @@ -266,7 +266,7 @@ SMTP(8) SMTP(8) Available in Postfix version 2.6 and later: tcp_windowsize (0) - An optional workaround for routers that break TCP window scal‐ + An optional workaround for routers that break TCP window scal- ing. Available in Postfix version 2.8 and later: @@ -280,7 +280,7 @@ SMTP(8) SMTP(8) Change the behavior of the smtp_*_timeout time limits, from a time limit per read or write system call, to a time limit to send or receive a complete record (an SMTP command line, SMTP - response line, SMTP message content line, or TLS protocol mes‐ + response line, SMTP message content line, or TLS protocol mes- sage). smtp_send_dummy_mail_auth (no) @@ -296,7 +296,7 @@ SMTP(8) SMTP(8) smtp_delivery_status_filter ($default_delivery_status_filter) Optional filter for the smtp(8) delivery agent to change the - delivery status code or explanatory text of successful or unsuc‐ + delivery status code or explanatory text of successful or unsuc- cessful deliveries. MIME PROCESSING CONTROLS @@ -323,13 +323,13 @@ SMTP(8) SMTP(8) Enable SASL authentication in the Postfix SMTP client. smtp_sasl_password_maps (empty) - Optional Postfix SMTP client lookup tables with one user‐ + Optional Postfix SMTP client lookup tables with one user- name:password entry per remote hostname or domain, or sender address when sender-dependent authentication is enabled. smtp_sasl_security_options (noplaintext, noanonymous) Postfix SMTP client SASL security options; as of Postfix 2.3 the - list of available features depends on the SASL client implemen‐ + list of available features depends on the SASL client implemen- tation that is selected with smtp_sasl_type. Available in Postfix version 2.2 and later: @@ -343,7 +343,7 @@ SMTP(8) SMTP(8) smtp_sender_dependent_authentication (no) Enable sender-dependent authentication in the Postfix SMTP client; this is available only with SASL authentication, and - disables SMTP connection caching to ensure that mail from dif‐ + disables SMTP connection caching to ensure that mail from dif- ferent senders will use the appropriate credentials. smtp_sasl_path (empty) @@ -358,7 +358,7 @@ SMTP(8) SMTP(8) Available in Postfix version 2.5 and later: smtp_sasl_auth_cache_name (empty) - An optional table to prevent repeated SASL authentication fail‐ + An optional table to prevent repeated SASL authentication fail- ures with the same remote SMTP server hostname, username and password. @@ -397,7 +397,7 @@ SMTP(8) SMTP(8) smtp_tls_CAfile (empty) A file containing CA certificates of root CAs trusted to sign - either remote SMTP server certificates or intermediate CA cer‐ + either remote SMTP server certificates or intermediate CA cer- tificates. smtp_tls_CApath (empty) @@ -418,7 +418,7 @@ SMTP(8) SMTP(8) smtp_tls_mandatory_exclude_ciphers (empty) Additional list of ciphers or cipher types to exclude from the - Postfix SMTP client cipher list at mandatory TLS security lev‐ + Postfix SMTP client cipher list at mandatory TLS security lev- els. smtp_tls_dcert_file (empty) @@ -439,7 +439,7 @@ SMTP(8) SMTP(8) smtp_tls_policy_maps (empty) Optional lookup tables with the Postfix SMTP client TLS security - policy by next-hop destination; when a non-empty value is speci‐ + policy by next-hop destination; when a non-empty value is speci- fied, this overrides the obsolete smtp_tls_per_site parameter. smtp_tls_mandatory_protocols (!SSLv2) @@ -488,8 +488,8 @@ SMTP(8) SMTP(8) Available in Postfix version 2.4 and later: - smtp_sasl_tls_verified_security_options ($smtp_sasl_tls_secu‐‐ - rity_options) + smtp_sasl_tls_verified_security_options ($smtp_sasl_tls_secu- + rity_options) The SASL authentication security options that the Postfix SMTP client uses for TLS encrypted SMTP sessions with a verified server certificate. @@ -498,8 +498,8 @@ SMTP(8) SMTP(8) smtp_tls_fingerprint_cert_match (empty) List of acceptable remote SMTP server certificate fingerprints - for the "fingerprint" TLS security level (smtp_tls_secu‐‐ - rity_level = fingerprint). + for the "fingerprint" TLS security level (smtp_tls_secu- + rity_level = fingerprint). smtp_tls_fingerprint_digest (md5) The message digest algorithm used to construct remote SMTP @@ -516,18 +516,18 @@ SMTP(8) SMTP(8) use with opportunistic TLS encryption. smtp_tls_eccert_file (empty) - File with the Postfix SMTP client ECDSA certificate in PEM for‐ + File with the Postfix SMTP client ECDSA certificate in PEM for- mat. smtp_tls_eckey_file ($smtp_tls_eccert_file) - File with the Postfix SMTP client ECDSA private key in PEM for‐ + File with the Postfix SMTP client ECDSA private key in PEM for- mat. Available in Postfix version 2.7 and later: smtp_tls_block_early_mail_reply (no) Try to detect a mail hijacking attack based on a TLS protocol - vulnerability (CVE-2009-3555), where an attacker prepends mali‐ + vulnerability (CVE-2009-3555), where an attacker prepends mali- cious HELO, MAIL, RCPT, DATA commands to a Postfix SMTP client TLS session. @@ -572,7 +572,7 @@ SMTP(8) SMTP(8) smtp_tls_per_site (empty) Optional lookup tables with the Postfix SMTP client TLS usage - policy by next-hop destination and by remote SMTP server host‐ + policy by next-hop destination and by remote SMTP server host- name. smtp_tls_cipherlist (empty) @@ -580,17 +580,17 @@ SMTP(8) SMTP(8) cipher list. RESOURCE AND RATE CONTROLS - smtp_destination_concurrency_limit ($default_destination_concur‐‐ - rency_limit) - The maximal number of parallel deliveries to the same destina‐ + smtp_destination_concurrency_limit ($default_destination_concur- + rency_limit) + The maximal number of parallel deliveries to the same destina- tion via the smtp message delivery transport. smtp_destination_recipient_limit ($default_destination_recipient_limit) - The maximal number of recipients per message for the smtp mes‐ + The maximal number of recipients per message for the smtp mes- sage delivery transport. smtp_connect_timeout (30s) - The Postfix SMTP client time limit for completing a TCP connec‐ + The Postfix SMTP client time limit for completing a TCP connec- tion, or zero (use the operating system built-in time limit). smtp_helo_timeout (300s) @@ -603,7 +603,7 @@ SMTP(8) SMTP(8) and for receiving the initial remote LMTP server response. smtp_xforward_timeout (300s) - The Postfix SMTP client time limit for sending the XFORWARD com‐ + The Postfix SMTP client time limit for sending the XFORWARD com- mand, and for receiving the remote SMTP server response. smtp_mail_timeout (300s) @@ -663,7 +663,7 @@ SMTP(8) SMTP(8) has a high volume of mail in the active queue. smtp_connection_reuse_time_limit (300s) - The amount of time during which Postfix will use an SMTP connec‐ + The amount of time during which Postfix will use an SMTP connec- tion repeatedly. smtp_connection_cache_time_limit (2s) @@ -673,7 +673,7 @@ SMTP(8) SMTP(8) Available in Postfix version 2.3 and later: connection_cache_protocol_timeout (5s) - Time limit for connection cache connect, send or receive opera‐ + Time limit for connection cache connect, send or receive opera- tions. Available in Postfix version 2.9 and later: @@ -682,7 +682,7 @@ SMTP(8) SMTP(8) Change the behavior of the smtp_*_timeout time limits, from a time limit per read or write system call, to a time limit to send or receive a complete record (an SMTP command line, SMTP - response line, SMTP message content line, or TLS protocol mes‐ + response line, SMTP message content line, or TLS protocol mes- sage). Available in Postfix version 2.11 and later: @@ -700,7 +700,7 @@ SMTP(8) SMTP(8) in RFC 6531..6533. smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci‐ + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. TROUBLE SHOOTING CONTROLS @@ -715,7 +715,7 @@ SMTP(8) SMTP(8) error_notice_recipient (postmaster) The recipient of postmaster notifications about mail delivery - problems that are caused by policy, resource, software or proto‐ + problems that are caused by policy, resource, software or proto- col errors. internal_mail_filter_classes (empty) @@ -732,7 +732,7 @@ SMTP(8) SMTP(8) detects a "mail loops back to myself" error condition. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -740,7 +740,7 @@ SMTP(8) SMTP(8) request before it is terminated by a built-in watchdog timer. delay_logging_resolution_limit (2) - The maximal number of digits after the decimal point when log‐ + The maximal number of digits after the decimal point when log- ging sub-second delay values. disable_dns_lookups (no) @@ -760,7 +760,7 @@ SMTP(8) SMTP(8) lmtp_assume_final (no) When a remote LMTP server announces no DSN support, assume that - the server performs final delivery, and send "delivered" deliv‐ + the server performs final delivery, and send "delivered" deliv- ery status notifications instead of "relayed". lmtp_tcp_port (24) @@ -815,7 +815,7 @@ SMTP(8) SMTP(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". Available with Postfix 2.2 and earlier: diff --git a/postfix/html/local.8.html b/postfix/html/local.8.html index aaa635cef..67245eb16 100644 --- a/postfix/html/local.8.html +++ b/postfix/html/local.8.html @@ -19,7 +19,7 @@ LOCAL(8) LOCAL(8) to, and one or more recipients. This program expects to be run from the master(8) process manager. - The local(8) daemon updates queue files and marks recipients as fin‐ + The local(8) daemon updates queue files and marks recipients as fin- ished, or it informs the queue manager that delivery should be tried again at a later time. Delivery status reports are sent to the bounce(8), defer(8) or trace(8) daemon as appropriate. @@ -41,15 +41,15 @@ LOCAL(8) LOCAL(8) Upon delivery, the local delivery agent tries each pathname in the list until a file is found. - Delivery via ~/.forward files is done with the privileges of the recip‐ + Delivery via ~/.forward files is done with the privileges of the recip- ient. Thus, ~/.forward like files must be readable by the recipient, and their parent directory needs to have "execute" permission for the recipient. - The forward_path parameter is subject to interpolation of $user (recip‐ + The forward_path parameter is subject to interpolation of $user (recip- ient username), $home (recipient home directory), $shell (recipient shell), $recipient (complete recipient address), $extension (recipient - address extension), $domain (recipient domain), $local (entire recipi‐ + address extension), $domain (recipient domain), $local (entire recipi- ent address localpart) and $recipient_delimiter. The forms ${name?value} and ${name:value} expand conditionally to value when $name is (is not) defined. Characters that may have special meaning to @@ -57,14 +57,14 @@ LOCAL(8) LOCAL(8) acceptable characters is specified with the forward_expansion_filter configuration parameter. - An alias or ~/.forward file may list any combination of external com‐ + An alias or ~/.forward file may list any combination of external com- mands, destination file names, :include: directives, or mail addresses. - See aliases(5) for a precise description. Each line in a user's .for‐‐ + See aliases(5) for a precise description. Each line in a user's .for- ward file has the same syntax as the right-hand part of an alias. When an address is found in its own alias expansion, delivery is made to the user instead. When a user is listed in the user's own ~/.forward - file, delivery is made to the user's mailbox instead. An empty ~/.for‐‐ + file, delivery is made to the user's mailbox instead. An empty ~/.for- ward file means do not forward mail. In order to prevent the mail system from using up unreasonable amounts @@ -72,7 +72,7 @@ LOCAL(8) LOCAL(8) are broken up into chunks of length line_length_limit. While expanding aliases, ~/.forward files, and so on, the program - attempts to avoid duplicate deliveries. The duplicate_filter_limit con‐ + attempts to avoid duplicate deliveries. The duplicate_filter_limit con- figuration parameter limits the number of remembered recipients. MAIL FORWARDING @@ -98,16 +98,16 @@ LOCAL(8) LOCAL(8) Mailbox delivery can be delegated to an external command specified with the mailbox_command_maps and mailbox_command configuration parameters. - The command executes with the privileges of the recipient user (excep‐ + The command executes with the privileges of the recipient user (excep- tions: secondary groups are not enabled; in case of delivery as root, the command executes with the privileges of default_privs). Mailbox delivery can be delegated to alternative message transports - specified in the master.cf file. The mailbox_transport_maps and mail‐‐ - box_transport configuration parameters specify an optional message + specified in the master.cf file. The mailbox_transport_maps and mail- + box_transport configuration parameters specify an optional message transport that is to be used for all local recipients, regardless of - whether they are found in the UNIX passwd database. The fall‐‐ - back_transport_maps and fallback_transport parameters specify an + whether they are found in the UNIX passwd database. The fall- + back_transport_maps and fallback_transport parameters specify an optional message transport for recipients that are not found in the aliases(5) or UNIX passwd database. @@ -117,7 +117,7 @@ LOCAL(8) LOCAL(8) to Postfix, prepends an optional Delivered-To: header with the final envelope recipient address, prepends a Return-Path: header with the envelope sender address, prepends a > character to lines beginning with - "From ", and appends an empty line. The mailbox is locked for exclu‐ + "From ", and appends an empty line. The mailbox is locked for exclu- sive access while delivery is in progress. In case of problems, an attempt is made to truncate the mailbox to its original length. @@ -129,23 +129,23 @@ LOCAL(8) LOCAL(8) EXTERNAL COMMAND DELIVERY The allow_mail_to_commands configuration parameter restricts delivery - to external commands. The default setting (alias, forward) forbids com‐ + to external commands. The default setting (alias, forward) forbids com- mand destinations in :include: files. - Optionally, the process working directory is changed to the path speci‐ + Optionally, the process working directory is changed to the path speci- fied with command_execution_directory (Postfix 2.2 and later). Failure to change directory causes mail to be deferred. - The command_execution_directory parameter value is subject to interpo‐ + The command_execution_directory parameter value is subject to interpo- lation of $user (recipient username), $home (recipient home directory), $shell (recipient shell), $recipient (complete recipient address), $extension (recipient address extension), $domain (recipient domain), $local (entire recipient address localpart) and $recipient_delimiter. The forms ${name?value} and ${name:value} expand conditionally to value - when $name is (is not) defined. Characters that may have special mean‐ + when $name is (is not) defined. Characters that may have special mean- ing to the shell or file system are replaced by underscores. The list - of acceptable characters is specified with the execution_direc‐‐ - tory_expansion_filter configuration parameter. + of acceptable characters is specified with the execution_direc- + tory_expansion_filter configuration parameter. The command is executed directly where possible. Assistance by the shell (/bin/sh on UNIX systems) is used only when the command contains @@ -154,7 +154,7 @@ LOCAL(8) LOCAL(8) A limited amount of command output (standard output and standard error) is captured for inclusion with non-delivery status reports. A command - is forcibly terminated if it does not complete within com‐‐ + is forcibly terminated if it does not complete within com- mand_time_limit seconds. Command exit status codes are expected to follow the conventions defined in <sysexits.h>. Exit status 0 means normal successful completion. @@ -164,9 +164,9 @@ LOCAL(8) LOCAL(8) command output begins with an enhanced status code, this status code takes precedence over the non-zero exit status. - A limited amount of message context is exported via environment vari‐ + A limited amount of message context is exported via environment vari- ables. Characters that may have special meaning to the shell are - replaced by underscores. The list of acceptable characters is speci‐ + replaced by underscores. The list of acceptable characters is speci- fied with the command_expansion_filter configuration parameter. SHELL The recipient user's login shell. @@ -195,7 +195,7 @@ LOCAL(8) LOCAL(8) SENDER The entire sender address. - Additional remote client information is made available via the follow‐ + Additional remote client information is made available via the follow- ing environment variables: CLIENT_ADDRESS @@ -241,7 +241,7 @@ LOCAL(8) LOCAL(8) / for qmail-compatible maildir delivery. The allow_mail_to_files configuration parameter restricts delivery to - external files. The default setting (alias, forward) forbids file des‐ + external files. The default setting (alias, forward) forbids file des- tinations in :include: files. In the case of UNIX-style mailbox delivery, the local(8) daemon @@ -266,7 +266,7 @@ LOCAL(8) LOCAL(8) to separate address extensions from local recipient names. For example, with "recipient_delimiter = +", mail for name+foo is - delivered to the alias name+foo or to the alias name, to the destina‐ + delivered to the alias name+foo or to the alias name, to the destina- tions listed in ~name/.forward+foo or in ~name/.forward, to the mailbox owned by the user name, or it is sent back as undeliverable. @@ -287,13 +287,13 @@ LOCAL(8) LOCAL(8) files are marked so that the queue manager can move them to the corrupt queue afterwards. - Depending on the setting of the notify_classes parameter, the postmas‐ + Depending on the setting of the notify_classes parameter, the postmas- ter is notified of bounces and of other trouble. SECURITY The local(8) delivery agent needs a dual personality 1) to access the - private Postfix queue and IPC mechanisms, 2) to impersonate the recipi‐ - ent and deliver to recipient-specified files or commands. It is there‐ + private Postfix queue and IPC mechanisms, 2) to impersonate the recipi- + ent and deliver to recipient-specified files or commands. It is there- fore security sensitive. The local(8) delivery agent disallows regular expression substitution @@ -307,11 +307,11 @@ LOCAL(8) LOCAL(8) BUGS For security reasons, the message delivery status of external commands or of external files is never checkpointed to file. As a result, the - program may occasionally deliver more than once to a command or exter‐ + program may occasionally deliver more than once to a command or exter- nal file. Better safe than sorry. Mutually-recursive aliases or ~/.forward files are not detected early. - The resulting mail forwarding loop is broken by the use of the Deliv‐‐ + The resulting mail forwarding loop is broken by the use of the Deliv- ered-To: message header. CONFIGURATION PARAMETERS @@ -333,8 +333,8 @@ LOCAL(8) LOCAL(8) owner_request_special (yes) Give special treatment to owner-listname and listname-request - address localparts: don't split such addresses when the recipi‐ - ent_delimiter is set to "-". + address localparts: don't split such addresses when the recipi- + ent_delimiter is set to "-". sun_mailtool_compatibility (no) Obsolete SUN mailtool compatibility feature. @@ -350,7 +350,7 @@ LOCAL(8) LOCAL(8) Available in Postfix version 2.5.3 and later: strict_mailbox_ownership (yes) - Defer delivery when a mailbox file is not owned by its recipi‐ + Defer delivery when a mailbox file is not owned by its recipi- ent. reset_owner_alias (no) @@ -368,8 +368,8 @@ LOCAL(8) LOCAL(8) DELIVERY METHOD CONTROLS The precedence of local(8) delivery methods from high to low is: aliases, .forward files, mailbox_transport_maps, mailbox_transport, - mailbox_command_maps, mailbox_command, home_mailbox, mail_spool_direc‐ - tory, fallback_transport_maps, fallback_transport, and luser_relay. + mailbox_command_maps, mailbox_command, home_mailbox, mail_spool_direc- + tory, fallback_transport_maps, fallback_transport, and luser_relay. alias_maps (see 'postconf -d' output) The alias databases that are used for local(8) delivery. @@ -444,16 +444,16 @@ LOCAL(8) LOCAL(8) Time limit for delivery to external commands. duplicate_filter_limit (1000) - The maximal number of addresses remembered by the address dupli‐ + The maximal number of addresses remembered by the address dupli- cate filter for aliases(5) or virtual(5) alias expansion, or for showq(8) queue displays. local_destination_concurrency_limit (2) The maximal number of parallel deliveries via the local mail - delivery transport to the same recipient (when "local_destina‐ - tion_recipient_limit = 1") or the maximal number of parallel - deliveries to the same local domain (when "local_destina‐ - tion_recipient_limit > 1"). + delivery transport to the same recipient (when "local_destina- + tion_recipient_limit = 1") or the maximal number of parallel + deliveries to the same local domain (when "local_destina- + tion_recipient_limit > 1"). local_destination_recipient_limit (1) The maximal number of recipients per message delivery via the @@ -472,8 +472,8 @@ LOCAL(8) LOCAL(8) command_expansion_filter (see 'postconf -d' output) Restrict the characters that the local(8) delivery agent allows - in $name expansions of $mailbox_command and $command_execu‐ - tion_directory. + in $name expansions of $mailbox_command and $command_execu- + tion_directory. default_privs (nobody) The default rights used by the local(8) delivery agent for @@ -492,12 +492,12 @@ LOCAL(8) LOCAL(8) Available in Postfix version 2.5.3 and later: strict_mailbox_ownership (yes) - Defer delivery when a mailbox file is not owned by its recipi‐ + Defer delivery when a mailbox file is not owned by its recipi- ent. MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -505,7 +505,7 @@ LOCAL(8) LOCAL(8) request before it is terminated by a built-in watchdog timer. delay_logging_resolution_limit (2) - The maximal number of digits after the decimal point when log‐ + The maximal number of digits after the decimal point when log- ging sub-second delay values. export_environment (see 'postconf -d' output) @@ -517,7 +517,7 @@ LOCAL(8) LOCAL(8) internal communication channel. local_command_shell (empty) - Optional shell program for local(8) delivery to non-Postfix com‐ + Optional shell program for local(8) delivery to non-Postfix com- mand. max_idle (100s) @@ -529,7 +529,7 @@ LOCAL(8) LOCAL(8) process will service before terminating voluntarily. prepend_delivered_header (command, file, forward) - The message delivery contexts where the Postfix local(8) deliv‐ + The message delivery contexts where the Postfix local(8) deliv- ery agent prepends a Delivered-To: message header with the address that the mail was delivered to. @@ -560,7 +560,7 @@ LOCAL(8) LOCAL(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". FILES diff --git a/postfix/html/mailq.1.html b/postfix/html/mailq.1.html index bd2ea89bd..5a981c838 100644 --- a/postfix/html/mailq.1.html +++ b/postfix/html/mailq.1.html @@ -19,7 +19,7 @@ SENDMAIL(1) SENDMAIL(1) sendmail -I DESCRIPTION - The Postfix sendmail(1) command implements the Postfix to Sendmail com‐ + The Postfix sendmail(1) command implements the Postfix to Sendmail com- patibility interface. For the sake of compatibility with existing applications, some Sendmail command-line options are recognized but silently ignored. @@ -29,7 +29,7 @@ SENDMAIL(1) SENDMAIL(1) arranges for delivery. Postfix sendmail(1) relies on the postdrop(1) command to create a queue file in the maildrop directory. - Specific command aliases are provided for other common modes of opera‐ + Specific command aliases are provided for other common modes of opera- tion: mailq List the mail queue. Each entry shows the queue file ID, message @@ -41,7 +41,7 @@ SENDMAIL(1) SENDMAIL(1) * The message is in the active queue, i.e. the message is selected for delivery. - ! The message is in the hold queue, i.e. no further deliv‐ + ! The message is in the hold queue, i.e. no further deliv- ery attempt will be made until the mail is taken off hold. @@ -51,7 +51,7 @@ SENDMAIL(1) SENDMAIL(1) newaliases Initialize the alias database. If no input file is specified (with the -oA option, see below), the program processes the - file(s) specified with the alias_database configuration parame‐ + file(s) specified with the alias_database configuration parame- ter. If no alias database type is specified, the program uses the type specified with the default_database_type configuration parameter. This mode of operation is implemented by running the @@ -87,7 +87,7 @@ SENDMAIL(1) SENDMAIL(1) -bi Initialize alias database. See the newaliases command above. -bl Go into daemon mode. To accept only local connections as with - Sendmail´s -bl option, specify "inet_interfaces = loopback" in + Sendmail's -bl option, specify "inet_interfaces = loopback" in the Postfix main.cf configuration file. -bm Read mail from standard input and arrange for delivery. This is @@ -118,12 +118,12 @@ SENDMAIL(1) SENDMAIL(1) before 2.3. With all Postfix versions, you can specify a directory pathname - with the MAIL_CONFIG environment variable to override the loca‐ + with the MAIL_CONFIG environment variable to override the loca- tion of configuration files. -F full_name Set the sender full name. This overrides the NAME environment - variable, and is used only with messages that have no From: mes‐ + variable, and is used only with messages that have no From: mes- sage header. -f sender @@ -132,8 +132,8 @@ SENDMAIL(1) SENDMAIL(1) the Errors-To: message header overrides the error return address. - -G Gateway (relay) submission, as opposed to initial user submis‐ - sion. Either do not rewrite addresses at all, or update incom‐ + -G Gateway (relay) submission, as opposed to initial user submis- + sion. Either do not rewrite addresses at all, or update incom- plete addresses with the domain information specified with remote_header_rewrite_domain. @@ -145,7 +145,7 @@ SENDMAIL(1) SENDMAIL(1) -I Initialize alias database. See the newaliases command above. - -i When reading a message from standard input, don´t treat a line + -i When reading a message from standard input, don't treat a line with only a . character as the end of input. -L label (ignored) @@ -179,17 +179,17 @@ SENDMAIL(1) SENDMAIL(1) -o7 (ignored) -o8 (ignored) - To send 8-bit or binary content, use an appropriate MIME encap‐ + To send 8-bit or binary content, use an appropriate MIME encap- sulation and specify the appropriate -B command-line option. - -oi When reading a message from standard input, don´t treat a line + -oi When reading a message from standard input, don't treat a line with only a . character as the end of input. -om (ignored) The sender is never eliminated from alias etc. expansions. -o x value (ignored) - Set option x to value. Use the equivalent configuration parame‐ + Set option x to value. Use the equivalent configuration parame- ter in main.cf instead. -r sender @@ -209,25 +209,25 @@ SENDMAIL(1) SENDMAIL(1) This option is ignored before Postfix version 2.10. - -q Attempt to deliver all queued mail. This is implemented by exe‐ + -q Attempt to deliver all queued mail. This is implemented by exe- cuting the postqueue(1) command. Warning: flushing undeliverable mail frequently will result in poor delivery performance of all other mail. -qinterval (ignored) - The interval between queue runs. Use the queue_run_delay config‐ + The interval between queue runs. Use the queue_run_delay config- uration parameter instead. -qIqueueid Schedule immediate delivery of mail with the specified queue ID. - This option is implemented by executing the postqueue(1) com‐ + This option is implemented by executing the postqueue(1) com- mand, and is available with Postfix version 2.4 and later. -qRsite Schedule immediate delivery of all mail that is queued for the - named site. This option accepts only site names that are eligi‐ - ble for the "fast flush" service, and is implemented by execut‐ + named site. This option accepts only site names that are eligi- + ble for the "fast flush" service, and is implemented by execut- ing the postqueue(1) command. See flush(8) for more information about the "fast flush" service. @@ -262,12 +262,12 @@ SENDMAIL(1) SENDMAIL(1) -XVxy (Postfix 2.2 and earlier: -Vxy) As -XV, but uses x and y as the VERP delimiter characters, - instead of the characters specified with the default_verp_delim‐‐ - iters configuration parameter. + instead of the characters specified with the default_verp_delim- + iters configuration parameter. - -v Send an email report of the first delivery attempt (Postfix ver‐ - sions 2.1 and later). Mail delivery always happens in the back‐ - ground. When multiple -v options are given, enable verbose log‐ + -v Send an email report of the first delivery attempt (Postfix ver- + sions 2.1 and later). Mail delivery always happens in the back- + ground. When multiple -v options are given, enable verbose log- ging for debugging purposes. -X log_file (ignored) @@ -297,9 +297,9 @@ SENDMAIL(1) SENDMAIL(1) no From: message header. See also the -F option above. CONFIGURATION PARAMETERS - The following main.cf parameters are especially relevant to this pro‐ - gram. The text below provides only a parameter summary. See post‐‐ - conf(5) for more details including examples. + The following main.cf parameters are especially relevant to this pro- + gram. The text below provides only a parameter summary. See post- + conf(5) for more details including examples. COMPATIBILITY CONTROLS Available with Postfix 2.9 and later: @@ -335,8 +335,8 @@ SENDMAIL(1) SENDMAIL(1) List of users who are authorized to view the queue. authorized_submit_users (static:anyone) - List of users who are authorized to submit mail with the send‐‐ - mail(1) command (and with the privileged postdrop(1) helper com‐ + List of users who are authorized to submit mail with the send- + mail(1) command (and with the privileged postdrop(1) helper com- mand). RESOURCE AND RATE CONTROLS @@ -363,7 +363,7 @@ SENDMAIL(1) SENDMAIL(1) the Postfix "fast flush" service. fast_flush_domains ($relay_domains) - Optional list of destinations that are eligible for per-destina‐ + Optional list of destinations that are eligible for per-destina- tion logfiles with mail that is queued to those destinations. VERP CONTROLS @@ -386,7 +386,7 @@ SENDMAIL(1) SENDMAIL(1) The location of all postfix administrative commands. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_directory (see 'postconf -d' output) @@ -417,7 +417,7 @@ SENDMAIL(1) SENDMAIL(1) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". FILES diff --git a/postfix/html/newaliases.1.html b/postfix/html/newaliases.1.html index bd2ea89bd..5a981c838 100644 --- a/postfix/html/newaliases.1.html +++ b/postfix/html/newaliases.1.html @@ -19,7 +19,7 @@ SENDMAIL(1) SENDMAIL(1) sendmail -I DESCRIPTION - The Postfix sendmail(1) command implements the Postfix to Sendmail com‐ + The Postfix sendmail(1) command implements the Postfix to Sendmail com- patibility interface. For the sake of compatibility with existing applications, some Sendmail command-line options are recognized but silently ignored. @@ -29,7 +29,7 @@ SENDMAIL(1) SENDMAIL(1) arranges for delivery. Postfix sendmail(1) relies on the postdrop(1) command to create a queue file in the maildrop directory. - Specific command aliases are provided for other common modes of opera‐ + Specific command aliases are provided for other common modes of opera- tion: mailq List the mail queue. Each entry shows the queue file ID, message @@ -41,7 +41,7 @@ SENDMAIL(1) SENDMAIL(1) * The message is in the active queue, i.e. the message is selected for delivery. - ! The message is in the hold queue, i.e. no further deliv‐ + ! The message is in the hold queue, i.e. no further deliv- ery attempt will be made until the mail is taken off hold. @@ -51,7 +51,7 @@ SENDMAIL(1) SENDMAIL(1) newaliases Initialize the alias database. If no input file is specified (with the -oA option, see below), the program processes the - file(s) specified with the alias_database configuration parame‐ + file(s) specified with the alias_database configuration parame- ter. If no alias database type is specified, the program uses the type specified with the default_database_type configuration parameter. This mode of operation is implemented by running the @@ -87,7 +87,7 @@ SENDMAIL(1) SENDMAIL(1) -bi Initialize alias database. See the newaliases command above. -bl Go into daemon mode. To accept only local connections as with - Sendmail´s -bl option, specify "inet_interfaces = loopback" in + Sendmail's -bl option, specify "inet_interfaces = loopback" in the Postfix main.cf configuration file. -bm Read mail from standard input and arrange for delivery. This is @@ -118,12 +118,12 @@ SENDMAIL(1) SENDMAIL(1) before 2.3. With all Postfix versions, you can specify a directory pathname - with the MAIL_CONFIG environment variable to override the loca‐ + with the MAIL_CONFIG environment variable to override the loca- tion of configuration files. -F full_name Set the sender full name. This overrides the NAME environment - variable, and is used only with messages that have no From: mes‐ + variable, and is used only with messages that have no From: mes- sage header. -f sender @@ -132,8 +132,8 @@ SENDMAIL(1) SENDMAIL(1) the Errors-To: message header overrides the error return address. - -G Gateway (relay) submission, as opposed to initial user submis‐ - sion. Either do not rewrite addresses at all, or update incom‐ + -G Gateway (relay) submission, as opposed to initial user submis- + sion. Either do not rewrite addresses at all, or update incom- plete addresses with the domain information specified with remote_header_rewrite_domain. @@ -145,7 +145,7 @@ SENDMAIL(1) SENDMAIL(1) -I Initialize alias database. See the newaliases command above. - -i When reading a message from standard input, don´t treat a line + -i When reading a message from standard input, don't treat a line with only a . character as the end of input. -L label (ignored) @@ -179,17 +179,17 @@ SENDMAIL(1) SENDMAIL(1) -o7 (ignored) -o8 (ignored) - To send 8-bit or binary content, use an appropriate MIME encap‐ + To send 8-bit or binary content, use an appropriate MIME encap- sulation and specify the appropriate -B command-line option. - -oi When reading a message from standard input, don´t treat a line + -oi When reading a message from standard input, don't treat a line with only a . character as the end of input. -om (ignored) The sender is never eliminated from alias etc. expansions. -o x value (ignored) - Set option x to value. Use the equivalent configuration parame‐ + Set option x to value. Use the equivalent configuration parame- ter in main.cf instead. -r sender @@ -209,25 +209,25 @@ SENDMAIL(1) SENDMAIL(1) This option is ignored before Postfix version 2.10. - -q Attempt to deliver all queued mail. This is implemented by exe‐ + -q Attempt to deliver all queued mail. This is implemented by exe- cuting the postqueue(1) command. Warning: flushing undeliverable mail frequently will result in poor delivery performance of all other mail. -qinterval (ignored) - The interval between queue runs. Use the queue_run_delay config‐ + The interval between queue runs. Use the queue_run_delay config- uration parameter instead. -qIqueueid Schedule immediate delivery of mail with the specified queue ID. - This option is implemented by executing the postqueue(1) com‐ + This option is implemented by executing the postqueue(1) com- mand, and is available with Postfix version 2.4 and later. -qRsite Schedule immediate delivery of all mail that is queued for the - named site. This option accepts only site names that are eligi‐ - ble for the "fast flush" service, and is implemented by execut‐ + named site. This option accepts only site names that are eligi- + ble for the "fast flush" service, and is implemented by execut- ing the postqueue(1) command. See flush(8) for more information about the "fast flush" service. @@ -262,12 +262,12 @@ SENDMAIL(1) SENDMAIL(1) -XVxy (Postfix 2.2 and earlier: -Vxy) As -XV, but uses x and y as the VERP delimiter characters, - instead of the characters specified with the default_verp_delim‐‐ - iters configuration parameter. + instead of the characters specified with the default_verp_delim- + iters configuration parameter. - -v Send an email report of the first delivery attempt (Postfix ver‐ - sions 2.1 and later). Mail delivery always happens in the back‐ - ground. When multiple -v options are given, enable verbose log‐ + -v Send an email report of the first delivery attempt (Postfix ver- + sions 2.1 and later). Mail delivery always happens in the back- + ground. When multiple -v options are given, enable verbose log- ging for debugging purposes. -X log_file (ignored) @@ -297,9 +297,9 @@ SENDMAIL(1) SENDMAIL(1) no From: message header. See also the -F option above. CONFIGURATION PARAMETERS - The following main.cf parameters are especially relevant to this pro‐ - gram. The text below provides only a parameter summary. See post‐‐ - conf(5) for more details including examples. + The following main.cf parameters are especially relevant to this pro- + gram. The text below provides only a parameter summary. See post- + conf(5) for more details including examples. COMPATIBILITY CONTROLS Available with Postfix 2.9 and later: @@ -335,8 +335,8 @@ SENDMAIL(1) SENDMAIL(1) List of users who are authorized to view the queue. authorized_submit_users (static:anyone) - List of users who are authorized to submit mail with the send‐‐ - mail(1) command (and with the privileged postdrop(1) helper com‐ + List of users who are authorized to submit mail with the send- + mail(1) command (and with the privileged postdrop(1) helper com- mand). RESOURCE AND RATE CONTROLS @@ -363,7 +363,7 @@ SENDMAIL(1) SENDMAIL(1) the Postfix "fast flush" service. fast_flush_domains ($relay_domains) - Optional list of destinations that are eligible for per-destina‐ + Optional list of destinations that are eligible for per-destina- tion logfiles with mail that is queued to those destinations. VERP CONTROLS @@ -386,7 +386,7 @@ SENDMAIL(1) SENDMAIL(1) The location of all postfix administrative commands. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_directory (see 'postconf -d' output) @@ -417,7 +417,7 @@ SENDMAIL(1) SENDMAIL(1) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". FILES diff --git a/postfix/html/oqmgr.8.html b/postfix/html/oqmgr.8.html index e41690037..4b68b34bd 100644 --- a/postfix/html/oqmgr.8.html +++ b/postfix/html/oqmgr.8.html @@ -14,11 +14,11 @@ OQMGR(8) OQMGR(8) DESCRIPTION The oqmgr(8) daemon awaits the arrival of incoming mail and arranges - for its delivery via Postfix delivery processes. The actual mail rout‐ - ing strategy is delegated to the trivial-rewrite(8) daemon. This pro‐ + for its delivery via Postfix delivery processes. The actual mail rout- + ing strategy is delegated to the trivial-rewrite(8) daemon. This pro- gram expects to be run from the master(8) process manager. - Mail addressed to the local double-bounce address is logged and dis‐ + Mail addressed to the local double-bounce address is logged and dis- carded. This stops potential loops caused by undeliverable bounce notifications. @@ -56,7 +56,7 @@ OQMGR(8) OQMGR(8) These files are maintained by the defer(8) daemon. trace Per-recipient status information as requested with the Postfix - "sendmail -v" or "sendmail -bv" command. These files are main‐ + "sendmail -v" or "sendmail -bv" command. These files are main- tained by the trace(8) daemon. The oqmgr(8) daemon is responsible for asking the bounce(8), defer(8) @@ -72,14 +72,14 @@ OQMGR(8) OQMGR(8) heavy load. fairness - When the active queue has room, the queue manager takes one mes‐ + When the active queue has room, the queue manager takes one mes- sage from the incoming queue and one from the deferred queue. This prevents a large mail backlog from blocking the delivery of new mail. slow start This strategy eliminates "thundering herd" problems by slowly - adjusting the number of parallel deliveries to the same destina‐ + adjusting the number of parallel deliveries to the same destina- tion. round robin @@ -89,17 +89,17 @@ OQMGR(8) OQMGR(8) exponential backoff Mail that cannot be delivered upon the first attempt is - deferred. The time interval between delivery attempts is dou‐ + deferred. The time interval between delivery attempts is dou- bled after each attempt. destination status cache - The queue manager avoids unnecessary delivery attempts by main‐ - taining a short-term, in-memory list of unreachable destina‐ + The queue manager avoids unnecessary delivery attempts by main- + taining a short-term, in-memory list of unreachable destina- tions. TRIGGERS On an idle system, the queue manager waits for the arrival of trigger - events, or it waits for a timer to go off. A trigger is a one-byte mes‐ + events, or it waits for a timer to go off. A trigger is a one-byte mes- sage. Depending on the message received, the queue manager performs one of the following actions (the message is followed by the symbolic constant used internally by the software): @@ -137,28 +137,28 @@ OQMGR(8) OQMGR(8) RFC 3464 (Delivery status notifications) SECURITY - The oqmgr(8) daemon is not security sensitive. It reads single-charac‐ + The oqmgr(8) daemon is not security sensitive. It reads single-charac- ter messages from untrusted local users, and thus may be susceptible to denial of service attacks. The oqmgr(8) daemon does not talk to the outside world, and it can be run at fixed low privilege in a chrooted environment. DIAGNOSTICS - Problems and transactions are logged to the syslog(8) daemon. Cor‐ - rupted message files are saved to the corrupt queue for further inspec‐ + Problems and transactions are logged to the syslog(8) daemon. Cor- + rupted message files are saved to the corrupt queue for further inspec- tion. - Depending on the setting of the notify_classes parameter, the postmas‐ + Depending on the setting of the notify_classes parameter, the postmas- ter is notified of bounces and of other trouble. BUGS - A single queue manager process has to compete for disk access with mul‐ + A single queue manager process has to compete for disk access with mul- tiple front-end processes such as cleanup(8). A sudden burst of inbound mail can negatively impact outbound delivery rates. CONFIGURATION PARAMETERS Changes to main.cf are not picked up automatically, as oqmgr(8) is a - persistent process. Use the command "postfix reload" after a configura‐ + persistent process. Use the command "postfix reload" after a configura- tion change. The text below provides only a parameter summary. See postconf(5) for @@ -207,15 +207,15 @@ OQMGR(8) OQMGR(8) The default maximal number of parallel deliveries to the same destination. - transport_destination_concurrency_limit ($default_destination_concur‐‐ - rency_limit) + transport_destination_concurrency_limit ($default_destination_concur- + rency_limit) Idem, for delivery via the named message transport. Available in Postfix version 2.5 and later: - transport_initial_destination_concurrency ($initial_destination_concur‐‐ - rency) - Initial concurrency for delivery via the named message trans‐ + transport_initial_destination_concurrency ($initial_destination_concur- + rency) + Initial concurrency for delivery via the named message trans- port. default_destination_concurrency_failed_cohort_limit (1) @@ -223,30 +223,30 @@ OQMGR(8) OQMGR(8) failure before a specific destination is considered unavailable (and further delivery is suspended). - transport_destination_concurrency_failed_cohort_limit ($default_desti‐‐ - nation_concurrency_failed_cohort_limit) + transport_destination_concurrency_failed_cohort_limit ($default_desti- + nation_concurrency_failed_cohort_limit) Idem, for delivery via the named message transport. default_destination_concurrency_negative_feedback (1) The per-destination amount of delivery concurrency negative - feedback, after a delivery completes with a connection or hand‐ + feedback, after a delivery completes with a connection or hand- shake failure. - transport_destination_concurrency_negative_feedback ($default_destina‐‐ - tion_concurrency_negative_feedback) + transport_destination_concurrency_negative_feedback ($default_destina- + tion_concurrency_negative_feedback) Idem, for delivery via the named message transport. default_destination_concurrency_positive_feedback (1) The per-destination amount of delivery concurrency positive - feedback, after a delivery completes without connection or hand‐ + feedback, after a delivery completes without connection or hand- shake failure. - transport_destination_concurrency_positive_feedback ($default_destina‐‐ - tion_concurrency_positive_feedback) + transport_destination_concurrency_positive_feedback ($default_destina- + tion_concurrency_positive_feedback) Idem, for delivery via the named message transport. destination_concurrency_feedback_debug (no) - Make the queue manager's feedback algorithm verbose for perfor‐ + Make the queue manager's feedback algorithm verbose for perfor- mance analysis purposes. RECIPIENT SCHEDULING CONTROLS @@ -266,15 +266,15 @@ OQMGR(8) OQMGR(8) maximal_queue_lifetime (5d) Consider a message as undeliverable, when delivery fails with a - temporary error, and the time in the queue has reached the maxi‐ - mal_queue_lifetime limit. + temporary error, and the time in the queue has reached the maxi- + mal_queue_lifetime limit. queue_run_delay (300s) The time between deferred queue scans by the queue manager; prior to Postfix 2.4 the default value was 1000s. transport_retry_time (60s) - The time between attempts by the Postfix queue manager to con‐ + The time between attempts by the Postfix queue manager to con- tact a malfunctioning message delivery transport. Available in Postfix version 2.1 and later: @@ -289,7 +289,7 @@ OQMGR(8) OQMGR(8) default_destination_rate_delay (0s) The default amount of delay that is inserted between individual deliveries to the same destination; the resulting behavior - depends on the value of the corresponding per-destination recip‐ + depends on the value of the corresponding per-destination recip- ient limit. transport_destination_rate_delay $default_destination_rate_delay @@ -301,12 +301,12 @@ OQMGR(8) OQMGR(8) a request before it is terminated by a built-in watchdog timer. qmgr_ipc_timeout (60s) - The time limit for the queue manager to send or receive informa‐ + The time limit for the queue manager to send or receive informa- tion over an internal communication channel. MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. defer_transports (empty) @@ -314,11 +314,11 @@ OQMGR(8) OQMGR(8) mail unless someone issues "sendmail -q" or equivalent. delay_logging_resolution_limit (2) - The maximal number of digits after the decimal point when log‐ + The maximal number of digits after the decimal point when log- ging sub-second delay values. helpful_warnings (yes) - Log warnings about problematic configuration settings, and pro‐ + Log warnings about problematic configuration settings, and pro- vide helpful suggestions. process_id (read-only) @@ -335,7 +335,7 @@ OQMGR(8) OQMGR(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". Available in Postfix version 2.12 and later: diff --git a/postfix/html/pcre_table.5.html b/postfix/html/pcre_table.5.html index 3689ff2e5..3ee7772a3 100644 --- a/postfix/html/pcre_table.5.html +++ b/postfix/html/pcre_table.5.html @@ -14,6 +14,10 @@ PCRE_TABLE(5) PCRE_TABLE(5) postmap -q - pcre:/etc/postfix/filename <inputfile + postmap -hmq - pcre:/etc/postfix/filename <inputfile + + postmap -bmq - pcre:/etc/postfix/filename <inputfile + DESCRIPTION The Postfix mail system uses optional tables for address rewriting, mail routing, or access control. These tables are usually in dbm or db @@ -28,7 +32,9 @@ PCRE_TABLE(5) PCRE_TABLE(5) use the "postconf -m" command. To test lookup tables, use the "postmap -q" command as described in the - SYNOPSIS above. + SYNOPSIS above. Use "postmap -hmq - <file" for header_checks(5) pat- + terns, and "postmap -bmq - <file" for body_checks(5) (Postfix 2.6 and + later). COMPATIBILITY With Postfix version 2.2 and earlier specify "postmap -fq" to query a diff --git a/postfix/html/pickup.8.html b/postfix/html/pickup.8.html index 46c492e97..343fcc3b9 100644 --- a/postfix/html/pickup.8.html +++ b/postfix/html/pickup.8.html @@ -52,12 +52,12 @@ PICKUP(8) PICKUP(8) specified transport:destination. receive_override_options (empty) - Enable or disable recipient validation, built-in content filter‐ + Enable or disable recipient validation, built-in content filter- ing, or address mapping. MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. ipc_timeout (3600s) @@ -90,7 +90,7 @@ PICKUP(8) PICKUP(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". SEE ALSO diff --git a/postfix/html/postconf.1.html b/postfix/html/postconf.1.html index f31254009..b07ef86bb 100644 --- a/postfix/html/postconf.1.html +++ b/postfix/html/postconf.1.html @@ -55,16 +55,16 @@ POSTCONF(1) POSTCONF(1) postconf -a|-A|-l|-m [-v] [-c config_dir] DESCRIPTION - By default, the postconf(1) command displays the values of main.cf con‐ + By default, the postconf(1) command displays the values of main.cf con- figuration parameters, and warns about possible mis-typed parameter - names (Postfix 2.9 and later). It can also change main.cf configura‐ + names (Postfix 2.9 and later). It can also change main.cf configura- tion parameter values, or display other configuration information about the Postfix mail system. Options: -a List the available SASL server plug-in types. The SASL plug-in - type is selected with the smtpd_sasl_type configuration parame‐ + type is selected with the smtpd_sasl_type configuration parame- ter by specifying one of the names listed below. cyrus This server plug-in is available when Postfix is built @@ -78,7 +78,7 @@ POSTCONF(1) POSTCONF(1) This feature is available with Postfix 2.3 and later. -A List the available SASL client plug-in types. The SASL plug-in - type is selected with the smtp_sasl_type or lmtp_sasl_type con‐ + type is selected with the smtp_sasl_type or lmtp_sasl_type con- figuration parameters by specifying one of the names listed below. @@ -88,8 +88,8 @@ POSTCONF(1) POSTCONF(1) This feature is available with Postfix 2.3 and later. -b [template_file] - Display the message text that appears at the beginning of deliv‐ - ery status notification (DSN) messages, replacing $name expres‐ + Display the message text that appears at the beginning of deliv- + ery status notification (DSN) messages, replacing $name expres- sions with actual values as described in bounce(5). To override the built-in templates, specify a template file name @@ -125,29 +125,29 @@ POSTCONF(1) POSTCONF(1) This feature is available with Postfix 2.9 and later. - -d Print main.cf default parameter settings instead of actual set‐ + -d Print main.cf default parameter settings instead of actual set- tings. Specify -df to fold long lines for human readability (Postfix 2.9 and later). - -e Edit the main.cf configuration file, and update parameter set‐ + -e Edit the main.cf configuration file, and update parameter set- tings with the "name=value" pairs on the postconf(1) command line. With -M, edit the master.cf configuration file, and replace one - or more service entries with new values as specified with "ser‐ + or more service entries with new values as specified with "ser- vice/type=value" on the postconf(1) command line. With -F, edit the master.cf configuration file, and replace one - or more service fields with new values as specied with "ser‐ - vice/type/field=value" on the postconf(1) command line. Cur‐ - rently, the "command" field contains the command name and com‐ + or more service fields with new values as specied with "ser- + vice/type/field=value" on the postconf(1) command line. Cur- + rently, the "command" field contains the command name and com- mand arguments. this may change in the near future, so that the - "command" field contains only the command name, and a new "argu‐ + "command" field contains only the command name, and a new "argu- ments" pseudofield contains the command arguments. With -P, edit the master.cf configuration file, and add or - update one or more service parameter settings (-o parame‐ - ter=value settings) with new values as specied with "ser‐ + update one or more service parameter settings (-o parame- + ter=value settings) with new values as specied with "ser- vice/type/parameter=value" on the postconf(1) command line. In all cases the file is copied to a temporary file then renamed @@ -166,8 +166,8 @@ POSTCONF(1) POSTCONF(1) and all fields), formatted as one "service/type/field=value" per line. Specify -Ff to fold long lines. - Specify one or more "service/type/field" instances on the post‐‐ - conf(1) command line to limit the output to fields of interest. + Specify one or more "service/type/field" instances on the post- + conf(1) command line to limit the output to fields of interest. Trailing parameter name or service type fields that are omitted will be handled as "*" wildcard fields. @@ -176,7 +176,7 @@ POSTCONF(1) POSTCONF(1) -h Show parameter or attribute values without the "name = " label that normally precedes the value. - -l List the names of all supported mailbox locking methods. Post‐ + -l List the names of all supported mailbox locking methods. Post- fix supports the following methods: flock A kernel-based advisory locking method for local files @@ -188,21 +188,21 @@ POSTCONF(1) POSTCONF(1) dotlock An application-level locking method. An application locks - a file named filename by creating a file named file‐ + a file named filename by creating a file named file- name.lock. The application is expected to remove its own lock file, as well as stale lock files that were left behind after abnormal program termination. -m List the names of all supported lookup table types. In Postfix configuration files, lookup tables are specified as type:name, - where type is one of the types listed below. The table name syn‐ - tax depends on the lookup table type as described in the DATA‐ - BASE_README document. + where type is one of the types listed below. The table name syn- + tax depends on the lookup table type as described in the DATA- + BASE_README document. btree A sorted, balanced tree structure. Available on systems with support for Berkeley DB databases. - cdb A read-optimized structure with no support for incremen‐ + cdb A read-optimized structure with no support for incremen- tal updates. Available on systems with support for CDB databases. @@ -210,19 +210,19 @@ POSTCONF(1) POSTCONF(1) Domain Routing (CIDR) patterns. This is described in cidr_table(5). - dbm An indexed file type based on hashing. Available on sys‐ + dbm An indexed file type based on hashing. Available on sys- tems with support for DBM databases. environ The UNIX process environment array. The lookup key is the - variable name. Originally implemented for testing, some‐ + variable name. Originally implemented for testing, some- one may find this useful someday. - fail A table that reliably fails all requests. The lookup ta‐ - ble name is used for logging. This table exists to sim‐ + fail A table that reliably fails all requests. The lookup ta- + ble name is used for logging. This table exists to sim- plify Postfix error tests. - hash An indexed file type based on hashing. Available on sys‐ + hash An indexed file type based on hashing. Available on sys- tems with support for Berkeley DB databases. internal @@ -230,23 +230,23 @@ POSTCONF(1) POSTCONF(1) when a process terminates. lmdb OpenLDAP LMDB database (a memory-mapped, persistent - file). Available on systems with support for LMDB data‐ + file). Available on systems with support for LMDB data- bases. This is described in lmdb_table(5). ldap (read-only) LDAP database client. This is described in ldap_table(5). memcache - Memcache database client. This is described in mem‐‐ - cache_table(5). + Memcache database client. This is described in mem- + cache_table(5). mysql (read-only) MySQL database client. Available on systems with support - for MySQL databases. This is described in mysql_ta‐‐ - ble(5). + for MySQL databases. This is described in mysql_ta- + ble(5). pcre (read-only) - A lookup table based on Perl Compatible Regular Expres‐ + A lookup table based on Perl Compatible Regular Expres- sions. The file format is described in pcre_table(5). pgsql (read-only) @@ -268,7 +268,7 @@ POSTCONF(1) POSTCONF(1) databases. The table name syntax is type:name. randmap (read-only) - An in-memory table that performs random selection. Exam‐ + An in-memory table that performs random selection. Exam- ple: "randmap:{result_1, ..., result_n}". Each table query returns a random choice from the specified results. The first and last characters of the "randmap:" table @@ -279,12 +279,12 @@ POSTCONF(1) POSTCONF(1) A lookup table based on regular expressions. The file format is described in regexp_table(5). - sdbm An indexed file type based on hashing. Available on sys‐ + sdbm An indexed file type based on hashing. Available on sys- tems with support for SDBM databases. socketmap (read-only) Sendmail-style socketmap client. The table name is - inet:host:port:name for a TCP/IP server, or unix:path‐ + inet:host:port:name for a TCP/IP server, or unix:path- name:name for a UNIX-domain server. This is described in socketmap_table(5). @@ -293,7 +293,7 @@ POSTCONF(1) POSTCONF(1) static (read-only) A table that always returns its name as lookup result. - For example, static:foobar always returns the string foo‐‐ + For example, static:foobar always returns the string foo- bar as lookup result. tcp (read-only) @@ -329,7 +329,7 @@ POSTCONF(1) POSTCONF(1) -M Show master.cf file contents instead of main.cf file contents. Specify -Mf to fold long lines for human readability. - Specify zero or more arguments, each with a service-name or ser‐ + Specify zero or more arguments, each with a service-name or ser- vice-name/service-type pair, where service-name is the first field of a master.cf entry and service-type is one of (inet, unix, fifo, or pass). @@ -358,8 +358,8 @@ POSTCONF(1) POSTCONF(1) This feature is available with Postfix 2.11 and later. - -P Show master.cf service parameter settings (by default all ser‐ - vices and all parameters). formatted as one "ser‐ + -P Show master.cf service parameter settings (by default all ser- + vices and all parameters). formatted as one "ser- vice/type/parameter=value" per line. Specify -Pf to fold long lines. @@ -394,7 +394,7 @@ POSTCONF(1) POSTCONF(1) This feature is available with Postfix 2.10 and later. -X Edit the main.cf configuration file, and remove the parameters - named on the postconf(1) command line. Specify a list of param‐ + named on the postconf(1) command line. Specify a list of param- eter names, not "name=value" pairs. With -M, edit the master.cf configuration file, and remove one @@ -403,22 +403,22 @@ POSTCONF(1) POSTCONF(1) With -P, edit the master.cf configuration file, and remove one or more service parameter settings (-o parameter=value settings) - as specied with "service/type/parameter" on the postconf(1) com‐ + as specied with "service/type/parameter" on the postconf(1) com- mand line. In all cases the file is copied to a temporary file then renamed into place. Specify quotes to protect special characters on the postconf(1) command line. - There is no postconf(1) command to perform the reverse opera‐ + There is no postconf(1) command to perform the reverse opera- tion. This feature is available with Postfix 2.10 and later. Support for -M and -P was added with Postfix 2.11. - -# Edit the main.cf configuration file, and comment out the parame‐ - ters named on the postconf(1) command line, so that those param‐ - eters revert to their default values. Specify a list of parame‐ + -# Edit the main.cf configuration file, and comment out the parame- + ters named on the postconf(1) command line, so that those param- + eters revert to their default values. Specify a list of parame- ter names, not "name=value" pairs. With -M, edit the master.cf configuration file, and comment out @@ -429,7 +429,7 @@ POSTCONF(1) POSTCONF(1) into place. Specify quotes to protect special characters on the postconf(1) command line. - There is no postconf(1) command to perform the reverse opera‐ + There is no postconf(1) command to perform the reverse opera- tion. This feature is available with Postfix 2.6 and later. Support @@ -443,14 +443,14 @@ POSTCONF(1) POSTCONF(1) Directory with Postfix configuration files. CONFIGURATION PARAMETERS - The following main.cf parameters are especially relevant to this pro‐ + The following main.cf parameters are especially relevant to this pro- gram. The text below provides only a parameter summary. See postconf(5) for more details including examples. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. bounce_template_file (empty) diff --git a/postfix/html/postdrop.1.html b/postfix/html/postdrop.1.html index 6a142c74d..489cf22e9 100644 --- a/postfix/html/postdrop.1.html +++ b/postfix/html/postdrop.1.html @@ -48,15 +48,15 @@ POSTDROP(1) POSTDROP(1) of set-group ID privileges, a non-standard directory is allowed only if: - · The name is listed in the standard main.cf file with the + o The name is listed in the standard main.cf file with the alternate_config_directories configuration parameter. - · The command is invoked by the super-user. + o The command is invoked by the super-user. CONFIGURATION PARAMETERS - The following main.cf parameters are especially relevant to this pro‐ - gram. The text below provides only a parameter summary. See post‐‐ - conf(5) for more details including examples. + The following main.cf parameters are especially relevant to this pro- + gram. The text below provides only a parameter summary. See post- + conf(5) for more details including examples. alternate_config_directories (empty) A list of non-default Postfix configuration directories that may @@ -64,7 +64,7 @@ POSTDROP(1) POSTDROP(1) via the MAIL_CONFIG environment parameter. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. import_environment (see 'postconf -d' output) @@ -79,7 +79,7 @@ POSTDROP(1) POSTDROP(1) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". trigger_timeout (10s) @@ -89,8 +89,8 @@ POSTDROP(1) POSTDROP(1) Available in Postfix version 2.2 and later: authorized_submit_users (static:anyone) - List of users who are authorized to submit mail with the send‐‐ - mail(1) command (and with the privileged postdrop(1) helper com‐ + List of users who are authorized to submit mail with the send- + mail(1) command (and with the privileged postdrop(1) helper com- mand). FILES diff --git a/postfix/html/postscreen.8.html b/postfix/html/postscreen.8.html index 8abb6250f..13460cb49 100644 --- a/postfix/html/postscreen.8.html +++ b/postfix/html/postscreen.8.html @@ -15,7 +15,7 @@ POSTSCREEN(8) POSTSCREEN(8) DESCRIPTION The Postfix postscreen(8) server provides additional protection against mail server overload. One postscreen(8) process handles multiple - inbound SMTP connections, and decides which clients may talk to a Post‐ + inbound SMTP connections, and decides which clients may talk to a Post- fix SMTP server process. By keeping spambots away, postscreen(8) leaves more SMTP server processes available for legitimate clients, and delays the onset of server overload conditions. @@ -23,9 +23,9 @@ POSTSCREEN(8) POSTSCREEN(8) This program should not be used on SMTP ports that receive mail from end-user clients (MUAs). In a typical deployment, postscreen(8) handles the MX service on TCP port 25, while MUA clients submit mail via the - submission service on TCP port 587 which requires client authentica‐ + submission service on TCP port 587 which requires client authentica- tion. Alternatively, a site could set up a dedicated, non-postscreen, - "port 25" server that provides submission service and client authenti‐ + "port 25" server that provides submission service and client authenti- cation, but no MX service. postscreen(8) maintains a temporary whitelist for clients that have @@ -34,9 +34,9 @@ POSTSCREEN(8) POSTSCREEN(8) Postfix SMTP server process. This minimizes the overhead for legitimate mail. - By default, postscreen(8) logs statistics and hands off every connec‐ + By default, postscreen(8) logs statistics and hands off every connec- tion to a Postfix SMTP server process, while excluding clients in - mynetworks from all tests (primarily, to avoid problems with non-stan‐ + mynetworks from all tests (primarily, to avoid problems with non-stan- dard SMTP implementations in network appliances). This mode is useful for non-destructive testing. @@ -46,7 +46,7 @@ POSTSCREEN(8) POSTSCREEN(8) information. postscreen(8) is not an SMTP proxy; this is intentional. The purpose - is to keep spambots away from Postfix SMTP server processes, while min‐ + is to keep spambots away from Postfix SMTP server processes, while min- imizing overhead for legitimate traffic. SECURITY @@ -85,7 +85,7 @@ POSTSCREEN(8) POSTSCREEN(8) the "live" connection to a Postfix SMTP server process in the middle of a session. Instead, postscreen(8) defers attempts to deliver mail with a 4XX status, and waits for the client to disconnect. When the client - connects again, postscreen(8) will allow the client to talk to a Post‐ + connects again, postscreen(8) will allow the client to talk to a Post- fix SMTP server process (provided that the whitelist status has not expired). postscreen(8) mitigates the impact of this limitation by giving the "after 220 server greeting" tests a long expiration time. @@ -98,7 +98,7 @@ POSTSCREEN(8) POSTSCREEN(8) The text below provides only a parameter summary. See postconf(5) for more details including examples. - NOTE: Some postscreen(8) parameters implement stress-dependent behav‐ + NOTE: Some postscreen(8) parameters implement stress-dependent behav- ior. This is supported only when the default parameter value is stress-dependent (that is, it looks like ${stress?{X}:{Y}}, or it is the $name of an smtpd parameter with a stress-dependent default). @@ -109,8 +109,8 @@ POSTSCREEN(8) POSTSCREEN(8) postscreen_command_filter ($smtpd_command_filter) A mechanism to transform commands from remote SMTP clients. - postscreen_discard_ehlo_keyword_address_maps ($smtpd_discard_ehlo_key‐‐ - word_address_maps) + postscreen_discard_ehlo_keyword_address_maps ($smtpd_discard_ehlo_key- + word_address_maps) Lookup tables, indexed by the remote SMTP client address, with case insensitive lists of EHLO keywords (pipelining, starttls, auth, etc.) that the postscreen(8) server will not send in the @@ -155,7 +155,7 @@ POSTSCREEN(8) POSTSCREEN(8) postscreen_blacklist_action (ignore) The action that postscreen(8) takes when a remote SMTP client is - permanently blacklisted with the postscreen_access_list parame‐ + permanently blacklisted with the postscreen_access_list parame- ter. MAIL EXCHANGER POLICY TESTS @@ -168,12 +168,12 @@ POSTSCREEN(8) POSTSCREEN(8) postscreen_whitelist_interfaces (static:all) A list of local postscreen(8) server IP addresses where a non- - whitelisted remote SMTP client can obtain postscreen(8)'s tempo‐ + whitelisted remote SMTP client can obtain postscreen(8)'s tempo- rary whitelist status. BEFORE 220 GREETING TESTS These tests are executed before the remote SMTP client receives the - "220 servername" greeting. If no tests remain after the successful com‐ + "220 servername" greeting. If no tests remain after the successful com- pletion of this phase, the client will be handed off immediately to a Postfix SMTP server process. @@ -218,7 +218,7 @@ POSTSCREEN(8) POSTSCREEN(8) up to 6 seconds otherwise). smtpd_service_name (smtpd) - The internal service that postscreen(8) hands off allowed con‐ + The internal service that postscreen(8) hands off allowed con- nections to. Available in Postfix version 2.11 and later: @@ -253,24 +253,24 @@ POSTSCREEN(8) POSTSCREEN(8) Disable the SMTP VRFY command in the postscreen(8) daemon. postscreen_forbidden_commands ($smtpd_forbidden_commands) - List of commands that the postscreen(8) server considers in vio‐ + List of commands that the postscreen(8) server considers in vio- lation of the SMTP protocol. postscreen_helo_required ($smtpd_helo_required) - Require that a remote SMTP client sends HELO or EHLO before com‐ + Require that a remote SMTP client sends HELO or EHLO before com- mencing a MAIL transaction. postscreen_non_smtp_command_action (drop) The action that postscreen(8) takes when a remote SMTP client - sends non-SMTP commands as specified with the postscreen_forbid‐ - den_commands parameter. + sends non-SMTP commands as specified with the postscreen_forbid- + den_commands parameter. postscreen_non_smtp_command_enable (no) Enable "non-SMTP command" tests in the postscreen(8) server. postscreen_pipelining_action (enforce) The action that postscreen(8) takes when a remote SMTP client - sends multiple commands instead of sending one command and wait‐ + sends multiple commands instead of sending one command and wait- ing for the server to respond. postscreen_pipelining_enable (no) @@ -285,7 +285,7 @@ POSTSCREEN(8) POSTSCREEN(8) Persistent storage for the postscreen(8) server decisions. postscreen_cache_retention_time (7d) - The amount of time that postscreen(8) will cache an expired tem‐ + The amount of time that postscreen(8) will cache an expired tem- porary whitelist entry before it is removed. postscreen_bare_newline_ttl (30d) @@ -313,8 +313,8 @@ POSTSCREEN(8) POSTSCREEN(8) Upon input, long lines are chopped up into pieces of at most this length; upon delivery, long lines are reconstructed. - postscreen_client_connection_count_limit ($smtpd_client_connec‐‐ - tion_count_limit) + postscreen_client_connection_count_limit ($smtpd_client_connec- + tion_count_limit) How many simultaneous connections any remote SMTP client is allowed to have with the postscreen(8) daemon. @@ -343,7 +343,7 @@ POSTSCREEN(8) POSTSCREEN(8) STARTTLS CONTROLS postscreen_tls_security_level ($smtpd_tls_security_level) The SMTP TLS security level for the postscreen(8) server; when a - non-empty value is specified, this overrides the obsolete param‐ + non-empty value is specified, this overrides the obsolete param- eters postscreen_use_tls and postscreen_enforce_tls. tlsproxy_service_name (tlsproxy) @@ -363,11 +363,11 @@ POSTSCREEN(8) POSTSCREEN(8) MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. delay_logging_resolution_limit (2) - The maximal number of digits after the decimal point when log‐ + The maximal number of digits after the decimal point when log- ging sub-second delay values. command_directory (see 'postconf -d' output) @@ -388,7 +388,7 @@ POSTSCREEN(8) POSTSCREEN(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". SEE ALSO diff --git a/postfix/html/proxymap.8.html b/postfix/html/proxymap.8.html index ceb127769..ebe62e993 100644 --- a/postfix/html/proxymap.8.html +++ b/postfix/html/proxymap.8.html @@ -14,11 +14,11 @@ PROXYMAP(8) PROXYMAP(8) DESCRIPTION The proxymap(8) server provides read-only or read-write table lookup - service to Postfix processes. These services are implemented with dis‐ + service to Postfix processes. These services are implemented with dis- tinct service names: proxymap and proxywrite, respectively. The purpose of these services is: - · To overcome chroot restrictions. For example, a chrooted SMTP + o To overcome chroot restrictions. For example, a chrooted SMTP server needs access to the system passwd file in order to reject mail for non-existent local addresses, but it is not practical to maintain a copy of the passwd file in the chroot jail. The @@ -27,7 +27,7 @@ PROXYMAP(8) PROXYMAP(8) local_recipient_maps = proxy:unix:passwd.byname $alias_maps - · To consolidate the number of open lookup tables by sharing one + o To consolidate the number of open lookup tables by sharing one open table among multiple processes. For example, making mysql connections from every Postfix daemon process results in "too many connections" errors. The solution: @@ -38,7 +38,7 @@ PROXYMAP(8) PROXYMAP(8) The total number of connections is limited by the number of proxymap server processes. - · To provide single-updater functionality for lookup tables that + o To provide single-updater functionality for lookup tables that do not reliably support multiple writers (i.e. all file-based tables). @@ -47,7 +47,7 @@ PROXYMAP(8) PROXYMAP(8) open maptype:mapname flags Open the table with type maptype and name mapname, as controlled by flags. The reply includes the maptype dependent flags (to - distinguish a fixed string table from a regular expression ta‐ + distinguish a fixed string table from a regular expression ta- ble). lookup maptype:mapname flags key @@ -101,7 +101,7 @@ PROXYMAP(8) PROXYMAP(8) The proxymap(8) server opens only tables that are approved via the proxy_read_maps or proxy_write_maps configuration parameters, does not talk to users, and can run at fixed low privilege, chrooted or not. - However, running the proxymap server chrooted severely limits usabil‐ + However, running the proxymap server chrooted severely limits usabil- ity, because it can open only chrooted tables. The proxymap(8) server is not a trusted daemon process, and must not be @@ -113,7 +113,7 @@ PROXYMAP(8) PROXYMAP(8) the table directly. This allows the same main.cf setting to be used by sensitive and non-sensitive processes. - Postfix-writable data files should be stored under a dedicated direc‐ + Postfix-writable data files should be stored under a dedicated direc- tory that is writable only by the Postfix mail system, such as the Postfix-owned data_directory. @@ -131,7 +131,7 @@ PROXYMAP(8) PROXYMAP(8) The proxymap(8) read-write service does not explicitly close lookup tables (even if it did, this could not be relied on, because the - process may be terminated between table updates). The read-write ser‐ + process may be terminated between table updates). The read-write ser- vice should therefore not be used with tables that leave persistent storage in an inconsistent state between updates (for example, CDB). Tables that support "sync on update" should be safe (for example, @@ -146,7 +146,7 @@ PROXYMAP(8) PROXYMAP(8) more details including examples. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. data_directory (see 'postconf -d' output) diff --git a/postfix/html/qmgr.8.html b/postfix/html/qmgr.8.html index 2ea1e164a..d28d7e504 100644 --- a/postfix/html/qmgr.8.html +++ b/postfix/html/qmgr.8.html @@ -18,7 +18,7 @@ QMGR(8) QMGR(8) strategy is delegated to the trivial-rewrite(8) daemon. This program expects to be run from the master(8) process manager. - Mail addressed to the local double-bounce address is logged and dis‐ + Mail addressed to the local double-bounce address is logged and dis- carded. This stops potential loops caused by undeliverable bounce notifications. @@ -56,7 +56,7 @@ QMGR(8) QMGR(8) These files are maintained by the defer(8) daemon. trace Per-recipient status information as requested with the Postfix - "sendmail -v" or "sendmail -bv" command. These files are main‐ + "sendmail -v" or "sendmail -bv" command. These files are main- tained by the trace(8) daemon. The qmgr(8) daemon is responsible for asking the bounce(8), defer(8) or @@ -72,14 +72,14 @@ QMGR(8) QMGR(8) heavy load. fairness - When the active queue has room, the queue manager takes one mes‐ + When the active queue has room, the queue manager takes one mes- sage from the incoming queue and one from the deferred queue. This prevents a large mail backlog from blocking the delivery of new mail. slow start This strategy eliminates "thundering herd" problems by slowly - adjusting the number of parallel deliveries to the same destina‐ + adjusting the number of parallel deliveries to the same destina- tion. round robin @@ -89,12 +89,12 @@ QMGR(8) QMGR(8) exponential backoff Mail that cannot be delivered upon the first attempt is - deferred. The time interval between delivery attempts is dou‐ + deferred. The time interval between delivery attempts is dou- bled after each attempt. destination status cache - The queue manager avoids unnecessary delivery attempts by main‐ - taining a short-term, in-memory list of unreachable destina‐ + The queue manager avoids unnecessary delivery attempts by main- + taining a short-term, in-memory list of unreachable destina- tions. preemptive message scheduling @@ -104,7 +104,7 @@ QMGR(8) QMGR(8) TRIGGERS On an idle system, the queue manager waits for the arrival of trigger - events, or it waits for a timer to go off. A trigger is a one-byte mes‐ + events, or it waits for a timer to go off. A trigger is a one-byte mes- sage. Depending on the message received, the queue manager performs one of the following actions (the message is followed by the symbolic constant used internally by the software): @@ -144,7 +144,7 @@ QMGR(8) QMGR(8) SECURITY The qmgr(8) daemon is not security sensitive. It reads single-character messages from untrusted local users, and thus may be susceptible to - denial of service attacks. The qmgr(8) daemon does not talk to the out‐ + denial of service attacks. The qmgr(8) daemon does not talk to the out- side world, and it can be run at fixed low privilege in a chrooted environment. @@ -152,16 +152,16 @@ QMGR(8) QMGR(8) Problems and transactions are logged to the syslog daemon. Corrupted message files are saved to the corrupt queue for further inspection. - Depending on the setting of the notify_classes parameter, the postmas‐ + Depending on the setting of the notify_classes parameter, the postmas- ter is notified of bounces and of other trouble. BUGS - A single queue manager process has to compete for disk access with mul‐ + A single queue manager process has to compete for disk access with mul- tiple front-end processes such as cleanup(8). A sudden burst of inbound mail can negatively impact outbound delivery rates. CONFIGURATION PARAMETERS - Changes to main.cf are not picked up automatically as qmgr(8) is a per‐ + Changes to main.cf are not picked up automatically as qmgr(8) is a per- sistent process. Use the "postfix reload" command after a configuration change. @@ -239,15 +239,15 @@ QMGR(8) QMGR(8) The default maximal number of parallel deliveries to the same destination. - transport_destination_concurrency_limit ($default_destination_concur‐‐ - rency_limit) + transport_destination_concurrency_limit ($default_destination_concur- + rency_limit) Idem, for delivery via the named message transport. Available in Postfix version 2.5 and later: - transport_initial_destination_concurrency ($initial_destination_concur‐‐ - rency) - Initial concurrency for delivery via the named message trans‐ + transport_initial_destination_concurrency ($initial_destination_concur- + rency) + Initial concurrency for delivery via the named message trans- port. default_destination_concurrency_failed_cohort_limit (1) @@ -255,38 +255,38 @@ QMGR(8) QMGR(8) failure before a specific destination is considered unavailable (and further delivery is suspended). - transport_destination_concurrency_failed_cohort_limit ($default_desti‐‐ - nation_concurrency_failed_cohort_limit) + transport_destination_concurrency_failed_cohort_limit ($default_desti- + nation_concurrency_failed_cohort_limit) Idem, for delivery via the named message transport. default_destination_concurrency_negative_feedback (1) The per-destination amount of delivery concurrency negative - feedback, after a delivery completes with a connection or hand‐ + feedback, after a delivery completes with a connection or hand- shake failure. - transport_destination_concurrency_negative_feedback ($default_destina‐‐ - tion_concurrency_negative_feedback) + transport_destination_concurrency_negative_feedback ($default_destina- + tion_concurrency_negative_feedback) Idem, for delivery via the named message transport. default_destination_concurrency_positive_feedback (1) The per-destination amount of delivery concurrency positive - feedback, after a delivery completes without connection or hand‐ + feedback, after a delivery completes without connection or hand- shake failure. - transport_destination_concurrency_positive_feedback ($default_destina‐‐ - tion_concurrency_positive_feedback) + transport_destination_concurrency_positive_feedback ($default_destina- + tion_concurrency_positive_feedback) Idem, for delivery via the named message transport. destination_concurrency_feedback_debug (no) - Make the queue manager's feedback algorithm verbose for perfor‐ + Make the queue manager's feedback algorithm verbose for perfor- mance analysis purposes. RECIPIENT SCHEDULING CONTROLS default_destination_recipient_limit (50) The default maximal number of recipients per message delivery. - transport_destination_recipient_limit ($default_destination_recipi‐‐ - ent_limit) + transport_destination_recipient_limit ($default_destination_recipi- + ent_limit) Idem, for delivery via the named message transport. MESSAGE SCHEDULING CONTROLS @@ -328,15 +328,15 @@ QMGR(8) QMGR(8) maximal_queue_lifetime (5d) Consider a message as undeliverable, when delivery fails with a - temporary error, and the time in the queue has reached the maxi‐ - mal_queue_lifetime limit. + temporary error, and the time in the queue has reached the maxi- + mal_queue_lifetime limit. queue_run_delay (300s) The time between deferred queue scans by the queue manager; prior to Postfix 2.4 the default value was 1000s. transport_retry_time (60s) - The time between attempts by the Postfix queue manager to con‐ + The time between attempts by the Postfix queue manager to con- tact a malfunctioning message delivery transport. Available in Postfix version 2.1 and later: @@ -351,7 +351,7 @@ QMGR(8) QMGR(8) default_destination_rate_delay (0s) The default amount of delay that is inserted between individual deliveries to the same destination; the resulting behavior - depends on the value of the corresponding per-destination recip‐ + depends on the value of the corresponding per-destination recip- ient limit. transport_destination_rate_delay $default_destination_rate_delay @@ -363,12 +363,12 @@ QMGR(8) QMGR(8) a request before it is terminated by a built-in watchdog timer. qmgr_ipc_timeout (60s) - The time limit for the queue manager to send or receive informa‐ + The time limit for the queue manager to send or receive informa- tion over an internal communication channel. MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. defer_transports (empty) @@ -376,11 +376,11 @@ QMGR(8) QMGR(8) mail unless someone issues "sendmail -q" or equivalent. delay_logging_resolution_limit (2) - The maximal number of digits after the decimal point when log‐ + The maximal number of digits after the decimal point when log- ging sub-second delay values. helpful_warnings (yes) - Log warnings about problematic configuration settings, and pro‐ + Log warnings about problematic configuration settings, and pro- vide helpful suggestions. process_id (read-only) @@ -397,7 +397,7 @@ QMGR(8) QMGR(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". Available in Postfix version 2.12 and later: diff --git a/postfix/html/qmqp-sink.1.html b/postfix/html/qmqp-sink.1.html index a72ead8ed..17077e496 100644 --- a/postfix/html/qmqp-sink.1.html +++ b/postfix/html/qmqp-sink.1.html @@ -16,13 +16,13 @@ QMQP-SINK(1) QMQP-SINK(1) DESCRIPTION qmqp-sink listens on the named host (or address) and port. It receives - messages from the network and throws them away. The purpose is to mea‐ + messages from the network and throws them away. The purpose is to mea- sure QMQP client performance, not protocol compliance. Connections can be accepted on IPv4 or IPv6 endpoints, or on UNIX-domain sockets. IPv4 and IPv6 are the default. This program is the complement of the qmqp- source(1) program. - Note: this is an unsupported test program. No attempt is made to main‐ + Note: this is an unsupported test program. No attempt is made to main- tain compatibility between successive versions. Arguments: @@ -36,7 +36,7 @@ QMQP-SINK(1) QMQP-SINK(1) -c Display a running counter that is updated whenever a delivery is completed. - -v Increase verbosity. Specify -v -v to see some of the QMQP con‐ + -v Increase verbosity. Specify -v -v to see some of the QMQP con- versation. -x time diff --git a/postfix/html/qmqpd.8.html b/postfix/html/qmqpd.8.html index 49167e99f..ce358b571 100644 --- a/postfix/html/qmqpd.8.html +++ b/postfix/html/qmqpd.8.html @@ -13,12 +13,12 @@ QMQPD(8) QMQPD(8) qmqpd [generic Postfix daemon options] DESCRIPTION - The Postfix QMQP server receives one message per connection. Each mes‐ + The Postfix QMQP server receives one message per connection. Each mes- sage is piped through the cleanup(8) daemon, and is placed into the incoming queue as one single queue file. The program expects to be run from the master(8) process manager. - The QMQP server implements one access policy: only explicitly autho‐ + The QMQP server implements one access policy: only explicitly autho- rized client hosts are allowed to use the service. SECURITY @@ -34,7 +34,7 @@ QMQPD(8) QMQPD(8) It is therefore not possible to reject individual recipients. The QMQP protocol requires the server to receive the entire message - before replying. If a message is malformed, or if any netstring compo‐ + before replying. If a message is malformed, or if any netstring compo- nent is longer than acceptable, Postfix replies immediately and closes the connection. It is left up to the client to handle the situation. @@ -52,14 +52,14 @@ QMQPD(8) QMQPD(8) specified transport:destination. receive_override_options (empty) - Enable or disable recipient validation, built-in content filter‐ + Enable or disable recipient validation, built-in content filter- ing, or address mapping. SMTPUTF8 CONTROLS Preliminary SMTPUTF8 support is introduced with Postfix 2.12. smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci‐ + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. RESOURCE AND RATE CONTROLS @@ -100,7 +100,7 @@ QMQPD(8) QMQPD(8) MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -137,7 +137,7 @@ QMQPD(8) QMQPD(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". verp_delimiter_filter (-=+) diff --git a/postfix/html/regexp_table.5.html b/postfix/html/regexp_table.5.html index 90a1d3af2..50cec3c63 100644 --- a/postfix/html/regexp_table.5.html +++ b/postfix/html/regexp_table.5.html @@ -28,7 +28,9 @@ REGEXP_TABLE(5) REGEXP_TABLE(5) use the "postconf -m" command. To test lookup tables, use the "postmap -q" command as described in the - SYNOPSIS above. + SYNOPSIS above. Use "postmap -hmq - <file" for header_checks(5) pat- + terns, and "postmap -bmq - <file" for body_checks(5) (Postfix 2.6 and + later). COMPATIBILITY With Postfix version 2.2 and earlier specify "postmap -fq" to query a diff --git a/postfix/html/sendmail.1.html b/postfix/html/sendmail.1.html index bd2ea89bd..5a981c838 100644 --- a/postfix/html/sendmail.1.html +++ b/postfix/html/sendmail.1.html @@ -19,7 +19,7 @@ SENDMAIL(1) SENDMAIL(1) sendmail -I DESCRIPTION - The Postfix sendmail(1) command implements the Postfix to Sendmail com‐ + The Postfix sendmail(1) command implements the Postfix to Sendmail com- patibility interface. For the sake of compatibility with existing applications, some Sendmail command-line options are recognized but silently ignored. @@ -29,7 +29,7 @@ SENDMAIL(1) SENDMAIL(1) arranges for delivery. Postfix sendmail(1) relies on the postdrop(1) command to create a queue file in the maildrop directory. - Specific command aliases are provided for other common modes of opera‐ + Specific command aliases are provided for other common modes of opera- tion: mailq List the mail queue. Each entry shows the queue file ID, message @@ -41,7 +41,7 @@ SENDMAIL(1) SENDMAIL(1) * The message is in the active queue, i.e. the message is selected for delivery. - ! The message is in the hold queue, i.e. no further deliv‐ + ! The message is in the hold queue, i.e. no further deliv- ery attempt will be made until the mail is taken off hold. @@ -51,7 +51,7 @@ SENDMAIL(1) SENDMAIL(1) newaliases Initialize the alias database. If no input file is specified (with the -oA option, see below), the program processes the - file(s) specified with the alias_database configuration parame‐ + file(s) specified with the alias_database configuration parame- ter. If no alias database type is specified, the program uses the type specified with the default_database_type configuration parameter. This mode of operation is implemented by running the @@ -87,7 +87,7 @@ SENDMAIL(1) SENDMAIL(1) -bi Initialize alias database. See the newaliases command above. -bl Go into daemon mode. To accept only local connections as with - Sendmail´s -bl option, specify "inet_interfaces = loopback" in + Sendmail's -bl option, specify "inet_interfaces = loopback" in the Postfix main.cf configuration file. -bm Read mail from standard input and arrange for delivery. This is @@ -118,12 +118,12 @@ SENDMAIL(1) SENDMAIL(1) before 2.3. With all Postfix versions, you can specify a directory pathname - with the MAIL_CONFIG environment variable to override the loca‐ + with the MAIL_CONFIG environment variable to override the loca- tion of configuration files. -F full_name Set the sender full name. This overrides the NAME environment - variable, and is used only with messages that have no From: mes‐ + variable, and is used only with messages that have no From: mes- sage header. -f sender @@ -132,8 +132,8 @@ SENDMAIL(1) SENDMAIL(1) the Errors-To: message header overrides the error return address. - -G Gateway (relay) submission, as opposed to initial user submis‐ - sion. Either do not rewrite addresses at all, or update incom‐ + -G Gateway (relay) submission, as opposed to initial user submis- + sion. Either do not rewrite addresses at all, or update incom- plete addresses with the domain information specified with remote_header_rewrite_domain. @@ -145,7 +145,7 @@ SENDMAIL(1) SENDMAIL(1) -I Initialize alias database. See the newaliases command above. - -i When reading a message from standard input, don´t treat a line + -i When reading a message from standard input, don't treat a line with only a . character as the end of input. -L label (ignored) @@ -179,17 +179,17 @@ SENDMAIL(1) SENDMAIL(1) -o7 (ignored) -o8 (ignored) - To send 8-bit or binary content, use an appropriate MIME encap‐ + To send 8-bit or binary content, use an appropriate MIME encap- sulation and specify the appropriate -B command-line option. - -oi When reading a message from standard input, don´t treat a line + -oi When reading a message from standard input, don't treat a line with only a . character as the end of input. -om (ignored) The sender is never eliminated from alias etc. expansions. -o x value (ignored) - Set option x to value. Use the equivalent configuration parame‐ + Set option x to value. Use the equivalent configuration parame- ter in main.cf instead. -r sender @@ -209,25 +209,25 @@ SENDMAIL(1) SENDMAIL(1) This option is ignored before Postfix version 2.10. - -q Attempt to deliver all queued mail. This is implemented by exe‐ + -q Attempt to deliver all queued mail. This is implemented by exe- cuting the postqueue(1) command. Warning: flushing undeliverable mail frequently will result in poor delivery performance of all other mail. -qinterval (ignored) - The interval between queue runs. Use the queue_run_delay config‐ + The interval between queue runs. Use the queue_run_delay config- uration parameter instead. -qIqueueid Schedule immediate delivery of mail with the specified queue ID. - This option is implemented by executing the postqueue(1) com‐ + This option is implemented by executing the postqueue(1) com- mand, and is available with Postfix version 2.4 and later. -qRsite Schedule immediate delivery of all mail that is queued for the - named site. This option accepts only site names that are eligi‐ - ble for the "fast flush" service, and is implemented by execut‐ + named site. This option accepts only site names that are eligi- + ble for the "fast flush" service, and is implemented by execut- ing the postqueue(1) command. See flush(8) for more information about the "fast flush" service. @@ -262,12 +262,12 @@ SENDMAIL(1) SENDMAIL(1) -XVxy (Postfix 2.2 and earlier: -Vxy) As -XV, but uses x and y as the VERP delimiter characters, - instead of the characters specified with the default_verp_delim‐‐ - iters configuration parameter. + instead of the characters specified with the default_verp_delim- + iters configuration parameter. - -v Send an email report of the first delivery attempt (Postfix ver‐ - sions 2.1 and later). Mail delivery always happens in the back‐ - ground. When multiple -v options are given, enable verbose log‐ + -v Send an email report of the first delivery attempt (Postfix ver- + sions 2.1 and later). Mail delivery always happens in the back- + ground. When multiple -v options are given, enable verbose log- ging for debugging purposes. -X log_file (ignored) @@ -297,9 +297,9 @@ SENDMAIL(1) SENDMAIL(1) no From: message header. See also the -F option above. CONFIGURATION PARAMETERS - The following main.cf parameters are especially relevant to this pro‐ - gram. The text below provides only a parameter summary. See post‐‐ - conf(5) for more details including examples. + The following main.cf parameters are especially relevant to this pro- + gram. The text below provides only a parameter summary. See post- + conf(5) for more details including examples. COMPATIBILITY CONTROLS Available with Postfix 2.9 and later: @@ -335,8 +335,8 @@ SENDMAIL(1) SENDMAIL(1) List of users who are authorized to view the queue. authorized_submit_users (static:anyone) - List of users who are authorized to submit mail with the send‐‐ - mail(1) command (and with the privileged postdrop(1) helper com‐ + List of users who are authorized to submit mail with the send- + mail(1) command (and with the privileged postdrop(1) helper com- mand). RESOURCE AND RATE CONTROLS @@ -363,7 +363,7 @@ SENDMAIL(1) SENDMAIL(1) the Postfix "fast flush" service. fast_flush_domains ($relay_domains) - Optional list of destinations that are eligible for per-destina‐ + Optional list of destinations that are eligible for per-destina- tion logfiles with mail that is queued to those destinations. VERP CONTROLS @@ -386,7 +386,7 @@ SENDMAIL(1) SENDMAIL(1) The location of all postfix administrative commands. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_directory (see 'postconf -d' output) @@ -417,7 +417,7 @@ SENDMAIL(1) SENDMAIL(1) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". FILES diff --git a/postfix/html/smtp-sink.1.html b/postfix/html/smtp-sink.1.html index cf6fa6ebc..8c676de7c 100644 --- a/postfix/html/smtp-sink.1.html +++ b/postfix/html/smtp-sink.1.html @@ -19,7 +19,7 @@ SMTP-SINK(1) SMTP-SINK(1) SMTP messages from the network and throws them away. The purpose is to measure client performance, not protocol compliance. - smtp-sink may also be configured to capture each mail delivery transac‐ + smtp-sink may also be configured to capture each mail delivery transac- tion to file. Since disk latencies are large compared to network delays, this mode of operation can reduce the maximal performance by several orders of magnitude. @@ -28,7 +28,7 @@ SMTP-SINK(1) SMTP-SINK(1) domain sockets. IPv4 and IPv6 are the default. This program is the complement of the smtp-source(1) program. - Note: this is an unsupported test program. No attempt is made to main‐ + Note: this is an unsupported test program. No attempt is made to main- tain compatibility between successive versions. Arguments: @@ -44,7 +44,7 @@ SMTP-SINK(1) SMTP-SINK(1) -a Do not announce SASL authentication support. -A delay - Wait delay seconds after responding to DATA, then abort prema‐ + Wait delay seconds after responding to DATA, then abort prema- turely with a 550 reply status. Do not read further input from the client; this is an attempt to block the client before it sends ".". Specify a zero delay value to abort immediately. @@ -57,7 +57,7 @@ SMTP-SINK(1) SMTP-SINK(1) Use hard-bounce-reply for hard reject responses. The default reply is "500 5.3.0 Error: command failed". - -c Display running counters that are updated whenever an SMTP ses‐ + -c Display running counters that are updated whenever an SMTP ses- sion ends, a QUIT command is executed, or when "." is received. -C Disable XCLIENT support. @@ -67,7 +67,7 @@ SMTP-SINK(1) SMTP-SINK(1) is created by expanding the dump-template via strftime(3) and appending a pseudo-random hexadecimal number (example: "%Y%m%d%H/%M." expands into "2006081203/05.809a62e3"). If the - template contains "/" characters, missing directories are cre‐ + template contains "/" characters, missing directories are cre- ated automatically. The message dump format is described below. Note: this option keeps one capture file open for every mail @@ -106,7 +106,7 @@ SMTP-SINK(1) SMTP-SINK(1) -m count (default: 256) An upper bound on the maximal number of simultaneous connections - that smtp-sink will handle. This prevents the process from run‐ + that smtp-sink will handle. This prevents the process from run- ning out of file descriptors. Excess connections will stay queued in the TCP/IP stack. @@ -122,7 +122,7 @@ SMTP-SINK(1) SMTP-SINK(1) CISCO PIX system. Implies -e. -q command,command,... - Disconnect (without replying) after receiving one of the speci‐ + Disconnect (without replying) after receiving one of the speci- fied commands. Examples of commands are CONNECT, HELO, EHLO, LHLO, MAIL, RCPT, @@ -131,7 +131,7 @@ SMTP-SINK(1) SMTP-SINK(1) from the shell. Command names are case-insensitive. -Q command,command,... - Send a 421 reply and disconnect after receiving one of the spec‐ + Send a 421 reply and disconnect after receiving one of the spec- ified commands. Examples of commands are CONNECT, HELO, EHLO, LHLO, MAIL, RCPT, @@ -165,7 +165,7 @@ SMTP-SINK(1) SMTP-SINK(1) An optional string that is prepended to each message that is written to a dump file (see the dump file format description below). The following C escape sequences are supported: \a - (bell), \b (backslace), \f (formfeed), \n (newline), \r (car‐ + (bell), \b (backslace), \f (formfeed), \n (newline), \r (car- riage return), \t (horizontal tab), \v (vertical tab), \ddd (up to three octal digits) and \\ (the backslash character). @@ -178,7 +178,7 @@ SMTP-SINK(1) SMTP-SINK(1) window scaling implementations, specify a value > 0 and < 65536. -u username - Switch to the specified user privileges after opening the net‐ + Switch to the specified user privileges after opening the net- work socket and optionally changing the process root directory. This option is required when the process runs with super-user privileges. See also the -R option. @@ -212,13 +212,13 @@ SMTP-SINK(1) SMTP-SINK(1) Each dumped message contains a sequence of text lines, terminated with the newline character. The sequence of information is as follows: - · The optional string specified with the -S option. + o The optional string specified with the -S option. - · The smtp-sink generated headers as documented below. + o The smtp-sink generated headers as documented below. - · The message header and body as received from the SMTP client. + o The message header and body as received from the SMTP client. - · An empty line. + o An empty line. The format of the smtp-sink generated headers is as follows: @@ -233,11 +233,11 @@ SMTP-SINK(1) SMTP-SINK(1) X-Helo-Args: text The arguments of the last HELO or EHLO command before this mail delivery transaction. This record is present only if the client - sent a recognizable HELO or EHLO command before the DATA com‐ + sent a recognizable HELO or EHLO command before the DATA com- mand. X-Mail-Args: text - The arguments of the MAIL command that started this mail deliv‐ + The arguments of the MAIL command that started this mail deliv- ery transaction. This record is present exactly once. X-Rcpt-Args: text @@ -246,8 +246,8 @@ SMTP-SINK(1) SMTP-SINK(1) are in the order as sent by the client. Received: text - A message header for compatibility with mail processing soft‐ - ware. This three-line header marks the end of the headers pro‐ + A message header for compatibility with mail processing soft- + ware. This three-line header marks the end of the headers pro- vided by smtp-sink, and is formatted as follows: from helo ([addr]) @@ -257,7 +257,7 @@ SMTP-SINK(1) SMTP-SINK(1) by host (smtp-sink) with proto id random; The hostname specified with the -h option, the client - protocol (see X-Client-Proto above), and the pseudo-ran‐ + protocol (see X-Client-Proto above), and the pseudo-ran- dom portion of the per-message capture file name. time-stamp diff --git a/postfix/html/smtp.8.html b/postfix/html/smtp.8.html index 0356f23da..92a57e071 100644 --- a/postfix/html/smtp.8.html +++ b/postfix/html/smtp.8.html @@ -14,7 +14,7 @@ SMTP(8) SMTP(8) DESCRIPTION The Postfix SMTP+LMTP client implements the SMTP and LMTP mail delivery - protocols. It processes message delivery requests from the queue man‐ + protocols. It processes message delivery requests from the queue man- ager. Each request specifies a queue file, a sender address, a domain or host to deliver to, and recipient information. This program expects to be run from the master(8) process manager. @@ -46,7 +46,7 @@ SMTP(8) SMTP(8) domainname domainname:port - Look up the mail exchangers for the specified domain, and con‐ + Look up the mail exchangers for the specified domain, and con- nect to the specified port (default: smtp). [hostname] @@ -59,7 +59,7 @@ SMTP(8) SMTP(8) [address]:port Connect to the host at the specified address, and connect to the - specified port (default: smtp). An IPv6 address must be format‐ + specified port (default: smtp). An IPv6 address must be format- ted as [ipv6:address]. LMTP DESTINATION SYNTAX @@ -115,7 +115,7 @@ SMTP(8) SMTP(8) files are marked so that the queue manager can move them to the corrupt queue for further inspection. - Depending on the setting of the notify_classes parameter, the postmas‐ + Depending on the setting of the notify_classes parameter, the postmas- ter is notified of bounces, protocol problems, and of other trouble. BUGS @@ -133,7 +133,7 @@ SMTP(8) SMTP(8) there is no support for TLS, and connections are cached in-process, making it ineffective when the client is used for multiple domains. - Most smtp_xxx configuration parameters have an lmtp_xxx "mirror" param‐ + Most smtp_xxx configuration parameters have an lmtp_xxx "mirror" param- eter for the equivalent LMTP feature. This document describes only those LMTP-related parameters that aren't simply "mirror" parameters. @@ -244,7 +244,7 @@ SMTP(8) SMTP(8) send_cyrus_sasl_authzid (no) When authenticating to a remote SMTP or LMTP server with the default setting "no", send no SASL authoriZation ID (authzid); - send only the SASL authentiCation ID (authcid) plus the auth‐ + send only the SASL authentiCation ID (authcid) plus the auth- cid's password. Available in Postfix version 2.5 and later: @@ -266,7 +266,7 @@ SMTP(8) SMTP(8) Available in Postfix version 2.6 and later: tcp_windowsize (0) - An optional workaround for routers that break TCP window scal‐ + An optional workaround for routers that break TCP window scal- ing. Available in Postfix version 2.8 and later: @@ -280,7 +280,7 @@ SMTP(8) SMTP(8) Change the behavior of the smtp_*_timeout time limits, from a time limit per read or write system call, to a time limit to send or receive a complete record (an SMTP command line, SMTP - response line, SMTP message content line, or TLS protocol mes‐ + response line, SMTP message content line, or TLS protocol mes- sage). smtp_send_dummy_mail_auth (no) @@ -296,7 +296,7 @@ SMTP(8) SMTP(8) smtp_delivery_status_filter ($default_delivery_status_filter) Optional filter for the smtp(8) delivery agent to change the - delivery status code or explanatory text of successful or unsuc‐ + delivery status code or explanatory text of successful or unsuc- cessful deliveries. MIME PROCESSING CONTROLS @@ -323,13 +323,13 @@ SMTP(8) SMTP(8) Enable SASL authentication in the Postfix SMTP client. smtp_sasl_password_maps (empty) - Optional Postfix SMTP client lookup tables with one user‐ + Optional Postfix SMTP client lookup tables with one user- name:password entry per remote hostname or domain, or sender address when sender-dependent authentication is enabled. smtp_sasl_security_options (noplaintext, noanonymous) Postfix SMTP client SASL security options; as of Postfix 2.3 the - list of available features depends on the SASL client implemen‐ + list of available features depends on the SASL client implemen- tation that is selected with smtp_sasl_type. Available in Postfix version 2.2 and later: @@ -343,7 +343,7 @@ SMTP(8) SMTP(8) smtp_sender_dependent_authentication (no) Enable sender-dependent authentication in the Postfix SMTP client; this is available only with SASL authentication, and - disables SMTP connection caching to ensure that mail from dif‐ + disables SMTP connection caching to ensure that mail from dif- ferent senders will use the appropriate credentials. smtp_sasl_path (empty) @@ -358,7 +358,7 @@ SMTP(8) SMTP(8) Available in Postfix version 2.5 and later: smtp_sasl_auth_cache_name (empty) - An optional table to prevent repeated SASL authentication fail‐ + An optional table to prevent repeated SASL authentication fail- ures with the same remote SMTP server hostname, username and password. @@ -397,7 +397,7 @@ SMTP(8) SMTP(8) smtp_tls_CAfile (empty) A file containing CA certificates of root CAs trusted to sign - either remote SMTP server certificates or intermediate CA cer‐ + either remote SMTP server certificates or intermediate CA cer- tificates. smtp_tls_CApath (empty) @@ -418,7 +418,7 @@ SMTP(8) SMTP(8) smtp_tls_mandatory_exclude_ciphers (empty) Additional list of ciphers or cipher types to exclude from the - Postfix SMTP client cipher list at mandatory TLS security lev‐ + Postfix SMTP client cipher list at mandatory TLS security lev- els. smtp_tls_dcert_file (empty) @@ -439,7 +439,7 @@ SMTP(8) SMTP(8) smtp_tls_policy_maps (empty) Optional lookup tables with the Postfix SMTP client TLS security - policy by next-hop destination; when a non-empty value is speci‐ + policy by next-hop destination; when a non-empty value is speci- fied, this overrides the obsolete smtp_tls_per_site parameter. smtp_tls_mandatory_protocols (!SSLv2) @@ -488,8 +488,8 @@ SMTP(8) SMTP(8) Available in Postfix version 2.4 and later: - smtp_sasl_tls_verified_security_options ($smtp_sasl_tls_secu‐‐ - rity_options) + smtp_sasl_tls_verified_security_options ($smtp_sasl_tls_secu- + rity_options) The SASL authentication security options that the Postfix SMTP client uses for TLS encrypted SMTP sessions with a verified server certificate. @@ -498,8 +498,8 @@ SMTP(8) SMTP(8) smtp_tls_fingerprint_cert_match (empty) List of acceptable remote SMTP server certificate fingerprints - for the "fingerprint" TLS security level (smtp_tls_secu‐‐ - rity_level = fingerprint). + for the "fingerprint" TLS security level (smtp_tls_secu- + rity_level = fingerprint). smtp_tls_fingerprint_digest (md5) The message digest algorithm used to construct remote SMTP @@ -516,18 +516,18 @@ SMTP(8) SMTP(8) use with opportunistic TLS encryption. smtp_tls_eccert_file (empty) - File with the Postfix SMTP client ECDSA certificate in PEM for‐ + File with the Postfix SMTP client ECDSA certificate in PEM for- mat. smtp_tls_eckey_file ($smtp_tls_eccert_file) - File with the Postfix SMTP client ECDSA private key in PEM for‐ + File with the Postfix SMTP client ECDSA private key in PEM for- mat. Available in Postfix version 2.7 and later: smtp_tls_block_early_mail_reply (no) Try to detect a mail hijacking attack based on a TLS protocol - vulnerability (CVE-2009-3555), where an attacker prepends mali‐ + vulnerability (CVE-2009-3555), where an attacker prepends mali- cious HELO, MAIL, RCPT, DATA commands to a Postfix SMTP client TLS session. @@ -572,7 +572,7 @@ SMTP(8) SMTP(8) smtp_tls_per_site (empty) Optional lookup tables with the Postfix SMTP client TLS usage - policy by next-hop destination and by remote SMTP server host‐ + policy by next-hop destination and by remote SMTP server host- name. smtp_tls_cipherlist (empty) @@ -580,17 +580,17 @@ SMTP(8) SMTP(8) cipher list. RESOURCE AND RATE CONTROLS - smtp_destination_concurrency_limit ($default_destination_concur‐‐ - rency_limit) - The maximal number of parallel deliveries to the same destina‐ + smtp_destination_concurrency_limit ($default_destination_concur- + rency_limit) + The maximal number of parallel deliveries to the same destina- tion via the smtp message delivery transport. smtp_destination_recipient_limit ($default_destination_recipient_limit) - The maximal number of recipients per message for the smtp mes‐ + The maximal number of recipients per message for the smtp mes- sage delivery transport. smtp_connect_timeout (30s) - The Postfix SMTP client time limit for completing a TCP connec‐ + The Postfix SMTP client time limit for completing a TCP connec- tion, or zero (use the operating system built-in time limit). smtp_helo_timeout (300s) @@ -603,7 +603,7 @@ SMTP(8) SMTP(8) and for receiving the initial remote LMTP server response. smtp_xforward_timeout (300s) - The Postfix SMTP client time limit for sending the XFORWARD com‐ + The Postfix SMTP client time limit for sending the XFORWARD com- mand, and for receiving the remote SMTP server response. smtp_mail_timeout (300s) @@ -663,7 +663,7 @@ SMTP(8) SMTP(8) has a high volume of mail in the active queue. smtp_connection_reuse_time_limit (300s) - The amount of time during which Postfix will use an SMTP connec‐ + The amount of time during which Postfix will use an SMTP connec- tion repeatedly. smtp_connection_cache_time_limit (2s) @@ -673,7 +673,7 @@ SMTP(8) SMTP(8) Available in Postfix version 2.3 and later: connection_cache_protocol_timeout (5s) - Time limit for connection cache connect, send or receive opera‐ + Time limit for connection cache connect, send or receive opera- tions. Available in Postfix version 2.9 and later: @@ -682,7 +682,7 @@ SMTP(8) SMTP(8) Change the behavior of the smtp_*_timeout time limits, from a time limit per read or write system call, to a time limit to send or receive a complete record (an SMTP command line, SMTP - response line, SMTP message content line, or TLS protocol mes‐ + response line, SMTP message content line, or TLS protocol mes- sage). Available in Postfix version 2.11 and later: @@ -700,7 +700,7 @@ SMTP(8) SMTP(8) in RFC 6531..6533. smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci‐ + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. TROUBLE SHOOTING CONTROLS @@ -715,7 +715,7 @@ SMTP(8) SMTP(8) error_notice_recipient (postmaster) The recipient of postmaster notifications about mail delivery - problems that are caused by policy, resource, software or proto‐ + problems that are caused by policy, resource, software or proto- col errors. internal_mail_filter_classes (empty) @@ -732,7 +732,7 @@ SMTP(8) SMTP(8) detects a "mail loops back to myself" error condition. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -740,7 +740,7 @@ SMTP(8) SMTP(8) request before it is terminated by a built-in watchdog timer. delay_logging_resolution_limit (2) - The maximal number of digits after the decimal point when log‐ + The maximal number of digits after the decimal point when log- ging sub-second delay values. disable_dns_lookups (no) @@ -760,7 +760,7 @@ SMTP(8) SMTP(8) lmtp_assume_final (no) When a remote LMTP server announces no DSN support, assume that - the server performs final delivery, and send "delivered" deliv‐ + the server performs final delivery, and send "delivered" deliv- ery status notifications instead of "relayed". lmtp_tcp_port (24) @@ -815,7 +815,7 @@ SMTP(8) SMTP(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". Available with Postfix 2.2 and earlier: diff --git a/postfix/html/smtpd.8.html b/postfix/html/smtpd.8.html index 522295d07..a8528abbe 100644 --- a/postfix/html/smtpd.8.html +++ b/postfix/html/smtpd.8.html @@ -18,7 +18,7 @@ SMTPD(8) SMTPD(8) The SMTP server accepts network connection requests and performs zero or more SMTP transactions per connection. Each received message is piped through the cleanup(8) daemon, and is placed into the incoming - queue as one single queue file. For this mode of operation, the pro‐ + queue as one single queue file. For this mode of operation, the pro- gram expects to be run from the master(8) process manager. Alternatively, the SMTP server be can run in stand-alone mode; this is @@ -31,7 +31,7 @@ SMTPD(8) SMTPD(8) The SMTP server implements a variety of policies for connection requests, and for parameters given to HELO, ETRN, MAIL FROM, VRFY and - RCPT TO commands. They are detailed below and in the main.cf configura‐ + RCPT TO commands. They are detailed below and in the main.cf configura- tion file. SECURITY @@ -63,7 +63,7 @@ SMTPD(8) SMTPD(8) DIAGNOSTICS Problems and transactions are logged to syslogd(8). - Depending on the setting of the notify_classes parameter, the postmas‐ + Depending on the setting of the notify_classes parameter, the postmas- ter is notified of bounces, protocol problems, policy violations, and of other trouble. @@ -129,13 +129,13 @@ SMTPD(8) SMTPD(8) smtpd_tls_always_issue_session_ids (yes) Force the Postfix SMTP server to issue a TLS session id, even - when TLS session caching is turned off (smtpd_tls_ses‐ - sion_cache_database is empty). + when TLS session caching is turned off (smtpd_tls_ses- + sion_cache_database is empty). Available in Postfix version 2.6 and later: tcp_windowsize (0) - An optional workaround for routers that break TCP window scal‐ + An optional workaround for routers that break TCP window scal- ing. Available in Postfix version 2.7 and later: @@ -146,8 +146,8 @@ SMTPD(8) SMTPD(8) Available in Postfix version 2.9 and later: smtpd_per_record_deadline (normal: no, overload: yes) - Change the behavior of the smtpd_timeout and smtpd_start‐ - tls_timeout time limits, from a time limit per read or write + Change the behavior of the smtpd_timeout and smtpd_start- + tls_timeout time limits, from a time limit per read or write system call, to a time limit to send or receive a complete record (an SMTP command line, SMTP response line, SMTP message content line, or TLS protocol message). @@ -157,7 +157,7 @@ SMTPD(8) SMTPD(8) Postfix address rewriting. receive_override_options (empty) - Enable or disable recipient validation, built-in content filter‐ + Enable or disable recipient validation, built-in content filter- ing, or address mapping. Available in Postfix version 2.2 and later: @@ -167,8 +167,8 @@ SMTPD(8) SMTPD(8) update incomplete addresses with the domain name in $myorigin or $mydomain; either don't rewrite message headers from other clients at all, or rewrite message headers and update incomplete - addresses with the domain specified in the remote_header_re‐ - write_domain parameter. + addresses with the domain specified in the remote_header_re- + write_domain parameter. BEFORE-SMTPD PROXY AGENT Available in Postfix version 2.10 and later: @@ -184,7 +184,7 @@ SMTPD(8) SMTPD(8) AFTER QUEUE EXTERNAL CONTENT INSPECTION CONTROLS As of version 1.0, Postfix can be configured to send new mail to an external content filter AFTER the mail is queued. This content filter - is expected to inject mail back into a (Postfix or other) MTA for fur‐ + is expected to inject mail back into a (Postfix or other) MTA for fur- ther delivery. See the FILTER_README document for details. content_filter (empty) @@ -194,19 +194,19 @@ SMTPD(8) SMTPD(8) BEFORE QUEUE EXTERNAL CONTENT INSPECTION CONTROLS As of version 2.1, the Postfix SMTP server can be configured to send incoming mail to a real-time SMTP-based content filter BEFORE mail is - queued. This content filter is expected to inject mail back into Post‐ - fix. See the SMTPD_PROXY_README document for details on how to config‐ + queued. This content filter is expected to inject mail back into Post- + fix. See the SMTPD_PROXY_README document for details on how to config- ure and operate this feature. smtpd_proxy_filter (empty) The hostname and TCP port of the mail filtering proxy server. smtpd_proxy_ehlo ($myhostname) - How the Postfix SMTP server announces itself to the proxy fil‐ + How the Postfix SMTP server announces itself to the proxy fil- ter. smtpd_proxy_options (empty) - List of options that control how the Postfix SMTP server commu‐ + List of options that control how the Postfix SMTP server commu- nicates with a before-queue content filter. smtpd_proxy_timeout (100s) @@ -217,15 +217,15 @@ SMTPD(8) SMTPD(8) As of version 2.3, Postfix supports the Sendmail version 8 Milter (mail filter) protocol. These content filters run outside Postfix. They can inspect the SMTP command stream and the message content, and can - request modifications before mail is queued. For details see the MIL‐ - TER_README document. + request modifications before mail is queued. For details see the MIL- + TER_README document. smtpd_milters (empty) A list of Milter (mail filter) applications for new mail that arrives via the Postfix smtpd(8) server. milter_protocol (6) - The mail filter protocol version and optional protocol exten‐ + The mail filter protocol version and optional protocol exten- sions for communication with a Milter application; prior to Postfix 2.6 the default protocol is 2. @@ -234,14 +234,14 @@ SMTPD(8) SMTPD(8) unavailable or mis-configured. milter_macro_daemon_name ($myhostname) - The {daemon_name} macro value for Milter (mail filter) applica‐ + The {daemon_name} macro value for Milter (mail filter) applica- tions. milter_macro_v ($mail_name $mail_version) The {v} macro value for Milter (mail filter) applications. milter_connect_timeout (30s) - The time limit for connecting to a Milter (mail filter) applica‐ + The time limit for connecting to a Milter (mail filter) applica- tion, and for negotiating protocol options. milter_command_timeout (30s) @@ -291,7 +291,7 @@ SMTPD(8) SMTPD(8) Available in Postfix version 2.1 and later: receive_override_options (empty) - Enable or disable recipient validation, built-in content filter‐ + Enable or disable recipient validation, built-in content filter- ing, or address mapping. EXTERNAL CONTENT INSPECTION CONTROLS @@ -301,7 +301,7 @@ SMTPD(8) SMTPD(8) Available in Postfix version 2.1 and later: smtpd_authorized_xforward_hosts (empty) - What remote SMTP clients are allowed to use the XFORWARD fea‐ + What remote SMTP clients are allowed to use the XFORWARD fea- ture. SASL AUTHENTICATION CONTROLS @@ -323,7 +323,7 @@ SMTPD(8) SMTPD(8) smtpd_sasl_security_options (noanonymous) Postfix SMTP server SASL security options; as of Postfix 2.3 the - list of available features depends on the SASL server implemen‐ + list of available features depends on the SASL server implemen- tation that is selected with smtpd_sasl_type. smtpd_sender_login_maps (empty) @@ -360,7 +360,7 @@ SMTPD(8) SMTPD(8) Available in Postfix version 2.5 and later: cyrus_sasl_config_path (empty) - Search path for Cyrus SASL application configuration files, cur‐ + Search path for Cyrus SASL application configuration files, cur- rently used only to locate the $smtpd_sasl_path.conf file. Available in Postfix version 2.11 and later: @@ -375,7 +375,7 @@ SMTPD(8) SMTPD(8) smtpd_tls_security_level (empty) The SMTP TLS security level for the Postfix SMTP server; when a - non-empty value is specified, this overrides the obsolete param‐ + non-empty value is specified, this overrides the obsolete param- eters smtpd_use_tls and smtpd_enforce_tls. smtpd_sasl_tls_security_options ($smtpd_sasl_security_options) @@ -388,25 +388,25 @@ SMTPD(8) SMTPD(8) smtpd_tls_CAfile (empty) A file containing (PEM format) CA certificates of root CAs - trusted to sign either remote SMTP client certificates or inter‐ + trusted to sign either remote SMTP client certificates or inter- mediate CA certificates. smtpd_tls_CApath (empty) A directory containing (PEM format) CA certificates of root CAs - trusted to sign either remote SMTP client certificates or inter‐ + trusted to sign either remote SMTP client certificates or inter- mediate CA certificates. smtpd_tls_always_issue_session_ids (yes) Force the Postfix SMTP server to issue a TLS session id, even - when TLS session caching is turned off (smtpd_tls_ses‐ - sion_cache_database is empty). + when TLS session caching is turned off (smtpd_tls_ses- + sion_cache_database is empty). smtpd_tls_ask_ccert (no) Ask a remote SMTP client for a client certificate. smtpd_tls_auth_only (no) When TLS encryption is optional in the Postfix SMTP server, do - not announce or accept SASL authentication over unencrypted con‐ + not announce or accept SASL authentication over unencrypted con- nections. smtpd_tls_ccert_verifydepth (9) @@ -445,7 +445,7 @@ SMTPD(8) SMTPD(8) smtpd_tls_mandatory_exclude_ciphers (empty) Additional list of ciphers or cipher types to exclude from the - Postfix SMTP server cipher list at mandatory TLS security lev‐ + Postfix SMTP server cipher list at mandatory TLS security lev- els. smtpd_tls_mandatory_protocols (!SSLv2) @@ -505,11 +505,11 @@ SMTPD(8) SMTPD(8) use with opportunistic TLS encryption. smtpd_tls_eccert_file (empty) - File with the Postfix SMTP server ECDSA certificate in PEM for‐ + File with the Postfix SMTP server ECDSA certificate in PEM for- mat. smtpd_tls_eckey_file ($smtpd_tls_eccert_file) - File with the Postfix SMTP server ECDSA private key in PEM for‐ + File with the Postfix SMTP server ECDSA private key in PEM for- mat. smtpd_tls_eecdh_grade (see 'postconf -d' output) @@ -527,7 +527,7 @@ SMTPD(8) SMTPD(8) Available in Postfix version 2.8 and later: tls_preempt_cipherlist (no) - With SSLv3 and later, use the Postfix SMTP server's cipher pref‐ + With SSLv3 and later, use the Postfix SMTP server's cipher pref- erence order instead of the remote client's cipher preference order. @@ -572,13 +572,13 @@ SMTPD(8) SMTPD(8) Enable stricter enforcement of the SMTPUTF8 protocol. smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci‐ + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. VERP SUPPORT CONTROLS - With VERP style delivery, each recipient of a message receives a cus‐ + With VERP style delivery, each recipient of a message receives a cus- tomized copy of the message with his/her own recipient address encoded - in the envelope sender address. The VERP_README file describes config‐ + in the envelope sender address. The VERP_README file describes config- uration and operation details of Postfix support for variable envelope return path addresses. VERP style delivery is requested with the SMTP XVERP command or with the "sendmail -V" command-line option and is @@ -594,13 +594,13 @@ SMTPD(8) SMTPD(8) Available in Postfix version 1.1 and 2.0: authorized_verp_clients ($mynetworks) - What remote SMTP clients are allowed to specify the XVERP com‐ + What remote SMTP clients are allowed to specify the XVERP com- mand. Available in Postfix version 2.1 and later: smtpd_authorized_verp_clients ($authorized_verp_clients) - What remote SMTP clients are allowed to specify the XVERP com‐ + What remote SMTP clients are allowed to specify the XVERP com- mand. TROUBLE SHOOTING CONTROLS @@ -620,7 +620,7 @@ SMTPD(8) SMTPD(8) error_notice_recipient (postmaster) The recipient of postmaster notifications about mail delivery - problems that are caused by policy, resource, software or proto‐ + problems that are caused by policy, resource, software or proto- col errors. internal_mail_filter_classes (empty) @@ -653,7 +653,7 @@ SMTPD(8) SMTPD(8) KNOWN VERSUS UNKNOWN RECIPIENT CONTROLS As of Postfix version 2.0, the SMTP server rejects mail for unknown - recipients. This prevents the mail queue from clogging up with undeliv‐ + recipients. This prevents the mail queue from clogging up with undeliv- erable MAILER-DAEMON messages. Additional information on this topic is in the LOCAL_RECIPIENT_README and ADDRESS_CLASS_README documents. @@ -689,8 +689,8 @@ SMTPD(8) SMTPD(8) local_recipient_maps (proxy:unix:passwd.byname $alias_maps) Lookup tables with all names or addresses of local recipients: a - recipient address is local when its domain matches $mydestina‐ - tion, $inet_interfaces or $proxy_interfaces. + recipient address is local when its domain matches $mydestina- + tion, $inet_interfaces or $proxy_interfaces. unknown_local_recipient_reject_code (550) The numerical Postfix SMTP server response code when a recipient @@ -709,7 +709,7 @@ SMTPD(8) SMTPD(8) unknown_relay_recipient_reject_code (550) The numerical Postfix SMTP server reply code when a recipient - address matches $relay_domains, and relay_recipient_maps speci‐ + address matches $relay_domains, and relay_recipient_maps speci- fies a list of lookup tables that does not match the recipient address. @@ -727,7 +727,7 @@ SMTPD(8) SMTPD(8) unknown_virtual_alias_reject_code (550) The Postfix SMTP server reply code when a recipient address - matches $virtual_alias_domains, and $virtual_alias_maps speci‐ + matches $virtual_alias_domains, and $virtual_alias_maps speci- fies a list of lookup tables that does not match the recipient address. @@ -746,7 +746,7 @@ SMTPD(8) SMTPD(8) unknown_virtual_mailbox_reject_code (550) The Postfix SMTP server reply code when a recipient address matches $virtual_mailbox_domains, and $virtual_mailbox_maps - specifies a list of lookup tables that does not match the recip‐ + specifies a list of lookup tables that does not match the recip- ient address. RESOURCE AND RATE CONTROLS @@ -758,7 +758,7 @@ SMTPD(8) SMTPD(8) this length; upon delivery, long lines are reconstructed. queue_minfree (0) - The minimal amount of free space in bytes in the queue file sys‐ + The minimal amount of free space in bytes in the queue file sys- tem that is needed to receive mail. message_size_limit (10240000) @@ -784,7 +784,7 @@ SMTPD(8) SMTPD(8) Attempt to look up the remote SMTP client hostname, and verify that the name matches the client IP address. - The per SMTP client connection count and request rate limits are imple‐ + The per SMTP client connection count and request rate limits are imple- mented in co-operation with the anvil(8) service, and are available in Postfix version 2.2 and later. @@ -820,8 +820,8 @@ SMTPD(8) SMTPD(8) Available in Postfix version 2.9 and later: smtpd_per_record_deadline (normal: no, overload: yes) - Change the behavior of the smtpd_timeout and smtpd_start‐ - tls_timeout time limits, from a time limit per read or write + Change the behavior of the smtpd_timeout and smtpd_start- + tls_timeout time limits, from a time limit per read or write system call, to a time limit to send or receive a complete record (an SMTP command line, SMTP response line, SMTP message content line, or TLS protocol message). @@ -885,7 +885,7 @@ SMTPD(8) SMTPD(8) The default action when an SMTPD policy service request fails. smtpd_policy_service_request_limit (0) - The maximal number of requests per SMTPD policy service connec‐ + The maximal number of requests per SMTPD policy service connec- tion, or zero (no limit). smtpd_policy_service_try_limit (2) @@ -893,7 +893,7 @@ SMTPD(8) SMTPD(8) request before giving up. smtpd_policy_service_retry_delay (1s) - The delay between attempts to resend a failed SMTPD policy ser‐ + The delay between attempts to resend a failed SMTPD policy ser- vice request. ACCESS CONTROLS @@ -940,7 +940,7 @@ SMTPD(8) SMTPD(8) allow_untrusted_routing (no) Forward mail with sender-specified routing - (user[@%!]remote[@%!]site) from untrusted clients to destina‐ + (user[@%!]remote[@%!]site) from untrusted clients to destina- tions matching $relay_domains. smtpd_restriction_classes (empty) @@ -991,12 +991,12 @@ SMTPD(8) SMTPD(8) smtpd_recipient_restrictions. SENDER AND RECIPIENT ADDRESS VERIFICATION CONTROLS - Postfix version 2.1 introduces sender and recipient address verifica‐ + Postfix version 2.1 introduces sender and recipient address verifica- tion. This feature is implemented by sending probe email messages that are not actually delivered. This feature is requested via the reject_unverified_sender and reject_unverified_recipient access restrictions. The status of verification probes is maintained by the - verify(8) server. See the file ADDRESS_VERIFICATION_README for infor‐ + verify(8) server. See the file ADDRESS_VERIFICATION_README for infor- mation about how to configure and operate the Postfix sender/recipient address verification service. @@ -1005,7 +1005,7 @@ SMTPD(8) SMTPD(8) of an address verification request in progress. address_verify_poll_delay (3s) - The delay between queries for the completion of an address veri‐ + The delay between queries for the completion of an address veri- fication request in progress. address_verify_sender ($double_bounce_sender) @@ -1018,7 +1018,7 @@ SMTPD(8) SMTPD(8) unverified_recipient_reject_code (450) The numerical Postfix SMTP server response when a recipient - address is rejected by the reject_unverified_recipient restric‐ + address is rejected by the reject_unverified_recipient restric- tion. Available in Postfix version 2.6 and later: @@ -1044,8 +1044,8 @@ SMTPD(8) SMTPD(8) fails due to a temporary error condition. unverified_recipient_tempfail_action ($reject_tempfail_action) - The Postfix SMTP server's action when reject_unverified_recipi‐ - ent fails due to a temporary error condition. + The Postfix SMTP server's action when reject_unverified_recipi- + ent fails due to a temporary error condition. Available with Postfix 2.9 and later: @@ -1106,7 +1106,7 @@ SMTPD(8) SMTPD(8) reject_unknown_client_hostname restriction. unknown_hostname_reject_code (450) - The numerical Postfix SMTP server response code when the host‐ + The numerical Postfix SMTP server response code when the host- name specified with the HELO or EHLO command is rejected by the reject_unknown_helo_hostname restriction. @@ -1118,8 +1118,8 @@ SMTPD(8) SMTPD(8) multi_recipient_bounce_reject_code (550) The numerical Postfix SMTP server response code when a remote - SMTP client request is blocked by the reject_multi_recipi‐ - ent_bounce restriction. + SMTP client request is blocked by the reject_multi_recipi- + ent_bounce restriction. rbl_reply_maps (empty) Optional lookup tables with RBL response templates. @@ -1136,8 +1136,8 @@ SMTPD(8) SMTPD(8) fails due to a temporary error condition. unknown_helo_hostname_tempfail_action ($reject_tempfail_action) - The Postfix SMTP server's action when reject_unknown_helo_host‐ - name fails due to an temporary error condition. + The Postfix SMTP server's action when reject_unknown_helo_host- + name fails due to an temporary error condition. unknown_address_tempfail_action ($reject_tempfail_action) The Postfix SMTP server's action when @@ -1146,7 +1146,7 @@ SMTPD(8) SMTPD(8) MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -1157,7 +1157,7 @@ SMTPD(8) SMTPD(8) The location of all postfix administrative commands. double_bounce_sender (double-bounce) - The sender address of postmaster notifications that are gener‐ + The sender address of postmaster notifications that are gener- ated by the mail system. ipc_timeout (3600s) @@ -1184,7 +1184,7 @@ SMTPD(8) SMTPD(8) The internet hostname of this mail system. mynetworks (see 'postconf -d' output) - The list of "trusted" remote SMTP clients that have more privi‐ + The list of "trusted" remote SMTP clients that have more privi- leges than "strangers". myorigin ($myhostname) @@ -1214,13 +1214,13 @@ SMTPD(8) SMTPD(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". Available in Postfix version 2.2 and later: smtpd_forbidden_commands (CONNECT, GET, POST) - List of commands that cause the Postfix SMTP server to immedi‐ + List of commands that cause the Postfix SMTP server to immedi- ately terminate the session with a 221 code. Available in Postfix version 2.5 and later: diff --git a/postfix/html/trace.8.html b/postfix/html/trace.8.html index 13264ac98..19402070a 100644 --- a/postfix/html/trace.8.html +++ b/postfix/html/trace.8.html @@ -13,7 +13,7 @@ BOUNCE(8) BOUNCE(8) bounce [generic Postfix daemon options] DESCRIPTION - The bounce(8) daemon maintains per-message log files with delivery sta‐ + The bounce(8) daemon maintains per-message log files with delivery sta- tus information. Each log file is named after the queue file that it corresponds to, and is kept in a queue subdirectory named after the service name in the master.cf file (either bounce, defer or trace). @@ -21,15 +21,15 @@ BOUNCE(8) BOUNCE(8) The bounce(8) daemon processes two types of service requests: - · Append a recipient (non-)delivery status record to a per-message + o Append a recipient (non-)delivery status record to a per-message log file. - · Enqueue a delivery status notification message, with a copy of a + o Enqueue a delivery status notification message, with a copy of a per-message log file and of the corresponding message. When the delivery status notification message is enqueued successfully, the per-message log file is deleted. - The software does a best notification effort. A non-delivery notifica‐ + The software does a best notification effort. A non-delivery notifica- tion is sent even when the log file or the original message cannot be read. @@ -70,8 +70,8 @@ BOUNCE(8) BOUNCE(8) Postfix versions before 2.0. bounce_notice_recipient (postmaster) - The recipient of postmaster notifications with the message head‐ - ers of mail that Postfix did not deliver and of SMTP conversa‐ + The recipient of postmaster notifications with the message head- + ers of mail that Postfix did not deliver and of SMTP conversa- tion transcripts of mail that Postfix did not receive. bounce_size_limit (50000) @@ -82,7 +82,7 @@ BOUNCE(8) BOUNCE(8) Pathname of a configuration file with bounce message templates. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -90,7 +90,7 @@ BOUNCE(8) BOUNCE(8) request before it is terminated by a built-in watchdog timer. delay_notice_recipient (postmaster) - The recipient of postmaster notifications with the message head‐ + The recipient of postmaster notifications with the message head- ers of mail that cannot be delivered within $delay_warning_time time units. @@ -140,13 +140,13 @@ BOUNCE(8) BOUNCE(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". Available in Postfix 2.12 and later: smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci‐ + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. FILES diff --git a/postfix/html/trivial-rewrite.8.html b/postfix/html/trivial-rewrite.8.html index 5503f3ecd..95e245fba 100644 --- a/postfix/html/trivial-rewrite.8.html +++ b/postfix/html/trivial-rewrite.8.html @@ -26,9 +26,9 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) strip source routed addresses (@site,@site:user@domain) to user@domain form. - remote Append the domain name specified with $remote_header_re‐‐ - write_domain to incomplete addresses. Otherwise the - result is identical to that of the local address rewrit‐ + remote Append the domain name specified with $remote_header_re- + write_domain to incomplete addresses. Otherwise the + result is identical to that of the local address rewrit- ing context. This prevents Postfix from appending the local domain to spam from poorly written remote clients. @@ -41,11 +41,11 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) entry in the master.cf file. nexthop - The host to send to and optional delivery method informa‐ + The host to send to and optional delivery method informa- tion. recipient - The envelope recipient address that is passed on to nex‐ + The envelope recipient address that is passed on to nex- thop. flags The address class, whether the address requires relaying, @@ -160,8 +160,8 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) default_transport (smtp) The default mail delivery transport and next-hop destination for destinations that do not match $mydestination, $inet_interfaces, - $proxy_interfaces, $virtual_alias_domains, $virtual_mail‐ - box_domains, or $relay_domains. + $proxy_interfaces, $virtual_alias_domains, $virtual_mail- + box_domains, or $relay_domains. parent_domain_matches_subdomains (see 'postconf -d' output) A list of Postfix features where the pattern "example.com" also @@ -199,7 +199,7 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) parameter setting. ADDRESS VERIFICATION CONTROLS - Postfix version 2.1 introduces sender and recipient address verifica‐ + Postfix version 2.1 introduces sender and recipient address verifica- tion. This feature is implemented by sending probe email messages that are not actually delivered. By default, address verification probes use the same route as regular mail. To override specific aspects of @@ -207,7 +207,7 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) the following: address_verify_local_transport ($local_transport) - Overrides the local_transport parameter setting for address ver‐ + Overrides the local_transport parameter setting for address ver- ification probes. address_verify_virtual_transport ($virtual_transport) @@ -215,7 +215,7 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) verification probes. address_verify_relay_transport ($relay_transport) - Overrides the relay_transport parameter setting for address ver‐ + Overrides the relay_transport parameter setting for address ver- ification probes. address_verify_default_transport ($default_transport) @@ -223,30 +223,30 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) verification probes. address_verify_relayhost ($relayhost) - Overrides the relayhost parameter setting for address verifica‐ + Overrides the relayhost parameter setting for address verifica- tion probes. address_verify_transport_maps ($transport_maps) - Overrides the transport_maps parameter setting for address veri‐ + Overrides the transport_maps parameter setting for address veri- fication probes. Available in Postfix version 2.3 and later: - address_verify_sender_dependent_relayhost_maps ($sender_depen‐‐ - dent_relayhost_maps) + address_verify_sender_dependent_relayhost_maps ($sender_depen- + dent_relayhost_maps) Overrides the sender_dependent_relayhost_maps parameter setting for address verification probes. Available in Postfix version 2.7 and later: - address_verify_sender_dependent_default_transport_maps ($sender_depen‐‐ - dent_default_transport_maps) + address_verify_sender_dependent_default_transport_maps ($sender_depen- + dent_default_transport_maps) Overrides the sender_dependent_default_transport_maps parameter setting for address verification probes. MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -290,13 +290,13 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". Available in Postfix version 2.0 and later: helpful_warnings (yes) - Log warnings about problematic configuration settings, and pro‐ + Log warnings about problematic configuration settings, and pro- vide helpful suggestions. SEE ALSO diff --git a/postfix/html/verify.8.html b/postfix/html/verify.8.html index 1fff6a97b..5ae80c147 100644 --- a/postfix/html/verify.8.html +++ b/postfix/html/verify.8.html @@ -72,8 +72,8 @@ VERIFY(8) VERIFY(8) principle. CONFIGURATION PARAMETERS - Changes to main.cf are not picked up automatically, as verify(8) pro‐ - cesses are long-lived. Use the command "postfix reload" after a config‐ + Changes to main.cf are not picked up automatically, as verify(8) pro- + cesses are long-lived. Use the command "postfix reload" after a config- uration change. The text below provides only a parameter summary. See postconf(5) for @@ -116,7 +116,7 @@ VERIFY(8) VERIFY(8) Available with Postfix 2.7 and later: address_verify_cache_cleanup_interval (12h) - The amount of time between verify(8) address verification data‐ + The amount of time between verify(8) address verification data- base cleanup runs. PROBE MESSAGE ROUTING CONTROLS @@ -125,15 +125,15 @@ VERIFY(8) VERIFY(8) message routing mechanisms. address_verify_relayhost ($relayhost) - Overrides the relayhost parameter setting for address verifica‐ + Overrides the relayhost parameter setting for address verifica- tion probes. address_verify_transport_maps ($transport_maps) - Overrides the transport_maps parameter setting for address veri‐ + Overrides the transport_maps parameter setting for address veri- fication probes. address_verify_local_transport ($local_transport) - Overrides the local_transport parameter setting for address ver‐ + Overrides the local_transport parameter setting for address ver- ification probes. address_verify_virtual_transport ($virtual_transport) @@ -141,7 +141,7 @@ VERIFY(8) VERIFY(8) verification probes. address_verify_relay_transport ($relay_transport) - Overrides the relay_transport parameter setting for address ver‐ + Overrides the relay_transport parameter setting for address ver- ification probes. address_verify_default_transport ($default_transport) @@ -150,15 +150,15 @@ VERIFY(8) VERIFY(8) Available in Postfix 2.3 and later: - address_verify_sender_dependent_relayhost_maps ($sender_depen‐‐ - dent_relayhost_maps) + address_verify_sender_dependent_relayhost_maps ($sender_depen- + dent_relayhost_maps) Overrides the sender_dependent_relayhost_maps parameter setting for address verification probes. Available in Postfix 2.7 and later: - address_verify_sender_dependent_default_transport_maps ($sender_depen‐‐ - dent_default_transport_maps) + address_verify_sender_dependent_default_transport_maps ($sender_depen- + dent_default_transport_maps) Overrides the sender_dependent_default_transport_maps parameter setting for address verification probes. @@ -166,12 +166,12 @@ VERIFY(8) VERIFY(8) Preliminary SMTPUTF8 support is introduced with Postfix 2.12. smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci‐ + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con‐ + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) @@ -196,7 +196,7 @@ VERIFY(8) VERIFY(8) syslog_name (see 'postconf -d' output) The mail system name that is prepended to the process name in - syslog records, so that "smtpd" becomes, for example, "post‐ + syslog records, so that "smtpd" becomes, for example, "post- fix/smtpd". SEE ALSO diff --git a/postfix/man/man5/pcre_table.5 b/postfix/man/man5/pcre_table.5 index c70cc6f53..4068423b3 100644 --- a/postfix/man/man5/pcre_table.5 +++ b/postfix/man/man5/pcre_table.5 @@ -11,6 +11,10 @@ format of Postfix PCRE tables \fBpostmap -q "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR \fBpostmap -q - pcre:/etc/postfix/\fIfilename\fB <\fIinputfile\fR + +\fBpostmap -hmq - pcre:/etc/postfix/\fIfilename\fB <\fIinputfile\fR + +\fBpostmap -bmq - pcre:/etc/postfix/\fIfilename\fB <\fIinputfile\fR .SH DESCRIPTION .ad .fi @@ -26,8 +30,11 @@ corresponding result is returned and the search is terminated. To find out what types of lookup tables your Postfix system supports use the "\fBpostconf -m\fR" command. -To test lookup tables, use the "\fBpostmap -q\fR" command as -described in the SYNOPSIS above. +To test lookup tables, use the "\fBpostmap -q\fR" command +as described in the SYNOPSIS above. Use "\fBpostmap -hmq +-\fR <\fIfile\fR" for header_checks(5) patterns, and +"\fBpostmap -bmq -\fR <\fIfile\fR" for body_checks(5) +(Postfix 2.6 and later). .SH "COMPATIBILITY" .na .nf diff --git a/postfix/man/man5/regexp_table.5 b/postfix/man/man5/regexp_table.5 index 2d3385e81..ac0fe4f41 100644 --- a/postfix/man/man5/regexp_table.5 +++ b/postfix/man/man5/regexp_table.5 @@ -27,7 +27,10 @@ To find out what types of lookup tables your Postfix system supports use the "\fBpostconf -m\fR" command. To test lookup tables, use the "\fBpostmap -q\fR" command -as described in the SYNOPSIS above. +as described in the SYNOPSIS above. Use "\fBpostmap -hmq +-\fR <\fIfile\fR" for header_checks(5) patterns, and +"\fBpostmap -bmq -\fR <\fIfile\fR" for body_checks(5) +(Postfix 2.6 and later). .SH "COMPATIBILITY" .na .nf diff --git a/postfix/proto/MILTER_README.html b/postfix/proto/MILTER_README.html index ba30ad050..626f229e1 100644 --- a/postfix/proto/MILTER_README.html +++ b/postfix/proto/MILTER_README.html @@ -285,9 +285,8 @@ applications (not "postfix", not "www", etc.).

    Configuring Postfix

    Like Sendmail, Postfix has a lot of configuration options that -control how it talks to Milter applications. With the initial Postfix -Milter protocol implementation, many options are global, that is, -they apply to all Milter applications. Future Postfix versions may +control how it talks to Milter applications. Besides global options +that apply to all Milter applications, Postfix 2.12 and later support per-Milter timeouts, per-Milter error handling, etc.

    Information in this section:

    @@ -304,6 +303,9 @@ support per-Milter timeouts, per-Milter error handling, etc.

  • Milter protocol timeouts +
  • Different settings for different Milter +applications +
  • Sendmail macro emulation @@ -449,6 +451,9 @@ in the "hold" queue, and is available with Postfix 2.6 or later. +

    See "Different settings for different +Milter applications" for advanced configuration options.

    +

    Milter protocol version

    As Postfix is not built with the Sendmail libmilter library, @@ -499,6 +504,9 @@ number. Postfix 2.8 and later will automatically turn off protocol features that the application's libmilter library does not expect.

    +

    See "Different settings for different +Milter applications" for advanced configuration options.

    +

    Milter protocol timeouts

    Postfix uses different time limits at different Milter protocol @@ -532,6 +540,52 @@ too much, remote SMTP clients may hang up and mail may be delivered multiple times. This is an inherent problem with before-queue filtering.

    +

    See "Different settings for different +Milter applications" for advanced configuration options.

    + +

    Different settings for different Milter +applications

    + +

    The previous sections list a number of Postfix main.cf parameters +that control time limits and other settings for all Postfix Milter +clients. This is sufficient for simple configurations. With more +complex configurations it becomes desirable to have different +settings for different Milter clients. This is supported with Postfix +2.12 and later.

    + +

    The following example shows a "non-critical" Milter client with +a short connect timeout, and with "accept" as default action when +the service is unvailable.

    + +
    +
    +1 /etc/postfix/main.cf:
+2     smtpd_milters = { inet:host:port,
+3         connect_timeout=10s, default_action=accept }
+
    +
    + +

    Instead of a server endpoint, we now have a list enclosed in {}.

    + + + +

    Inside the list, syntax is similar to what we already know from +main.cf: items separated by space or comma. There is one difference: +you must enclose a setting in parentheses, as in "{ name = value +}", if you want to have space within a value or around "=". +

    +

    Sendmail macro emulation

    Postfix emulates a limited number of Sendmail macros, as shown diff --git a/postfix/proto/Makefile.in b/postfix/proto/Makefile.in index c7a9f8ea9..32049443b 100644 --- a/postfix/proto/Makefile.in +++ b/postfix/proto/Makefile.in @@ -102,7 +102,7 @@ AWK = awk '{ print; if (NR == 1) print ".pl 9999\n.ll 65" }' SRCTOMAN= ../mantools/srctoman POSTLINK= ../mantools/postlink DETAB = pr -tre -NROFF = GROFF_NO_SGR=1 nroff +NROFF = LANG=C GROFF_NO_SGR=1 nroff HT2READ = ../mantools/html2readme MAKEAAA = ../mantools/makereadme MAKESOHO= ../mantools/make_soho_readme diff --git a/postfix/proto/SMTPD_POLICY_README.html b/postfix/proto/SMTPD_POLICY_README.html index f425863fc..e874c5598 100644 --- a/postfix/proto/SMTPD_POLICY_README.html +++ b/postfix/proto/SMTPD_POLICY_README.html @@ -47,7 +47,9 @@ multiple times, for up to $max_use incoming SMTP connections.

  • Policy protocol description -
  • Policy client/server configuration +
  • Simple policy client/server configuration + +
  • Advanced policy client configuration
  • Example: greylist policy server @@ -229,7 +231,7 @@ the request permanently.

    Instead the server must log a warning and disconnect. Postfix will retry the request at some later time.

    -

    Policy client/server configuration

    +

    Simple policy client/server configuration

    The Postfix delegated policy client can connect to a TCP socket or to a UNIX-domain socket. Examples:

    @@ -380,6 +382,67 @@ examples, the service name is "policy" or "127.0.0.1:9998".

    +

    Advanced policy client configuration

    + +

    The previous section lists a number of Postfix main.cf parameters +that control time limits and other settings for all policy clients. +This is sufficient for simple configurations. With more complex +configurations it becomes desirable to have different settings per +policy client. This is supported with Postfix 2.12 and later.

    + +

    The following example shows a "non-critical" policy service +with a short timeout, and with "DUNNO" as default action when the +service is unvailable. The "DUNNO" action causes Postfix to ignore +the result.

    + +
    +
    +1 /etc/postfix/main.cf:
+2     smtpd_recipient_restrictions = 
+3         ...
+4         reject_unauth_destination
+5         check_policy_service { inet:host:port, 
+6             timeout=10s, default_action=DUNNO }
+8         ...
+
    +
    + +

    Instead of a server endpoint, we now have a list enclosed in {}.

    + + + +

    Inside the list, syntax is similar to what we already know from +main.cf: items separated by space or comma. There is one difference: +you must enclose a setting in parentheses, as in "{ name = value +}", if you want to have space within a value or around "=". +This comes in handy when different policy servers require different +default actions with different SMTP status codes or text:

    + +
    +
    +1 /etc/postfix/main.cf:
+2     smtpd_recipient_restrictions = 
+3         ...
+4         reject_unauth_destination
+5         check_policy_service {
+6           inet:host:port1, 
+7           { default_action = 451 4.3.5 See http://www.example.com/support1 }
+8         } 
+9         ...
+
    +
    +

    Example: greylist policy server

    Greylisting is a defense against junk email that is described at diff --git a/postfix/proto/pcre_table b/postfix/proto/pcre_table index 0afeb346e..e49621193 100644 --- a/postfix/proto/pcre_table +++ b/postfix/proto/pcre_table @@ -7,6 +7,10 @@ # \fBpostmap -q "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR # # \fBpostmap -q - pcre:/etc/postfix/\fIfilename\fB <\fIinputfile\fR +# +# \fBpostmap -hmq - pcre:/etc/postfix/\fIfilename\fB <\fIinputfile\fR +# +# \fBpostmap -bmq - pcre:/etc/postfix/\fIfilename\fB <\fIinputfile\fR # DESCRIPTION # The Postfix mail system uses optional tables for address # rewriting, mail routing, or access control. These tables @@ -20,9 +24,12 @@ # To find out what types of lookup tables your Postfix system # supports use the "\fBpostconf -m\fR" command. # -# To test lookup tables, use the "\fBpostmap -q\fR" command as -# described in the SYNOPSIS above. -# COMPATIBILITY +# To test lookup tables, use the "\fBpostmap -q\fR" command +# as described in the SYNOPSIS above. Use "\fBpostmap -hmq +# -\fR <\fIfile\fR" for header_checks(5) patterns, and +# "\fBpostmap -bmq -\fR <\fIfile\fR" for body_checks(5) +# (Postfix 2.6 and later). +# COMPATIBILITY # .ad # .fi # With Postfix version 2.2 and earlier specify "\fBpostmap diff --git a/postfix/proto/regexp_table b/postfix/proto/regexp_table index b448ff101..79078d927 100644 --- a/postfix/proto/regexp_table +++ b/postfix/proto/regexp_table @@ -21,7 +21,10 @@ # supports use the "\fBpostconf -m\fR" command. # # To test lookup tables, use the "\fBpostmap -q\fR" command -# as described in the SYNOPSIS above. +# as described in the SYNOPSIS above. Use "\fBpostmap -hmq +# -\fR <\fIfile\fR" for header_checks(5) patterns, and +# "\fBpostmap -bmq -\fR <\fIfile\fR" for body_checks(5) +# (Postfix 2.6 and later). # COMPATIBILITY # .ad # .fi diff --git a/postfix/src/global/Makefile.in b/postfix/src/global/Makefile.in index 6eccdadea..dcedc08a3 100644 --- a/postfix/src/global/Makefile.in +++ b/postfix/src/global/Makefile.in @@ -33,7 +33,7 @@ SRCS = abounce.c anvil_clnt.c been_here.c bounce.c bounce_log.c \ smtp_reply_footer.c safe_ultostr.c verify_sender_addr.c \ dict_memcache.c mail_version.c memcache_proto.c server_acl.c \ mkmap_fail.c haproxy_srvr.c dsn_filter.c dynamicmaps.c uxtext.c \ - smtputf8.c + smtputf8.c mail_conf_over.c OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \ canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ @@ -68,7 +68,7 @@ OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \ smtp_reply_footer.o safe_ultostr.o verify_sender_addr.o \ dict_memcache.o mail_version.o memcache_proto.o server_acl.o \ mkmap_fail.o haproxy_srvr.o dsn_filter.o dynamicmaps.o uxtext.o \ - smtputf8.o $(NON_PLUGIN_MAP_OBJ) + smtputf8.o attr_override.o $(NON_PLUGIN_MAP_OBJ) # MAP_OBJ is for maps that may be dynamically loaded with dynamicmaps.cf. # When hard-linking these maps, makedefs sets NON_PLUGIN_MAP_OBJ=$(MAP_OBJ), # otherwise it sets the PLUGIN_* macros. @@ -100,7 +100,8 @@ HDRS = abounce.h anvil_clnt.h been_here.h bounce.h bounce_log.h \ fold_addr.h header_body_checks.h data_redirect.h match_service.h \ addr_match_list.h smtp_reply_footer.h safe_ultostr.h \ verify_sender_addr.h dict_memcache.h memcache_proto.h server_acl.h \ - haproxy_srvr.h dsn_filter.h dynamicmaps.h uxtext.h smtputf8.h + haproxy_srvr.h dsn_filter.h dynamicmaps.h uxtext.h smtputf8.h \ + attr_override.h TESTSRC = rec2stream.c stream2rec.c recdump.c DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE) CFLAGS = $(DEBUG) $(OPT) $(DEFS) @@ -693,6 +694,15 @@ anvil_clnt.o: anvil_clnt.c anvil_clnt.o: anvil_clnt.h anvil_clnt.o: mail_params.h anvil_clnt.o: mail_proto.h +attr_override.o: ../../include/msg.h +attr_override.o: ../../include/stringops.h +attr_override.o: ../../include/sys_defs.h +attr_override.o: ../../include/vbuf.h +attr_override.o: ../../include/vstring.h +attr_override.o: attr_override.c +attr_override.o: attr_override.h +attr_override.o: conv_time.h +attr_override.o: mail_conf.h been_here.o: ../../include/htable.h been_here.o: ../../include/msg.h been_here.o: ../../include/mymalloc.h diff --git a/postfix/src/global/attr_override.c b/postfix/src/global/attr_override.c new file mode 100644 index 000000000..4cc19c930 --- /dev/null +++ b/postfix/src/global/attr_override.c @@ -0,0 +1,205 @@ +/*++ +/* NAME +/* attr_override 3 +/* SUMMARY +/* apply name=value settings from string +/* SYNOPSIS +/* #include +/* +/* void attr_override(bp, delimiters, parens, ... ATTR_OVER_END); +/* char *bp; +/* const char *delimiters; +/* const char *parens; +/* DESCRIPTION +/* This routine updates the values of known in-memory variables +/* based on the name=value specifications from an input string. +/* The input format supports parentheses around name=value to +/* allow whitespace around "=" and within values. +/* +/* This may be used, for example, with client endpoint +/* specifications or with policy tables to allow selective +/* overrides of global main.cf parameter settings (timeouts, +/* fall-back policies, etc.). +/* +/* Arguments: +/* .IP bp +/* Pointer to input string. The input is modified. +/* .IP "delimiters, parens" +/* See mystrtok(3) for description. Typical values are +/* ", \\t\\r\\n" and "{}", respectively. +/* .PP +/* The parens argument is followed by a list of (key, value, +/* value) argument triples. Each key may appear only once. +/* The list must be terminated with ATTR_OVER_END. The following +/* describes the keys and the expected values. +/* .IP "ATTR_OVER_STR_TABLE, const ATTR_OVER_STR *, CONST_CHAR_STAR *" +/* The second argument specifies a null-terminated table with +/* attribute names and their range limits which should be the +/* same as for the corresponding main.cf parameters. The +/* third argument specifies a parallel table with assignment +/* targets. The result strings are NOT copied. +/* .IP "ATTR_OVER_TIME_TABLE, const ATTR_OVER_TIME *, int *" +/* The second argument specifies a null-terminated table with +/* attribute names, their default time units (leading digits +/* are skipped), and their range limits which should be the +/* same as for the corresponding main.cf parameters. The +/* third argument specifies a parallel table with assignment +/* targets. +/* .IP "ATTR_OVER_INT_TABLE, const ATTR_OVER_INT *, int *" +/* The second argument specifies a null-terminated table with +/* attribute names and their range limits which should be the +/* same as for the corresponding main.cf parameters. The +/* third argument specifies a parallel table with assignment +/* targets. +/* BUGS +/* Parallel tables may be inelegant, but the alternative (static +/* allocation of target variables) is worse. +/* SEE ALSO +/* mystrtok(3), safe tokenizer +/* extpar(3), extract text from parentheses +/* split_nameval(3), name-value splitter +/* DIAGNOSTICS +/* Panic: interface violations. +/* +/* Fatal errors: memory allocation problem, syntax error, +/* out-of-range error. +/* LICENSE +/* .ad +/* .fi +/* The Secure Mailer license must be distributed with this software. +/* AUTHOR(S) +/* Wietse Venema +/* IBM T.J. Watson Research +/* P.O. Box 704 +/* Yorktown Heights, NY 10598, USA +/*--*/ + + /* + * System library. + */ +#include +#include +#include +#include /* strtol() */ + + /* + * Utility library. + */ +#include +#include + + /* + * Global library. + */ +#include +#include +#include + +/* attr_override - apply settings from list of attribute=value pairs */ + +void attr_override(char *cp, const char *sep, const char *parens,...) +{ + const char myname[] = "attr_override"; + va_list ap; + int idx; + char *nameval; + const ATTR_OVER_INT *int_table = 0; + const ATTR_OVER_STR *str_table = 0; + const ATTR_OVER_TIME *time_table = 0; + int *int_tgts = 0; + CONST_CHAR_STAR *str_tgts = 0; + int *time_tgts = 0; + + /* + * Get the lookup tables and assignment targets. + */ + va_start(ap, parens); + while ((idx = va_arg(ap, int)) != 0) { + switch (idx) { + case ATTR_OVER_INT_TABLE: + if (int_table) + msg_panic("%s: multiple ATTR_OVER_INT_TABLE", myname); + int_table = va_arg(ap, const ATTR_OVER_INT *); + int_tgts = va_arg(ap, int *); + break; + case ATTR_OVER_STR_TABLE: + if (str_table) + msg_panic("%s: multiple ATTR_OVER_STR_TABLE", myname); + str_table = va_arg(ap, const ATTR_OVER_STR *); + str_tgts = va_arg(ap, CONST_CHAR_STAR *); + break; + case ATTR_OVER_TIME_TABLE: + if (time_table) + msg_panic("%s: multiple ATTR_OVER_TIME_TABLE", myname); + time_table = va_arg(ap, const ATTR_OVER_TIME *); + time_tgts = va_arg(ap, int *); + break; + default: + msg_panic("%s: unknown argument type: %d", myname, idx); + } + } + va_end(ap); + + /* + * Process each attribute=value override in the input string. + */ + while ((nameval = mystrtokq(&cp, sep, parens)) != 0) { + int found = 0; + char *key; + char *value; + const char *err; + const ATTR_OVER_INT *ip; + const ATTR_OVER_STR *sp; + const ATTR_OVER_TIME *tp; + int int_val; + int def_unit; + char *end; + long longval; + + /* + * Split into name and value. + */ + /* { name = value } */ + if (*nameval == parens[0] + && (err = extpar(&nameval, parens, EXPAR_FLAG_NONE)) != 0) + msg_fatal("%s in \"%s\"", err, nameval); + if ((err = split_nameval(nameval, &key, &value)) != 0) + msg_fatal("malformed option: %s: \"...%s...\"", err, nameval); + + /* + * Look up the name and apply the value. + */ + for (sp = str_table; sp != 0 && found == 0 && sp->name != 0; sp++) { + if (strcmp(sp->name, key) != 0) + continue; + check_mail_conf_str(sp->name, value, sp->min, sp->max); + str_tgts[sp - str_table] = value; + found = 1; + } + for (ip = int_table; ip != 0 && found == 0 && ip->name != 0; ip++) { + if (strcmp(ip->name, key) != 0) + continue; + /* XXX Duplicated from mail_conf_int(3). */ + errno = 0; + int_val = longval = strtol(value, &end, 10); + if (*value == 0 || *end != 0 || errno == ERANGE + || longval != int_val) + msg_fatal("bad numerical configuration: %s = %s", key, value); + check_mail_conf_int(key, int_val, ip->min, ip->max); + int_tgts[ip - int_table] = int_val; + found = 1; + } + for (tp = time_table; tp != 0 && found == 0 && tp->name != 0; tp++) { + if (strcmp(tp->name, key) != 0) + continue; + def_unit = tp->defval[strspn(tp->defval, "0123456789")]; + if (conv_time(value, &int_val, def_unit) == 0) + msg_fatal("%s: bad time value or unit: %s", key, value); + check_mail_conf_time(key, int_val, tp->min, tp->max); + time_tgts[tp - time_table] = int_val; + found = 1; + } + if (found == 0) + msg_fatal("unknown option: \"%s = %s\"", key, value); + } +} diff --git a/postfix/src/global/attr_override.h b/postfix/src/global/attr_override.h new file mode 100644 index 000000000..e04df1040 --- /dev/null +++ b/postfix/src/global/attr_override.h @@ -0,0 +1,56 @@ +#ifndef _ATTR_OVERRIDE_H_INCLUDED_ +#define _ATTR_OVERRIDE_H_INCLUDED_ + +/*++ +/* NAME +/* attr_override 3h +/* SUMMARY +/* apply name=value settings from string +/* SYNOPSIS +/* #include +/* DESCRIPTION +/* .nf + + /* + * External interface. + */ +extern void attr_override(char *, const char *, const char *,...); + +typedef const char *CONST_CHAR_STAR; + +typedef struct { + const char *name; + int min; + int max; +} ATTR_OVER_STR; + +typedef struct { + const char *name; + const char *defval; + int min; + int max; +} ATTR_OVER_TIME; + +typedef struct { + const char *name; + int min; + int max; +} ATTR_OVER_INT; + +#define ATTR_OVER_END 0 +#define ATTR_OVER_STR_TABLE 1 +#define ATTR_OVER_TIME_TABLE 2 +#define ATTR_OVER_INT_TABLE 3 + +/* LICENSE +/* .ad +/* .fi +/* The Secure Mailer license must be distributed with this software. +/* AUTHOR(S) +/* Wietse Venema +/* IBM T.J. Watson Research +/* P.O. Box 704 +/* Yorktown Heights, NY 10598, USA +/*--*/ + +#endif diff --git a/postfix/src/global/mail_conf.h b/postfix/src/global/mail_conf.h index ea6e8bd25..f4879a1e9 100644 --- a/postfix/src/global/mail_conf.h +++ b/postfix/src/global/mail_conf.h @@ -60,6 +60,9 @@ extern int get_mail_conf_int2(const char *, const char *, int, int, int); extern long get_mail_conf_long2(const char *, const char *, long, long, long); extern int get_mail_conf_time2(const char *, const char *, int, int, int, int); extern int get_mail_conf_nint2(const char *, const char *, int, int, int); +extern void check_mail_conf_str(const char *, const char *, int, int); +extern void check_mail_conf_time(const char *, int, int, int); +extern void check_mail_conf_int(const char *, int, int, int); /* * Lookup with function-call defaults. diff --git a/postfix/src/global/mail_conf_int.c b/postfix/src/global/mail_conf_int.c index 7e944a436..afcfaca22 100644 --- a/postfix/src/global/mail_conf_int.c +++ b/postfix/src/global/mail_conf_int.c @@ -34,6 +34,12 @@ /* int defval; /* int min; /* int max; +/* +/* void check_mail_conf_int(name, intval, min, max) +/* const char *name; +/* int intval; +/* int min; +/* int max; /* DESCRIPTION /* This module implements configuration parameter support /* for integer values. @@ -59,6 +65,9 @@ /* /* get_mail_conf_int2() concatenates the two names and is otherwise /* identical to get_mail_conf_int(). +/* +/* check_mail_conf_int() exits with a fatal run-time error +/* when the integer value does not meet its requirements. /* DIAGNOSTICS /* Fatal errors: malformed numerical value. /* SEE ALSO @@ -113,7 +122,7 @@ static int convert_mail_conf_int(const char *name, int *intval) /* check_mail_conf_int - validate integer value */ -static void check_mail_conf_int(const char *name, int intval, int min, int max) +void check_mail_conf_int(const char *name, int intval, int min, int max) { if (min && intval < min) msg_fatal("invalid %s parameter value %d < %d", name, intval, min); diff --git a/postfix/src/global/mail_conf_str.c b/postfix/src/global/mail_conf_str.c index 8d8288ce3..d8e0bd100 100644 --- a/postfix/src/global/mail_conf_str.c +++ b/postfix/src/global/mail_conf_str.c @@ -34,6 +34,12 @@ /* const char *defval; /* int min; /* int max; +/* +/* void check_mail_conf_str(name, strval, min, max) +/* const char *name; +/* const char *strval; +/* int min; +/* int max; /* DESCRIPTION /* This module implements support for string-valued global /* configuration parameters. @@ -59,6 +65,9 @@ /* /* get_mail_conf_str2() concatenates the two names and is otherwise /* identical to get_mail_conf_str(). +/* +/* check_mail_conf_str() exits with a fatal run-time error +/* when the string does not meet its length requirements. /* DIAGNOSTICS /* Fatal errors: bad string length. /* SEE ALSO @@ -92,8 +101,8 @@ /* check_mail_conf_str - validate string length */ -static void check_mail_conf_str(const char *name, const char *strval, - int min, int max) +void check_mail_conf_str(const char *name, const char *strval, + int min, int max) { ssize_t len = strlen(strval); diff --git a/postfix/src/global/mail_conf_time.c b/postfix/src/global/mail_conf_time.c index a8fa72f3e..96effbd2c 100644 --- a/postfix/src/global/mail_conf_time.c +++ b/postfix/src/global/mail_conf_time.c @@ -30,6 +30,12 @@ /* int def_unit; /* int min; /* int max; +/* +/* void check_mail_conf_time(name, intval, min, max) +/* const char *name; +/* int intval; +/* int min; +/* int max; /* DESCRIPTION /* This module implements configuration parameter support /* for time interval values. The conversion routines understand @@ -52,6 +58,9 @@ /* get_mail_conf_time_table() and get_mail_conf_time_fn_table() initialize /* lists of variables, as directed by their table arguments. A table /* must be terminated by a null entry. +/* +/* check_mail_conf_time() terminates the program with a fatal +/* runtime error when the time does not meet its requirements. /* DIAGNOSTICS /* Fatal errors: malformed numerical value, unknown time unit. /* BUGS @@ -105,7 +114,7 @@ static int convert_mail_conf_time(const char *name, int *intval, int def_unit) /* check_mail_conf_time - validate integer value */ -static void check_mail_conf_time(const char *name, int intval, int min, int max) +void check_mail_conf_time(const char *name, int intval, int min, int max) { if (min && intval < min) msg_fatal("invalid %s: %d (min %d)", name, intval, min); @@ -151,7 +160,7 @@ int get_mail_conf_time(const char *name, const char *defval, int min, int ma /* get_mail_conf_time2 - evaluate integer-valued configuration variable */ int get_mail_conf_time2(const char *name1, const char *name2, - int defval, int def_unit, int min, int max) + int defval, int def_unit, int min, int max) { int intval; char *name; @@ -179,7 +188,7 @@ void set_mail_conf_time_int(const char *name, int value) { char buf[BUFSIZ]; /* yeah! crappy code! */ - sprintf(buf, "%ds", value); /* yeah! more crappy code! */ + sprintf(buf, "%ds", value); /* yeah! more crappy code! */ mail_conf_update(name, buf); } diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 07cfd0b54..d922e2262 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20140924" +#define MAIL_RELEASE_DATE "20140928" #define MAIL_VERSION_NUMBER "2.12" #ifdef SNAPSHOT diff --git a/postfix/src/master/master_ent.c b/postfix/src/master/master_ent.c index b1044f8a6..f657a60fa 100644 --- a/postfix/src/master/master_ent.c +++ b/postfix/src/master/master_ent.c @@ -259,6 +259,7 @@ MASTER_SERV *get_master_ent() char *atmp; const char *parse_err; static char *saved_interfaces = 0; + char *err; if (master_fp == 0) msg_panic("get_master_ent: config file not open"); @@ -551,8 +552,12 @@ MASTER_SERV *get_master_ent() argv_add(serv->args, "-s", vstring_str(vstring_sprintf(junk, "%d", serv->listen_fd_count)), (char *) 0); - while ((cp = mystrtok(&bufp, master_blanks)) != 0) + while ((cp = mystrtokq(&bufp, master_blanks, "{}")) != 0) { + if (*cp == '{' && (err = extpar(&cp, "{}", EXPAR_FLAG_STRIP)) != 0) + msg_fatal("%s: line %d: %s", + VSTREAM_PATH(master_fp), master_line, err); argv_add(serv->args, cp, (char *) 0); + } argv_terminate(serv->args); /* diff --git a/postfix/src/milter/Makefile.in b/postfix/src/milter/Makefile.in index 2266d18aa..0fccb8ff6 100644 --- a/postfix/src/milter/Makefile.in +++ b/postfix/src/milter/Makefile.in @@ -83,6 +83,8 @@ depend: $(MAKES) milter.o: ../../include/argv.h milter.o: ../../include/attr.h milter.o: ../../include/iostuff.h +milter.o: ../../include/mail_conf.h +milter.o: ../../include/mail_params.h milter.o: ../../include/mail_proto.h milter.o: ../../include/msg.h milter.o: ../../include/mymalloc.h diff --git a/postfix/src/milter/milter.c b/postfix/src/milter/milter.c index f912add48..78bad8dc8 100644 --- a/postfix/src/milter/milter.c +++ b/postfix/src/milter/milter.c @@ -244,6 +244,8 @@ #include #include #include +#include +#include /* Postfix Milter library. */ @@ -532,6 +534,33 @@ void milter_disc_event(MILTERS *milters) m->disc_event(m); } + /* + * Table-driven parsing of main.cf parameter overrides for specific Milters. + * We derive the override names from the corresponding main.cf parameter + * names by skipping the redundant "milter_" prefix. + * + * To avoid ugly static allocation of assignment targets, we use stack-based + * parallel arrays which is less inelegant. + */ +static const ATTR_OVER_TIME time_table[] = { + 7 + VAR_MILT_CONN_TIME, DEF_MILT_CONN_TIME, 1, 0, + 7 + VAR_MILT_CMD_TIME, DEF_MILT_CMD_TIME, 1, 0, + 7 + VAR_MILT_MSG_TIME, DEF_MILT_MSG_TIME, 1, 0, + 0, +}; +static const ATTR_OVER_STR str_table[] = { + 7 + VAR_MILT_PROTOCOL, 1, 0, + 7 + VAR_MILT_DEF_ACTION, 1, 0, + 0, +}; + +#define conn_timeout_override time_tgts[0] +#define cmd_timeout_override time_tgts[1] +#define msg_timeout_override time_tgts[2] + +#define protocol_override str_tgts[0] +#define action_override str_tgts[1] + /* milter_new - create milter list */ MILTERS *milter_new(const char *names, @@ -548,19 +577,53 @@ MILTERS *milter_new(const char *names, char *name; MILTER *milter; const char *sep = ", \t\r\n"; + const char *parens = "{}"; + int time_tgts[sizeof(time_table) / sizeof(time_table[0])]; + const char *str_tgts[sizeof(str_table) / sizeof(str_table[0])]; /* * Parse the milter list. */ milters = (MILTERS *) mymalloc(sizeof(*milters)); - if (names != 0) { + if (names != 0 && *names != 0) { char *saved_names = mystrdup(names); char *cp = saved_names; + char *name_override; + char *op; + char *err; - while ((name = mystrtok(&cp, sep)) != 0) { - milter = milter8_create(name, conn_timeout, cmd_timeout, - msg_timeout, protocol, def_action, - milters); + /* + * Instantiate Milters, allowing for per-Milter overrides. + */ + while ((name = mystrtokq(&cp, sep, parens)) != 0) { + if (name[0] == '{') { /* } */ + op = name; + if ((err = extpar(&op, parens, EXPAR_FLAG_NONE)) != 0) + msg_fatal("milter service syntax error: %s", err); + if ((name_override = mystrtok(&op, sep)) == 0) { + msg_fatal("empty milter definition: \"%s\"", name); + } else { + conn_timeout_override = conn_timeout; + cmd_timeout_override = cmd_timeout; + msg_timeout_override = msg_timeout; + protocol_override = protocol; + action_override = def_action; + attr_override(op, sep, parens, + ATTR_OVER_STR_TABLE, str_table, str_tgts, + ATTR_OVER_TIME_TABLE, time_table, time_tgts, + 0); + milter = milter8_create(name_override, + conn_timeout_override, + cmd_timeout_override, + msg_timeout_override, + protocol_override, + action_override, milters); + } + } else { + milter = milter8_create(name, conn_timeout, cmd_timeout, + msg_timeout, protocol, def_action, + milters); + } if (head == 0) { head = milter; } else { diff --git a/postfix/src/milter/milter8.c b/postfix/src/milter/milter8.c index 5941c5aa6..74a50e873 100644 --- a/postfix/src/milter/milter8.c +++ b/postfix/src/milter/milter8.c @@ -2820,7 +2820,7 @@ static MILTER8 *milter8_alloc(const char *name, int conn_timeout, MILTER8 *milter; /* - * Fill in the structure. + * Fill in the structure. Note: all strings must be copied. */ milter = (MILTER8 *) mymalloc(sizeof(*milter)); milter->m.name = mystrdup(name); diff --git a/postfix/src/postconf/Makefile.in b/postfix/src/postconf/Makefile.in index 6c885cc35..53a74d921 100644 --- a/postfix/src/postconf/Makefile.in +++ b/postfix/src/postconf/Makefile.in @@ -49,7 +49,7 @@ tests: test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 \ test22 test23 test24 test25 test26 test27 test28 test29 test30 test4b \ test31 test32 test33 test34 test35 test36 test37 test39 test40 test41 \ test42 test43 test44 test45 test46 test47 test48 test49 test50 test51 \ - test52 test53 test54 test55 test56 test57 test58 + test52 test53 test54 test55 test56 test57 test58 test59 root_tests: @@ -789,6 +789,22 @@ test58: $(PROG) test58.ref diff test58.ref test58.tmp rm -f main.cf master.cf test58.tmp +test59: $(PROG) test59.ref + rm -f main.cf master.cf + touch main.cf master.cf + echo foo unix - n n - 0 other >> master.cf + echo bar inet - n n 0 0 other >> master.cf + echo " -o name1=value1" >> master.cf + echo " -o { name2 = value2a value2b }" >> master.cf + echo " { arg1a arg1b }" >> master.cf + echo " { arg2a arg2b }x" >> master.cf + echo " { arg3a arg3b " >> master.cf + echo baz unix - n n 0 0 other >> master.cf + touch -t 197101010000 main.cf + $(SHLIB_ENV) ./$(PROG) -Mfc. >test59.tmp 2>&1 || true + diff test59.ref test59.tmp + rm -f main.cf master.cf test59.tmp + printfck: $(OBJS) $(PROG) rm -rf printfck mkdir printfck diff --git a/postfix/src/postconf/postconf_dbms.c b/postfix/src/postconf/postconf_dbms.c index 1b0b6f56c..2f747912f 100644 --- a/postfix/src/postconf/postconf_dbms.c +++ b/postfix/src/postconf/postconf_dbms.c @@ -55,6 +55,7 @@ #include #include #include +#include /* Global library. */ @@ -151,11 +152,11 @@ static void pcf_register_dbms_helper(char *str_value, PCF_MASTER_ENT *local_scope) { const PCF_DBMS_INFO *dp; - size_t len; char *db_type; char *prefix; static VSTRING *candidate = 0; const char **cpp; + char *err; /* * Naive parsing. We don't really know if this substring specifies a @@ -179,31 +180,19 @@ static void pcf_register_dbms_helper(char *str_value, * local or global namespace. */ if (prefix != 0 && *prefix != '/' && *prefix != '.') { - if (*prefix == '{') { - if ((len = balpar(prefix, "{}")) > 0) { - if (prefix[len] != 0) { - /* XXX Encapsulate this in pcf_warn() function. */ - if (local_scope) - msg_warn("%s:%s: syntax error after '}' in \"%s:%s\"", - MASTER_CONF_FILE, local_scope->name_space, - db_type, prefix); - else - msg_warn("%s: syntax error after '}' in \"%s:%s\"", - MAIN_CONF_FILE, db_type, prefix); - } - prefix[len - 1] = 0; - pcf_register_dbms_helper(prefix + 1, flag_parameter, - local_scope); - } else { + if (*prefix == '{') { /* } */ + if ((err = extpar(&prefix, "{}", EXPAR_FLAG_NONE)) != 0) { /* XXX Encapsulate this in pcf_warn() function. */ if (local_scope) - msg_warn("%s:%s: missing '}' in parameter value: \"%s:%s\"", + msg_warn("%s:%s: %s", MASTER_CONF_FILE, local_scope->name_space, - db_type, prefix); + err); else - msg_warn("%s: missing '}' in parameter value: \"%s:%s\"", - MAIN_CONF_FILE, db_type, prefix); + msg_warn("%s: %s", MAIN_CONF_FILE, err); + myfree(err); } + pcf_register_dbms_helper(prefix, flag_parameter, + local_scope); } else { for (dp = pcf_dbms_info; dp->db_type != 0; dp++) { if (strcmp(db_type, dp->db_type) == 0) { diff --git a/postfix/src/postconf/postconf_edit.c b/postfix/src/postconf/postconf_edit.c index 41e0b7926..4781c46f4 100644 --- a/postfix/src/postconf/postconf_edit.c +++ b/postfix/src/postconf/postconf_edit.c @@ -340,10 +340,12 @@ void pcf_edit_master(int mode, int argc, char **argv) if (mode & PCF_EDIT_CONF) { if ((err = split_nameval(cp, &pattern, &req->edit_value)) != 0) msg_fatal("%s: \"%s\"", err, req->raw_text); +#if 0 if ((mode & PCF_MASTER_PARAM) && req->edit_value[strcspn(req->edit_value, PCF_MASTER_BLANKS)]) msg_fatal("whitespace in parameter value: \"%s\"", req->raw_text); +#endif } else if (mode & (PCF_COMMENT_OUT | PCF_EDIT_EXCL)) { if (strchr(cp, '=') != 0) msg_fatal("-X or -# requires names without value"); diff --git a/postfix/src/postconf/postconf_master.c b/postfix/src/postconf/postconf_master.c index c409fedb7..ac4feed44 100644 --- a/postfix/src/postconf/postconf_master.c +++ b/postfix/src/postconf/postconf_master.c @@ -192,14 +192,48 @@ static const char pcf_valid_bool_types[] = "yn-"; #define STR(x) vstring_str(x) -/* pcf_normalize_options - bring options into canonical form */ +/* pcf_extract_field - extract text from {}, trim leading/trailing blanks */ -static void pcf_normalize_options(ARGV *argv) +static void pcf_extract_field(ARGV *argv, int field, const char *parens) +{ + char *arg = argv->argv[field]; + char *err; + + if ((err = extpar(&arg, parens, EXPAR_FLAG_STRIP)) != 0) { + msg_warn("%s: %s", MASTER_CONF_FILE, err); + myfree(err); + } + argv_replace_one(argv, field, arg); +} + +/* pcf_normalize_nameval - normalize name = value from inside {} */ + +static void pcf_normalize_nameval(ARGV *argv, int field) +{ + char *arg = argv->argv[field]; + char *name; + char *value; + const char *err; + char *normalized; + + if ((err = split_nameval(arg, &name, &value)) != 0) { + msg_warn("%s: %s: \"%s\"", MASTER_CONF_FILE, err, arg); + } else { + normalized = concatenate(name, "=", value, (char *) 0); + argv_replace_one(argv, field, normalized); + myfree(normalized); + } +} + +/* pcf_normalize_daemon_args - bring daemon arguments into canonical form */ + +static void pcf_normalize_daemon_args(ARGV *argv) { int field; char *arg; char *cp; char *junk; + int extract_field; /* * Normalize options to simplify later processing. @@ -227,11 +261,25 @@ static void pcf_normalize_options(ARGV *argv) argv_insert_one(argv, field + 1, arg + 2); arg[2] = 0; /* XXX argv_replace_one() */ field += 1; + extract_field = (argv->argv[field][0] == '{'); } else if (argv->argv[field + 1] != 0) { /* Already in "-o" "name=value" form. */ field += 1; + extract_field = (argv->argv[field][0] == '{'); + } else + extract_field = 0; + /* Extract text inside {}, optionally convert to name=value. */ + if (extract_field) { + pcf_extract_field(argv, field, "{}"); + if (argv->argv[field - 1][1] == 'o') + pcf_normalize_nameval(argv, field); } } + /* Normalize non-option arguments. */ + for ( /* void */ ; argv->argv[field] != 0; field++) + /* Extract text inside {}. */ + if (argv->argv[field][0] == '{') /* } */ + pcf_extract_field(argv, field, "{}"); } /* pcf_fix_fatal - fix multiline text before release */ @@ -322,13 +370,13 @@ const char *pcf_parse_master_entry(PCF_MASTER_ENT *masterp, const char *buf) * * XXX Do per-field sanity checks. */ - argv = argv_split(buf, PCF_MASTER_BLANKS); + argv = argv_splitq(buf, PCF_MASTER_BLANKS, "{}"); if (argv->argc < PCF_MASTER_MIN_FIELDS) { argv_free(argv); /* Coverity 201311 */ return ("bad field count"); } pcf_check_master_entry(argv, buf); - pcf_normalize_options(argv); + pcf_normalize_daemon_args(argv); masterp->name_space = concatenate(argv->argv[0], PCF_NAMESP_SEP_STR, argv->argv[1], (char *) 0); masterp->argv = argv; @@ -407,6 +455,7 @@ void pcf_print_master_entry(VSTREAM *fp, int mode, PCF_MASTER_ENT *masterp) int line_len; int field; int in_daemon_options; + int need_parens; static int column_goal[] = { 0, /* service */ 11, /* type */ @@ -446,6 +495,7 @@ void pcf_print_master_entry(VSTREAM *fp, int mode, PCF_MASTER_ENT *masterp) for ( /* void */ ; (arg = argv[field]) != 0; field++) { arg_len = strlen(arg); aval = 0; + need_parens = 0; if (in_daemon_options) { /* @@ -481,8 +531,12 @@ void pcf_print_master_entry(VSTREAM *fp, int mode, PCF_MASTER_ENT *masterp) /* * Keep option and value on the same line. */ - arg_len += strlen(aval) + 1; + arg_len += strlen(aval) + 3; + if ((need_parens = aval[strcspn(aval, PCF_MASTER_BLANKS)]) != 0) + arg_len += 2; } + } else { + need_parens = arg[strcspn(arg, PCF_MASTER_BLANKS)]; } /* @@ -497,10 +551,18 @@ void pcf_print_master_entry(VSTREAM *fp, int mode, PCF_MASTER_ENT *masterp) line_len = PCF_INDENT_LEN; } } + if (in_daemon_options == 0 && need_parens) + ADD_TEXT("{", 1); ADD_TEXT(arg, strlen(arg)); + if (in_daemon_options == 0 && need_parens) + ADD_TEXT("}", 1); if (aval) { - ADD_SPACE; + ADD_TEXT(" ", 1); + if (need_parens) + ADD_TEXT("{", 1); ADD_TEXT(aval, strlen(aval)); + if (need_parens) + ADD_TEXT("}", 1); field += 1; /* Force line wrap after option with value. */ @@ -581,6 +643,7 @@ static void pcf_print_master_field(VSTREAM *fp, int mode, int arg_len; int line_len; int in_daemon_options; + int need_parens; /* * Show the field value, or the first value in the case of a multi-column @@ -613,6 +676,7 @@ static void pcf_print_master_field(VSTREAM *fp, int mode, for (field += 1; (arg = argv[field]) != 0; field++) { arg_len = strlen(arg); aval = 0; + need_parens = 0; if (in_daemon_options) { /* @@ -639,7 +703,11 @@ static void pcf_print_master_field(VSTREAM *fp, int mode, * Keep option and value on the same line. */ arg_len += strlen(aval) + 1; + if ((need_parens = aval[strcspn(aval, PCF_MASTER_BLANKS)]) != 0) + arg_len += 2; } + } else { + need_parens = arg[strcspn(arg, PCF_MASTER_BLANKS)]; } /* @@ -654,10 +722,18 @@ static void pcf_print_master_field(VSTREAM *fp, int mode, line_len = PCF_INDENT_LEN; } } + if (in_daemon_options == 0 && need_parens) + ADD_TEXT("{", 1); ADD_TEXT(arg, strlen(arg)); + if (in_daemon_options == 0 && need_parens) + ADD_TEXT("}", 1); if (aval) { ADD_SPACE; + if (need_parens) + ADD_TEXT("{", 1); ADD_TEXT(aval, strlen(aval)); + if (need_parens) + ADD_TEXT("}", 1); field += 1; /* Force line break after option with value. */ @@ -752,7 +828,8 @@ void pcf_edit_master_field(PCF_MASTER_ENT *masterp, int field, */ if (field == PCF_MASTER_FLD_CMD) { argv_truncate(masterp->argv, PCF_MASTER_FLD_CMD); - argv_split_append(masterp->argv, new_value, PCF_MASTER_BLANKS); + argv_splitq_append(masterp->argv, new_value, PCF_MASTER_BLANKS, "{}"); + pcf_normalize_daemon_args(masterp->argv); } /* diff --git a/postfix/src/postconf/postconf_misc.c b/postfix/src/postconf/postconf_misc.c index af55d1492..0107651fb 100644 --- a/postfix/src/postconf/postconf_misc.c +++ b/postfix/src/postconf/postconf_misc.c @@ -51,7 +51,10 @@ void pcf_set_config_dir(void) if (var_config_dir) myfree(var_config_dir); - var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? - config_dir : DEF_CONFIG_DIR); /* XXX */ - set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); + if ((config_dir = safe_getenv(CONF_ENV_PATH)) != 0) { + var_config_dir = mystrdup(config_dir); + set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); + } else { + var_config_dir = mystrdup(DEF_CONFIG_DIR); + } } diff --git a/postfix/src/postconf/test58.ref b/postfix/src/postconf/test58.ref index bb8e0c5b6..1e74c4a2e 100644 --- a/postfix/src/postconf/test58.ref +++ b/postfix/src/postconf/test58.ref @@ -1,5 +1,5 @@ -./postconf: warning: main.cf: syntax error after '}' in "pipemap:{ldap:xxx, memcache:yy}x" -./postconf: warning: main.cf: missing '}' in parameter value: "randmap:{xx" +./postconf: warning: main.cf: syntax error after '}' in "{ldap:xxx, memcache:yy}x" +./postconf: warning: main.cf: missing '}' in "{xx" config_directory = . mydestination = foo bar pipemap:{ldap:xxx, memcache:yy}x randmap:{xx xxx_domain = foo diff --git a/postfix/src/postconf/test59.ref b/postfix/src/postconf/test59.ref new file mode 100644 index 000000000..9c2e1fd7f --- /dev/null +++ b/postfix/src/postconf/test59.ref @@ -0,0 +1,8 @@ +./postconf: warning: master.cf: syntax error after '}' in "{ arg2a arg2b }x" +./postconf: warning: master.cf: missing '}' in "{ arg3a arg3b " +foo unix - n n - 0 other +bar inet - n n 0 0 other + -o name1=value1 + -o {name2=value2a value2b} + arg1a arg1b {arg2a arg2b} {arg3a arg3b} +baz unix - n n 0 0 other diff --git a/postfix/src/smtpd/Makefile.in b/postfix/src/smtpd/Makefile.in index 59f920f1d..b9616372b 100644 --- a/postfix/src/smtpd/Makefile.in +++ b/postfix/src/smtpd/Makefile.in @@ -278,6 +278,7 @@ smtpd_chat.o: smtpd_expand.h smtpd_check.o: ../../include/argv.h smtpd_check.o: ../../include/attr.h smtpd_check.o: ../../include/attr_clnt.h +smtpd_check.o: ../../include/attr_override.h smtpd_check.o: ../../include/cleanup_user.h smtpd_check.o: ../../include/conv_time.h smtpd_check.o: ../../include/ctable.h diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c index bddf5b3eb..4392f0455 100644 --- a/postfix/src/smtpd/smtpd_check.c +++ b/postfix/src/smtpd/smtpd_check.c @@ -240,6 +240,7 @@ #include #include #include +#include /* Application-specific. */ @@ -455,26 +456,124 @@ typedef struct { */ double smtpd_space_multf = 1.5; + /* + * SMTPD policy client. Most attributes are ATTR_CLNT attributes. + */ +typedef struct { + ATTR_CLNT *client; /* client handle */ + char *def_action; /* default action */ +} SMTPD_POLICY_CLNT; + + /* + * Table-driven parsing of main.cf parameter overrides for specific policy + * clients. We derive the override names from the corresponding main.cf + * parameter names by skipping the redundant "smtpd_policy_service_" prefix. + * + * To avoid ugly static allocation of assignment targets, we use stack-based + * parallel arrays which is less inelegant. + */ +static const ATTR_OVER_TIME time_table[] = { + 21 + VAR_SMTPD_POLICY_TMOUT, DEF_SMTPD_POLICY_TMOUT, 1, 0, + 21 + VAR_SMTPD_POLICY_IDLE, DEF_SMTPD_POLICY_IDLE, 1, 0, + 21 + VAR_SMTPD_POLICY_TTL, DEF_SMTPD_POLICY_TTL, 1, 0, + 21 + VAR_SMTPD_POLICY_TRY_DELAY, DEF_SMTPD_POLICY_TRY_DELAY, 1, 0, + 0, +}; +static const ATTR_OVER_INT int_table[] = { + 21 + VAR_SMTPD_POLICY_REQ_LIMIT, 0, 0, + 21 + VAR_SMTPD_POLICY_TRY_LIMIT, 1, 0, + 0, +}; +static const ATTR_OVER_STR str_table[] = { + 21 + VAR_SMTPD_POLICY_DEF_ACTION, 1, 0, + 0, +}; + +#define smtpd_policy_tmout time_tgts[0] +#define smtpd_policy_idle time_tgts[1] +#define smtpd_policy_ttl time_tgts[2] +#define smtpd_policy_try_delay time_tgts[3] + +#define smtpd_policy_req_limit int_tgts[0] +#define smtpd_policy_try_limit int_tgts[1] + +#define smtpd_policy_def_action str_tgts[0] + /* policy_client_register - register policy service endpoint */ static void policy_client_register(const char *name) { - ATTR_CLNT *client; + const char myname[] = "policy_client_register"; + SMTPD_POLICY_CLNT *policy_client; + char *saved_name = 0; + const char *policy_name = 0; + char *cp; + const char *sep = ", \t\r\n"; + const char *parens = "{}"; + char *err; + int time_tgts[sizeof(time_table) / sizeof(time_table[0])]; + int int_tgts[sizeof(int_table) / sizeof(int_table[0])]; + const char *str_tgts[sizeof(str_table) / sizeof(str_table[0])]; if (policy_clnt_table == 0) policy_clnt_table = htable_create(1); if (htable_find(policy_clnt_table, name) == 0) { - client = attr_clnt_create(name, - var_smtpd_policy_tmout, - var_smtpd_policy_idle, - var_smtpd_policy_ttl); - attr_clnt_control(client, - ATTR_CLNT_CTL_REQ_LIMIT, var_smtpd_policy_req_limit, - ATTR_CLNT_CTL_TRY_LIMIT, var_smtpd_policy_try_limit, - ATTR_CLNT_CTL_TRY_DELAY, var_smtpd_policy_try_delay, + + /* + * Allow per-service overrides for main.cf global settings. + */ + smtpd_policy_tmout = var_smtpd_policy_tmout; + smtpd_policy_idle = var_smtpd_policy_idle; + smtpd_policy_ttl = var_smtpd_policy_ttl; + smtpd_policy_req_limit = var_smtpd_policy_req_limit; + smtpd_policy_try_limit = var_smtpd_policy_try_limit; + smtpd_policy_try_delay = var_smtpd_policy_try_delay; + smtpd_policy_def_action = var_smtpd_policy_def_action; + + if (*name == '{') { /* } */ + cp = saved_name = mystrdup(name); + if ((err = extpar(&cp, parens, EXPAR_FLAG_NONE)) != 0) + msg_fatal("policy service syntax error: %s", cp); + if ((policy_name = mystrtok(&cp, sep)) == 0) + msg_fatal("empty policy service: \"%s\"", name); + attr_override(cp, sep, parens, + ATTR_OVER_TIME_TABLE, time_table, time_tgts, + ATTR_OVER_INT_TABLE, int_table, int_tgts, + ATTR_OVER_STR_TABLE, str_table, str_tgts, + 0); + } else { + policy_name = name; + } +#if 0 + if (msg_verbose) +#endif + msg_info("%s: name=\"%s\" default_action=\"%s\" max_idle=%d " + "max_ttl=%d request_limit=%d retry_delay=%d " + "timeout=%d try_limit=%d", + myname, policy_name, smtpd_policy_def_action, + smtpd_policy_idle, smtpd_policy_ttl, + smtpd_policy_req_limit, smtpd_policy_try_delay, + smtpd_policy_tmout, smtpd_policy_try_limit); + + /* + * Create the client. + */ + policy_client = (SMTPD_POLICY_CLNT *) mymalloc(sizeof(*policy_client)); + policy_client->client = attr_clnt_create(policy_name, + smtpd_policy_tmout, + smtpd_policy_idle, + smtpd_policy_ttl); + + attr_clnt_control(policy_client->client, + ATTR_CLNT_CTL_REQ_LIMIT, smtpd_policy_req_limit, + ATTR_CLNT_CTL_TRY_LIMIT, smtpd_policy_try_limit, + ATTR_CLNT_CTL_TRY_DELAY, smtpd_policy_try_delay, ATTR_CLNT_CTL_END); - htable_enter(policy_clnt_table, name, (char *) client); + policy_client->def_action = mystrdup(smtpd_policy_def_action); + htable_enter(policy_clnt_table, name, (char *) policy_client); + if (saved_name) + myfree(saved_name); } } @@ -3660,7 +3759,7 @@ static int check_policy_service(SMTPD_STATE *state, const char *server, const char *def_acl) { static VSTRING *action = 0; - ATTR_CLNT *policy_clnt; + SMTPD_POLICY_CLNT *policy_clnt; #ifdef USE_TLS VSTRING *subject_buf; @@ -3675,7 +3774,8 @@ static int check_policy_service(SMTPD_STATE *state, const char *server, * Sanity check. */ if (!policy_clnt_table - || (policy_clnt = (ATTR_CLNT *) htable_find(policy_clnt_table, server)) == 0) + || (policy_clnt = (SMTPD_POLICY_CLNT *) + htable_find(policy_clnt_table, server)) == 0) msg_panic("check_policy_service: no client endpoint for server %s", server); @@ -3701,7 +3801,7 @@ static int check_policy_service(SMTPD_STATE *state, const char *server, ENCODE_CN(issuer, issuer_buf, state->tls_context->issuer_CN); #endif - if (attr_clnt_request(policy_clnt, + if (attr_clnt_request(policy_clnt->client, ATTR_FLAG_NONE, /* Query attributes. */ ATTR_TYPE_STR, MAIL_ATTR_REQ, "smtpd_access_policy", ATTR_TYPE_STR, MAIL_ATTR_PROTO_STATE, state->where, @@ -3780,7 +3880,7 @@ static int check_policy_service(SMTPD_STATE *state, const char *server, longjmp(smtpd_check_buf, status); } ret = check_table_result(state, server, nesting_level == 1 ? - var_smtpd_policy_def_action : + policy_clnt->def_action : DEF_SMTPD_POLICY_DEF_ACTION, "policy query", reply_name, reply_class, def_acl); diff --git a/postfix/src/util/Makefile.in b/postfix/src/util/Makefile.in index 17e77e32c..9d85f46dc 100644 --- a/postfix/src/util/Makefile.in +++ b/postfix/src/util/Makefile.in @@ -38,7 +38,8 @@ SRCS = alldig.c allprint.c argv.c argv_split.c attr_clnt.c attr_print0.c \ dict_fail.c msg_rate_delay.c dict_surrogate.c warn_stat.c \ dict_sockmap.c line_number.c recv_pass_attr.c pass_accept.c \ poll_fd.c timecmp.c slmdb.c dict_pipe.c dict_random.c \ - valid_utf8_hostname.c midna.c argv_splitq.c balpar.c dict_union.c + valid_utf8_hostname.c midna.c argv_splitq.c balpar.c dict_union.c \ + extpar.c OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \ attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \ attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \ @@ -78,7 +79,8 @@ OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \ dict_fail.o msg_rate_delay.o dict_surrogate.o warn_stat.o \ dict_sockmap.o line_number.o recv_pass_attr.o pass_accept.o \ poll_fd.o timecmp.o $(NON_PLUGIN_MAP_OBJ) dict_pipe.o dict_random.o \ - valid_utf8_hostname.o midna.o argv_splitq.o balpar.o dict_union.o + valid_utf8_hostname.o midna.o argv_splitq.o balpar.o dict_union.o \ + extpar.o # MAP_OBJ is for maps that may be dynamically loaded with dynamicmaps.cf. # When hard-linking these, makedefs sets NON_PLUGIN_MAP_OBJ=$(MAP_OBJ), # otherwise it sets the PLUGIN_* macros. @@ -1365,6 +1367,11 @@ exec_command.o: exec_command.c exec_command.o: exec_command.h exec_command.o: msg.h exec_command.o: sys_defs.h +extpar.o: extpar.c +extpar.o: stringops.h +extpar.o: sys_defs.h +extpar.o: vbuf.h +extpar.o: vstring.h fifo_listen.o: fifo_listen.c fifo_listen.o: htable.h fifo_listen.o: iostuff.h diff --git a/postfix/src/util/argv.c b/postfix/src/util/argv.c index fe6d81f41..bc0e9700f 100644 --- a/postfix/src/util/argv.c +++ b/postfix/src/util/argv.c @@ -88,7 +88,8 @@ /* position. /* /* argv_replace_one() replaces one string at the specified -/* position. +/* position. The old string is destroyed after the update is +/* made. /* /* argv_delete() deletes the specified number of elements /* starting at the specified array position. The result is @@ -291,6 +292,7 @@ void argv_insert_one(ARGV *argvp, ssize_t where, const char *arg) void argv_replace_one(ARGV *argvp, ssize_t where, const char *arg) { + char *temp; /* * Sanity check. @@ -298,8 +300,9 @@ void argv_replace_one(ARGV *argvp, ssize_t where, const char *arg) if (where < 0 || where >= argvp->argc) msg_panic("argv_replace_one bad position: %ld", (long) where); - myfree(argvp->argv[where]); + temp = argvp->argv[where]; argvp->argv[where] = mystrdup(arg); + myfree(temp); } /* argv_delete - remove string(s) from array */ diff --git a/postfix/src/util/extpar.c b/postfix/src/util/extpar.c new file mode 100644 index 000000000..148ef3e0c --- /dev/null +++ b/postfix/src/util/extpar.c @@ -0,0 +1,99 @@ +/*++ +/* NAME +/* extpar 3 +/* SUMMARY +/* extract text from parentheses +/* SYNOPSIS +/* #include +/* +/* char *extpar(bp, parens, flags) +/* char **bp; +/* const char *parens; +/* int flags; +/* DESCRIPTION +/* extpar() extracts text from an input string that is enclosed +/* in the specified parentheses, and updates the buffer pointer +/* to point to that text. +/* +/* Arguments: +/* .IP bp +/* Pointer to buffer pointer. Both the buffer and the buffer +/* pointer are modified. +/* .IP parens +/* One matching pair of parentheses, opening parenthesis first. +/* .IP flags +/* EXPAR_FLAG_NONE, or the bitwise OR of one or more flags: +/* .RS +/* .IP EXPAR_FLAG_STRIP +/* Skip whitespace after the opening parenthesis, and trim +/* whitespace before the closing parenthesis. +/* .RE +/* DIAGNOSTICS +/* panic: the input string does not start with the opening +/* parenthesis. +/* +/* In case of error the result value is a dynamically-allocated +/* string with a description of the problem that includes a +/* copy of the offending input. A non-null result value should +/* be destroyed with myfree(). The following decribes the errors +/* and the state of the buffer and buffer pointer. +/* .IP "missing closing parenthesis" +/* The buffer pointer points to text as if the closing parenthesis +/* were present. +/* .IP "text after closing parenthesis" +/* The buffer pointer points to text as if the offending text +/* were not present. +/* SEE ALSO +/* balpar(3) determine length of string in parentheses +/* LICENSE +/* .ad +/* .fi +/* The Secure Mailer license must be distributed with this software. +/* AUTHOR(S) +/* Wietse Venema +/* IBM T.J. Watson Research +/* P.O. Box 704 +/* Yorktown Heights, NY 10598, USA +/*--*/ + + /* + * System library. + */ +#include +#include + + /* + * Utility library. + */ +#include +#include + +/* extpar - extract text from parentheses */ + +char *extpar(char **bp, const char *parens, int strip) +{ + char *cp = *bp; + char *err = 0; + size_t len; + + if (cp[0] != parens[0]) + msg_panic("extpar: no '%c' at start of text: \"%s\"", parens[0], cp); + if ((len = balpar(cp, parens)) == 0) { + err = concatenate("missing '", parens + 1, "' in \"", + cp, "\"", (char *) 0); + cp += 1; + } else { + if (cp[len] != 0) + err = concatenate("syntax error after '", parens + 1, "' in \"", + cp, "\"", (char *) 0); + cp += 1; + cp[len -= 2] = 0; + } + if (strip) { + trimblanks(cp, len)[0] = 0; + while (ISSPACE(*cp)) + cp++; + } + *bp = cp; + return (err); +} diff --git a/postfix/src/util/stringops.h b/postfix/src/util/stringops.h index 93647a3d2..e583badb3 100644 --- a/postfix/src/util/stringops.h +++ b/postfix/src/util/stringops.h @@ -45,6 +45,10 @@ extern int allascii(const char *); extern const char *split_nameval(char *, char **, char **); extern int valid_utf8_string(const char *, ssize_t); extern size_t balpar(const char *, const char *); +extern char *extpar(char **, const char *, int); + +#define EXPAR_FLAG_NONE (0) +#define EXPAR_FLAG_STRIP (1<<0) /* LICENSE /* .ad