diff options
| author | heas <heas@NetBSD.org> | 2004-07-28 22:48:49 +0000 |
|---|---|---|
| committer | heas <heas@NetBSD.org> | 2004-07-28 22:48:49 +0000 |
| commit | 6bb314b03ed3d7d3c91be7bbd2c6a56c1124adac (patch) | |
| tree | c232f5d60d319cc0390effb1e4e9b3444bba4451 /gnu | |
| parent | cdd12932c6d667f64add2d0979b36742a8e26aee (diff) | |
Postfix 2.1.4
Diffstat (limited to 'gnu')
45 files changed, 270 insertions, 212 deletions
diff --git a/gnu/dist/postfix/HISTORY b/gnu/dist/postfix/HISTORY index f3b1d1cbe8f..e6d3ed82ae8 100644 --- a/gnu/dist/postfix/HISTORY +++ b/gnu/dist/postfix/HISTORY @@ -9356,3 +9356,53 @@ Apologies for any names omitted. Bugfix: missing "sasl enabled" guard in the SMTPD policy client. File: smtpd/smtpd_check.c. + +20040614 + + Bugfix: the SMTP client did not reset per-session EHLO, + SASL, and history information when opening a connection to + an alternate SMTP server. This is the result of abstraction + no longer matching function. Reported and diagnosed by + Victor Duchovni, Morgan Stanley. + + Bugfix: non-portable reuse of variadic argument lists. + Fix by Victor Duchovni, Morgan Stanley. Files: global/bounce.c, + global/defer.c, global/sent.c, global/trace.c, global/verify.c. + + Portability: NetBSD 2.0 has changed from statfs to statvfs. + John Heasley. File: util/sys_defs.h. + + Documentation: typo fixes by IKEDA Nozomu. + +20040616 + + Bugfix: one missed variadic argument list fix. Victor + Duchovni, Morgan Stanley. File: global/verify.c. + + Bugfix: the resolver client cache should be context dependent + because address verification probes may use a different + route than normal mail deliveries. File: global/resolve_clnt.c. + + Safety: added similar context dependence to the address + rewriting client in order to avoid trouble when Postfix is + changed. File: global/rewrite_clnt.c. + + Bugfix: space in HELO commands could end up in XFORWARD + commands. File: smtpd/smtpd.c. + +20040619 + + Bugfix: more missing resets in the SMTP client when it + switches to an alternate SMTP server. In this case the + error_mask that controls whether an SMTP session transcript + is mailed to the postmaster, and the size_limit that controls + how large a message Postfix will send. Found during code + maintenance. File: smtp/smtp_connect.c. + +20040622 + + Safety: when mail is delivered to a transport with per-delivery + recipient limit of 1, split the recipient address on the + recipient delimiter if one is defined, so that extended + addresses don't get extra delivery concurrency slots. + Files: *qmgr/qmgr_message.c. diff --git a/gnu/dist/postfix/README_FILES/BASIC_CONFIGURATION_README b/gnu/dist/postfix/README_FILES/BASIC_CONFIGURATION_README index dd17c5282d8..9883e656716 100644 --- a/gnu/dist/postfix/README_FILES/BASIC_CONFIGURATION_README +++ b/gnu/dist/postfix/README_FILES/BASIC_CONFIGURATION_README @@ -116,8 +116,8 @@ small site, you probably want to change that into $mydomain, which defaults to the parent domain of the machine name. For the sake of consistency between sender and recipient addresses, myorigin -also specifies the default domain name that is appended to an unqualified -recipient address. +also specifies the domain name that is appended to an unqualified recipient +address. Examples (specify only one of the following): diff --git a/gnu/dist/postfix/README_FILES/SMTPD_POLICY_README b/gnu/dist/postfix/README_FILES/SMTPD_POLICY_README index d962d8c871b..b485acf954e 100644 --- a/gnu/dist/postfix/README_FILES/SMTPD_POLICY_README +++ b/gnu/dist/postfix/README_FILES/SMTPD_POLICY_README @@ -145,7 +145,7 @@ NOTES: * Solaris UNIX-domain sockets do not work reliably. Use TCP sockets instead: 1 /etc/postfix/master.cf: - 2 127.0.0.1:9998 unix - n n - - spawn + 2 127.0.0.1:9998 inet n n n - - spawn 3 user=nobody argv=/some/where/policy-server 4 5 /etc/postfix/main.cf: @@ -235,7 +235,7 @@ On Solaris you must use inet: style sockets instead of unix: style, as detailed in the "Policy client/server configuration" section above. 1 /etc/postfix/master.cf: - 2 127.0.0.1:9998 unix - n n - - spawn + 2 127.0.0.1:9998 inet n n n - - spawn 3 user=nobody argv=/usr/bin/perl /usr/libexec/postfix/greylist.pl 4 5 /etc/postfix/main.cf: diff --git a/gnu/dist/postfix/RELEASE_NOTES b/gnu/dist/postfix/RELEASE_NOTES index 87e3d5b1d46..d88b93e0422 100644 --- a/gnu/dist/postfix/RELEASE_NOTES +++ b/gnu/dist/postfix/RELEASE_NOTES @@ -15,14 +15,12 @@ snapshot releases. Major changes - critical ------------------------ -If you run Postfix 1.x or earlier then you must stop Postfix before -upgrading. This is because the master-child protocols have changed, -and very little will work with the old master daemon process. - -[Incompat 20021119] You can upgrade Postfix 2.0 without stopping. -After upgrading an existing Postfix 2.0 system you must use "postfix -reload". Some internal protocols have changed, but the master-child -protocols are the same as with Postfix 2.0. +If you run Postfix 2.0 or earlier then you must stop Postfix before +upgrading. The master-child protocols have changed between Postfix +1.1 and 2.0, and version 2.1 sometimes writes queue files that the +2.0 and earlier queue managers complain about. If this happens move +the files from the corrupt directory to the maildrop directory and +give them another chance. [Incompat 20021119] The Postfix upgrade procedure will add two new services to your master.cf file: "trace" and "verify". These servers diff --git a/gnu/dist/postfix/conf/header_checks b/gnu/dist/postfix/conf/header_checks index dcb25d5ae5c..cc01dfd44a1 100644 --- a/gnu/dist/postfix/conf/header_checks +++ b/gnu/dist/postfix/conf/header_checks @@ -303,9 +303,9 @@ # exploit. # # /etc/postfix/main.cf: -# header_checks = regexp:/etc/postfix/header_checks +# body_checks = regexp:/etc/postfix/body_checks # -# /etc/postfix/header_checks: +# /etc/postfix/body_checks: # /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/ # REJECT IFRAME vulnerability exploit # diff --git a/gnu/dist/postfix/html/BASIC_CONFIGURATION_README.html b/gnu/dist/postfix/html/BASIC_CONFIGURATION_README.html index 59c1442c1c6..cee19766287 100644 --- a/gnu/dist/postfix/html/BASIC_CONFIGURATION_README.html +++ b/gnu/dist/postfix/html/BASIC_CONFIGURATION_README.html @@ -187,7 +187,7 @@ want to change that into $<a href="postconf.5.html#mydomain">mydomain</a>, which domain of the machine name. </p> <p> For the sake of consistency between sender and recipient addresses, -<a href="postconf.5.html#myorigin">myorigin</a> also specifies the <a href="ADDRESS_CLASS_README.html#default_domain_class">default domain</a> name that is appended +<a href="postconf.5.html#myorigin">myorigin</a> also specifies the domain name that is appended to an unqualified recipient address. </p> <p> Examples (specify only one of the following): </p> diff --git a/gnu/dist/postfix/html/SMTPD_POLICY_README.html b/gnu/dist/postfix/html/SMTPD_POLICY_README.html index 93081a54ea8..5f69034787a 100644 --- a/gnu/dist/postfix/html/SMTPD_POLICY_README.html +++ b/gnu/dist/postfix/html/SMTPD_POLICY_README.html @@ -216,7 +216,7 @@ TCP sockets instead: </p> <blockquote> <pre> 1 /etc/postfix/master.cf: - 2 127.0.0.1:9998 unix - n n - - spawn + 2 127.0.0.1:9998 inet n n n - - spawn 3 user=nobody argv=/some/where/policy-server 4 5 /etc/postfix/main.cf: @@ -340,7 +340,7 @@ client/server configuration</a>" section above. </p> <blockquote> <pre> 1 /etc/postfix/master.cf: -2 127.0.0.1:9998 unix - n n - - spawn +2 127.0.0.1:9998 inet n n n - - spawn 3 user=nobody argv=/usr/bin/perl /usr/libexec/postfix/greylist.pl 4 5 /etc/postfix/main.cf: diff --git a/gnu/dist/postfix/html/header_checks.5.html b/gnu/dist/postfix/html/header_checks.5.html index f4580ce1d58..5a0c26d92af 100644 --- a/gnu/dist/postfix/html/header_checks.5.html +++ b/gnu/dist/postfix/html/header_checks.5.html @@ -309,9 +309,9 @@ HEADER_CHECKS(5) HEADER_CHECKS(5) exploit. /etc/postfix/main.cf: - <a href="postconf.5.html#header_checks">header_checks</a> = <a href="regexp_table.5.html">regexp</a>:/etc/postfix/header_checks + <a href="postconf.5.html#body_checks">body_checks</a> = <a href="regexp_table.5.html">regexp</a>:/etc/postfix/body_checks - /etc/postfix/header_checks: + /etc/postfix/body_checks: /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/ REJECT IFRAME vulnerability exploit diff --git a/gnu/dist/postfix/html/pickup.8.html b/gnu/dist/postfix/html/pickup.8.html index ad7e6ac17d3..7688047f42f 100644 --- a/gnu/dist/postfix/html/pickup.8.html +++ b/gnu/dist/postfix/html/pickup.8.html @@ -43,8 +43,8 @@ PICKUP(8) PICKUP(8) unfiltered user data. <b>CONFIGURATION PARAMETERS</b> - As the pickup daemon is a relatively long-running process, - up to an hour may pass before a <b>main.cf</b> change takes + As the <a href="pickup.8.html">pickup(8)</a> daemon is a relatively long-running pro- + cess, up to an hour may pass before a <b>main.cf</b> change takes effect. Use the command "<b>postfix reload</b>" command to speed up a change. diff --git a/gnu/dist/postfix/html/postconf.5.html b/gnu/dist/postfix/html/postconf.5.html index d2836b4d5a1..007d36bead7 100644 --- a/gnu/dist/postfix/html/postconf.5.html +++ b/gnu/dist/postfix/html/postconf.5.html @@ -733,6 +733,7 @@ below it), "/file/name" or "<a href="DATABASE_README.html">type:table</a>" patt pattern is replaced by its contents; a "<a href="DATABASE_README.html">type:table</a>" lookup table is matched when a table entry matches a lookup string (the lookup result is ignored). Continue long lines by starting the next line +with whitespace. </p> </DD> @@ -1546,7 +1547,7 @@ This feature is available in Postfix 2.0 and later. The names of message delivery transports that should not be delivered to unless someone issues "<b>sendmail -q</b>" or equivalent. Specify zero or more names of mail delivery transports names that appear in the -first field of master.cf). +first field of master.cf. </p> <p> @@ -3334,7 +3335,7 @@ What addresses are subject to address masquerading. </p> <p> -By default, address masquerading is limited to envelope recipient +By default, address masquerading is limited to envelope sender addresses, and to header sender and header recipient addresses. This allows you to use address masquerading on a mail gateway while still being able to forward mail to users on individual machines. @@ -3772,7 +3773,7 @@ configuration parameter. </p> (default: $<a href="postconf.5.html#myhostname">myhostname</a>)</b></DT><DD> <p> -The <a href="ADDRESS_CLASS_README.html#default_domain_class">default domain</a> name that locally-posted mail appears to come +The domain name that locally-posted mail appears to come from, and that locally posted mail is delivered to. The default, $<a href="postconf.5.html#myhostname">myhostname</a>, is adequate for small sites. If you run a domain with multiple machines, you should (1) change this to $<a href="postconf.5.html#mydomain">mydomain</a> and (2) @@ -3852,7 +3853,7 @@ The error classes are: <dd>Send the postmaster copies of the headers of bounced mail, and send transcripts of SMTP sessions when Postfix rejects mail. The notification is sent to the address specified with the -<a href="postconf.5.html#bounce_notice_recipient">bounce_notice_recipient</a> configuration parameter (default: postmaster) +<a href="postconf.5.html#bounce_notice_recipient">bounce_notice_recipient</a> configuration parameter (default: postmaster). </dd> <dt><b>2bounce</b></dt> @@ -4582,13 +4583,6 @@ recipient addresses with $<a href="postconf.5.html#relay_recipient_maps">relay_r recipients. See also the <a href="ADDRESS_CLASS_README.html#relay_domain_class">relay domains</a> address class in the <a href="ADDRESS_CLASS_README.html">ADDRESS_CLASS_README</a> file. </p> -<p> The list of domains that are by default delivered via the -$<a href="postconf.5.html#local_transport">local_transport</a> mail delivery transport. By default this is the -Postfix <a href="local.8.html">local(8)</a> delivery agent which looks up all recipients in -/etc/passwd and /etc/aliases. The SMTP server validates recipient -addresses with $<a href="postconf.5.html#local_recipient_maps">local_recipient_maps</a>. See also the <a href="ADDRESS_CLASS_README.html#local_domain_class">local domain</a> -address class in the <a href="ADDRESS_CLASS_README.html">ADDRESS_CLASS_README</a> file. </p> - <p> NOTE: Postfix will not automatically forward mail for domains that list this system as their primary or backup MX host. See the <a href="postconf.5.html#permit_mx_backup">permit_mx_backup</a> restriction in the <a href="postconf.5.html">postconf(5)</a> manual page. </p> @@ -5245,7 +5239,7 @@ This feature is available in Postfix 2.1 and later. <p> The maximal length of message header and body lines that Postfix -will send via SMTP. Longer lines are longer are broken by inserting +will send via SMTP. Longer lines are broken by inserting "<CR><LF><SPACE>". This minimizes the damage to MIME formatted mail. </p> @@ -5765,7 +5759,7 @@ restrictions. <p> By default, clients in trusted networks are excluded. Specify a list of network blocks, hostnames or .domain names (the initial -initial dot causes the domain to match any name below it). +dot causes the domain to match any name below it). </p> <p> @@ -6407,7 +6401,7 @@ supposed to give the result to another Postfix SMTP server process. </p> <p> Specify host:port. The host can be specified as an IP address -or was a symbolic name; no MX lookups are done. When no host or +or as a symbolic name; no MX lookups are done. When no host or host: are specified, the local machine is assumed. </p> <p> This feature is available in Postfix 2.1 and later. </p> @@ -6606,8 +6600,7 @@ address. <br> The <a href="postconf.5.html#unknown_address_reject_code">unknown_ the response code for rejected requests (default: 450). The response is always 450 in case of a temporary DNS error.</dd> -<dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b> -(Postfix 2.0 name: check_recipient_maps)</dt> +<dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b> (Postfix 2.0 name: check_recipient_maps)</dt> <dd> Reject the request when the RCPT TO address is not listed in the list of valid recipients for its domain class. See the diff --git a/gnu/dist/postfix/html/proxymap.8.html b/gnu/dist/postfix/html/proxymap.8.html index 4c29654f375..6d5afdc931b 100644 --- a/gnu/dist/postfix/html/proxymap.8.html +++ b/gnu/dist/postfix/html/proxymap.8.html @@ -44,7 +44,7 @@ PROXYMAP(8) PROXYMAP(8) Open the table with type <i>maptype</i> and name <i>mapname</i>, as controlled by <i>flags</i>. The reply includes the <i>map-</i> <i>type</i> dependent flags (to distinguish a fixed string - table from regular a expression table). + table from a regular expression table). <b>lookup</b> <i>maptype:mapname flags key</i> Look up the data stored under the requested key. diff --git a/gnu/dist/postfix/html/qmgr.8.html b/gnu/dist/postfix/html/qmgr.8.html index 39af6a58e59..fe9050aa7c6 100644 --- a/gnu/dist/postfix/html/qmgr.8.html +++ b/gnu/dist/postfix/html/qmgr.8.html @@ -63,8 +63,8 @@ QMGR(8) QMGR(8) <a href="defer.8.html"><b>defer</b>(8)</a> daemon. <b>trace</b> Per-recipient status information as requested with - the Postfix "<b>sendmail -v</b>" or "<b>sendmail -bv" com-</b> - <b>mand</b>. These files are maintained by the <a href="trace.8.html"><b>trace</b>(8)</a> + the Postfix "<b>sendmail -v</b>" or "<b>sendmail -bv</b>" com- + mand. These files are maintained by the <a href="trace.8.html"><b>trace</b>(8)</a> daemon. The <b>qmgr</b> daemon is responsible for asking the <a href="bounce.8.html"><b>bounce</b>(8)</a>, @@ -365,7 +365,7 @@ QMGR(8) QMGR(8) <b>SEE ALSO</b> <a href="trivial-rewrite.8.html">trivial-rewrite(8)</a>, address routing <a href="bounce.8.html">bounce(8)</a>, delivery status reports - <a href="postconf.5.html">postconf(5)</a> configuration parameters + <a href="postconf.5.html">postconf(5)</a>, configuration parameters <a href="master.8.html">master(8)</a>, process manager syslogd(8) system logging diff --git a/gnu/dist/postfix/html/regexp_table.5.html b/gnu/dist/postfix/html/regexp_table.5.html index 024f2add13b..9dbf93cdbfa 100644 --- a/gnu/dist/postfix/html/regexp_table.5.html +++ b/gnu/dist/postfix/html/regexp_table.5.html @@ -68,7 +68,7 @@ REGEXP_TABLE(5) REGEXP_TABLE(5) Each pattern is a POSIX regular expression enclosed by a pair of delimiters. The regular expression syntax is docu- - mented in re_format(7) with 4.4BSD, in regcomp(3C) with + mented in re_format(7) with 4.4BSD, in regex(5) with Solaris, and in regex(7) with Linux. Other systems may use other document names. diff --git a/gnu/dist/postfix/html/smtpd.8.html b/gnu/dist/postfix/html/smtpd.8.html index 242c121c4bf..74a7c61fbe4 100644 --- a/gnu/dist/postfix/html/smtpd.8.html +++ b/gnu/dist/postfix/html/smtpd.8.html @@ -434,6 +434,8 @@ SMTPD(8) SMTPD(8) Postfix SMTP server starts to increment the error counter with each junk command. + Available in Postfix version 2.1 and later: + <b><a href="postconf.5.html#smtpd_recipient_overshoot_limit">smtpd_recipient_overshoot_limit</a> (1000)</b> The number of recipients that a remote SMTP client can send in excess of the limit specified with @@ -447,12 +449,8 @@ SMTPD(8) SMTPD(8) outside Postfix. See the file <a href="SMTPD_POLICY_README.html">SMTPD_POLICY_README</a> for more information. - <b><a href="postconf.5.html#smtpd_policy_service_timeout">smtpd_policy_service_timeout</a> (100s)</b> - The time limit for connecting to, writing to or - receiving from a delegated SMTPD policy server. - <b><a href="postconf.5.html#smtpd_policy_service_max_idle">smtpd_policy_service_max_idle</a> (300s)</b> - The time after which an idle SMTPD policy service + The time after which an idle SMTPD policy service connection is closed. <b><a href="postconf.5.html#smtpd_policy_service_max_ttl">smtpd_policy_service_max_ttl</a> (1000s)</b> @@ -460,107 +458,108 @@ SMTPD(8) SMTPD(8) connection is closed. <b><a href="postconf.5.html#smtpd_policy_service_timeout">smtpd_policy_service_timeout</a> (100s)</b> - The time limit for connecting to, writing to or + The time limit for connecting to, writing to or receiving from a delegated SMTPD policy server. <b>ACCESS CONTROLS</b> - The <a href="SMTPD_ACCESS_README.html">SMTPD_ACCESS_README</a> document gives an introduction to + The <a href="SMTPD_ACCESS_README.html">SMTPD_ACCESS_README</a> document gives an introduction to all the SMTP server access control features. <b><a href="postconf.5.html#smtpd_delay_reject">smtpd_delay_reject</a> (yes)</b> - Wait until the RCPT TO command before evaluating + Wait until the RCPT TO command before evaluating $<a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a>, $smtpd_helo_restric- tions and $<a href="postconf.5.html#smtpd_sender_restrictions">smtpd_sender_restrictions</a>, or wait until - the ETRN command before evaluating + the ETRN command before evaluating $<a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a> and $smtpd_helo_restric- tions. - <b><a href="postconf.5.html#parent_domain_matches_subdomains">parent_domain_matches_subdomains</a> (see 'postconf -d' out-</b> + <b><a href="postconf.5.html#parent_domain_matches_subdomains">parent_domain_matches_subdomains</a> (see 'postconf -d' out-</b> <b>put)</b> What Postfix features match subdomains of "domain.tld" automatically, instead of requiring an explicit ".domain.tld" pattern. <b><a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a> (empty)</b> - Optional SMTP server access restrictions in the + Optional SMTP server access restrictions in the context of a client SMTP connection request. <b><a href="postconf.5.html#smtpd_helo_required">smtpd_helo_required</a> (no)</b> Require that a remote SMTP client introduces itself - at the beginning of an SMTP session with the HELO + at the beginning of an SMTP session with the HELO or EHLO command. <b><a href="postconf.5.html#smtpd_helo_restrictions">smtpd_helo_restrictions</a> (empty)</b> - Optional restrictions that the Postfix SMTP server + Optional restrictions that the Postfix SMTP server applies in the context of the SMTP HELO command. <b><a href="postconf.5.html#smtpd_sender_restrictions">smtpd_sender_restrictions</a> (empty)</b> - Optional restrictions that the Postfix SMTP server + Optional restrictions that the Postfix SMTP server applies in the context of the MAIL FROM command. <b><a href="postconf.5.html#smtpd_recipient_restrictions">smtpd_recipient_restrictions</a> (<a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>,</b> <b><a href="postconf.5.html#reject_unauth_destination">reject_unauth_destination</a>)</b> The access restrictions that the Postfix SMTP - server applies in the context of the RCPT TO com- + server applies in the context of the RCPT TO com- mand. <b><a href="postconf.5.html#smtpd_etrn_restrictions">smtpd_etrn_restrictions</a> (empty)</b> - Optional SMTP server access restrictions in the + Optional SMTP server access restrictions in the context of a client ETRN request. <b><a href="postconf.5.html#allow_untrusted_routing">allow_untrusted_routing</a> (no)</b> - Forward mail with sender-specified routing - (user[@%!]remote[@%!]site) from untrusted clients + Forward mail with sender-specified routing + (user[@%!]remote[@%!]site) from untrusted clients to destinations matching $<a href="postconf.5.html#relay_domains">relay_domains</a>. <b><a href="postconf.5.html#smtpd_restriction_classes">smtpd_restriction_classes</a> (empty)</b> - User-defined aliases for groups of access restric- + User-defined aliases for groups of access restric- tions. <b><a href="postconf.5.html#smtpd_null_access_lookup_key">smtpd_null_access_lookup_key</a> (</b><><b>)</b> - The lookup key to be used in SMTP <a href="access.5.html">access(5)</a> tables + The lookup key to be used in SMTP <a href="access.5.html">access(5)</a> tables instead of the null sender address. <b><a href="postconf.5.html#permit_mx_backup_networks">permit_mx_backup_networks</a> (empty)</b> Restrict the use of the <a href="postconf.5.html#permit_mx_backup">permit_mx_backup</a> SMTP - access feature to only domains whose primary MX + access feature to only domains whose primary MX hosts match the listed networks. Available in Postfix version 2.0 and later: <b><a href="postconf.5.html#smtpd_data_restrictions">smtpd_data_restrictions</a> (empty)</b> - Optional access restrictions that the Postfix SMTP + Optional access restrictions that the Postfix SMTP server applies in the context of the SMTP DATA com- mand. <b><a href="postconf.5.html#smtpd_expansion_filter">smtpd_expansion_filter</a> (see 'postconf -d' output)</b> - What characters are allowed in $name expansions of + What characters are allowed in $name expansions of RBL reply templates. Available in Postfix version 2.1 and later: <b><a href="postconf.5.html#smtpd_reject_unlisted_sender">smtpd_reject_unlisted_sender</a> (no)</b> - Request that the Postfix SMTP server rejects mail - from unknown sender addresses, even when no - explicit <a href="postconf.5.html#reject_unlisted_sender">reject_unlisted_sender</a> access restriction + Request that the Postfix SMTP server rejects mail + from unknown sender addresses, even when no + explicit <a href="postconf.5.html#reject_unlisted_sender">reject_unlisted_sender</a> access restriction is specified. <b><a href="postconf.5.html#smtpd_reject_unlisted_recipient">smtpd_reject_unlisted_recipient</a> (yes)</b> - Request that the Postfix SMTP server rejects mail + Request that the Postfix SMTP server rejects mail for unknown recipient addresses, even when no - explicit <a href="postconf.5.html#reject_unlisted_recipient">reject_unlisted_recipient</a> access restric- + explicit <a href="postconf.5.html#reject_unlisted_recipient">reject_unlisted_recipient</a> access restric- tion is specified. <b>SENDER AND RECIPIENT ADDRESS VERIFICATION CONTROLS</b> - Postfix version 2.1 introduces sender and address verifi- - cation. This feature is implemented by sending probe - email messages that are not actually delivered. This fea- - ture is requested via the <a href="postconf.5.html#reject_unverified_sender">reject_unverified_sender</a> and - <a href="postconf.5.html#reject_unverified_recipient">reject_unverified_recipient</a> access restrictions. The sta- - tus of verification probes is maintained by the <a href="verify.8.html">verify(8)</a> - server. See the file <a href="ADDRESS_VERIFICATION_README.html">ADDRESS_VERIFICATION_README</a> for - information about how to configure and operate the Postfix - sender/recipient address verification service. + Postfix version 2.1 introduces sender and recipient + address verification. This feature is implemented by + sending probe email messages that are not actually deliv- + ered. This feature is requested via the <a href="postconf.5.html#reject_unverified_sender">reject_unveri</a>- + <a href="postconf.5.html#reject_unverified_sender">fied_sender</a> and <a href="postconf.5.html#reject_unverified_recipient">reject_unverified_recipient</a> access + restrictions. The status of verification probes is main- + tained by the <a href="verify.8.html">verify(8)</a> server. See the file ADDRESS_VER- + <a href="IFICATION_README.html">IFICATION_README</a> for information about how to configure + and operate the Postfix sender/recipient address verifica- + tion service. <b><a href="postconf.5.html#address_verify_poll_count">address_verify_poll_count</a> (3)</b> How many times to query the <a href="verify.8.html">verify(8)</a> service for @@ -709,9 +708,9 @@ SMTPD(8) SMTPD(8) privileges than "strangers". <b><a href="postconf.5.html#myorigin">myorigin</a> ($<a href="postconf.5.html#myhostname">myhostname</a>)</b> - The default domain name that locally-posted mail - appears to come from, and that locally posted mail - is delivered to. + The domain name that locally-posted mail appears to + come from, and that locally posted mail is deliv- + ered to. <b><a href="postconf.5.html#process_id">process_id</a> (read-only)</b> The process ID of a Postfix command or daemon pro- diff --git a/gnu/dist/postfix/html/spawn.8.html b/gnu/dist/postfix/html/spawn.8.html index b1820ee7cb3..77e203a9b03 100644 --- a/gnu/dist/postfix/html/spawn.8.html +++ b/gnu/dist/postfix/html/spawn.8.html @@ -66,7 +66,7 @@ SPAWN(8) SPAWN(8) data-driven attacks. <b>CONFIGURATION PARAMETERS</b> - Changes to <b>main.cf</b> are picked up automatically as <a href="smtpd.8.html">smtpd(8)</a> + Changes to <b>main.cf</b> are picked up automatically as <a href="spawn.8.html">spawn(8)</a> processes run for only a limited amount of time. Use the command "<b>postfix reload</b>" to speed up a change. diff --git a/gnu/dist/postfix/html/trivial-rewrite.8.html b/gnu/dist/postfix/html/trivial-rewrite.8.html index f6e6ba82419..bd3cfb7f140 100644 --- a/gnu/dist/postfix/html/trivial-rewrite.8.html +++ b/gnu/dist/postfix/html/trivial-rewrite.8.html @@ -156,13 +156,13 @@ TRIVIAL-REWRITE(8) TRIVIAL-REWRITE(8) destination). <b>ADDRESS VERIFICATION CONTROLS</b> - Postfix version 2.1 introduces sender and address verifi- - cation. 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 message - routing for address verification probes, specify one or - more of the following: + Postfix version 2.1 introduces sender and recipient + address verification. This feature is implemented by + sending probe email messages that are not actually deliv- + ered. By default, address verification probes use the + same route as regular mail. To override specific aspects + of message routing for address verification probes, spec- + ify one or more of the following: <b><a href="postconf.5.html#address_verify_local_transport">address_verify_local_transport</a> ($<a href="postconf.5.html#local_transport">local_transport</a>)</b> Overrides the <a href="postconf.5.html#local_transport">local_transport</a> parameter setting for diff --git a/gnu/dist/postfix/man/man5/header_checks.5 b/gnu/dist/postfix/man/man5/header_checks.5 index cfcd8827288..01b8d51c66a 100644 --- a/gnu/dist/postfix/man/man5/header_checks.5 +++ b/gnu/dist/postfix/man/man5/header_checks.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: header_checks.5,v 1.1.1.2 2004/05/31 00:24:18 heas Exp $ +.\" $NetBSD: header_checks.5,v 1.1.1.3 2004/07/28 22:49:03 heas Exp $ .\" .TH HEADER_CHECKS 5 .ad @@ -294,9 +294,9 @@ Body pattern to stop a specific HTML browser vulnerability exploit. .nf /etc/postfix/main.cf: .ti +4 -header_checks = regexp:/etc/postfix/header_checks +body_checks = regexp:/etc/postfix/body_checks -/etc/postfix/header_checks: +/etc/postfix/body_checks: .ti +4 /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/ .ti +8 diff --git a/gnu/dist/postfix/man/man5/postconf.5 b/gnu/dist/postfix/man/man5/postconf.5 index 27d34fef1c3..00507559515 100644 --- a/gnu/dist/postfix/man/man5/postconf.5 +++ b/gnu/dist/postfix/man/man5/postconf.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: postconf.5,v 1.1.1.2 2004/05/31 00:24:18 heas Exp $ +.\" $NetBSD: postconf.5,v 1.1.1.3 2004/07/28 22:49:05 heas Exp $ .\" .TH POSTCONF 5 .SH NAME @@ -390,6 +390,7 @@ below it), "/file/name" or "type:table" patterns. A "/file/name" pattern is replaced by its contents; a "type:table" lookup table is matched when a table entry matches a lookup string (the lookup result is ignored). Continue long lines by starting the next line +with whitespace. .SH backwards_bounce_logfile_compatibility (default: yes) Produce additional bounce(8) logfile records that can be read by older Postfix versions. The current and more extensible "name = @@ -798,7 +799,7 @@ This feature is available in Postfix 2.0 and later. The names of message delivery transports that should not be delivered to unless someone issues "\fBsendmail -q\fR" or equivalent. Specify zero or more names of mail delivery transports names that appear in the -first field of master.cf). +first field of master.cf. .PP Example: .PP @@ -1671,7 +1672,7 @@ Do not change this unless you have a complete understanding of RFC 821. .SH masquerade_classes (default: envelope_sender, header_sender, header_recipient) What addresses are subject to address masquerading. .PP -By default, address masquerading is limited to envelope recipient +By default, address masquerading is limited to envelope sender addresses, and to header sender and header recipient addresses. This allows you to use address masquerading on a mail gateway while still being able to forward mail to users on individual machines. @@ -1930,7 +1931,7 @@ Postfix to "trust" your entire provider's network. Instead, specify an explicit mynetworks list by hand, as described with the mynetworks configuration parameter. .SH myorigin (default: $myhostname) -The default domain name that locally-posted mail appears to come +The domain name that locally-posted mail appears to come from, and that locally posted mail is delivered to. The default, $myhostname, is adequate for small sites. If you run a domain with multiple machines, you should (1) change this to $mydomain and (2) @@ -1971,7 +1972,7 @@ The error classes are: Send the postmaster copies of the headers of bounced mail, and send transcripts of SMTP sessions when Postfix rejects mail. The notification is sent to the address specified with the -bounce_notice_recipient configuration parameter (default: postmaster) +bounce_notice_recipient configuration parameter (default: postmaster). .IP "\fB2bounce\fR" Send undeliverable bounced mail to the postmaster. The notification is sent to the address specified with the 2bounce_notice_recipient @@ -2367,13 +2368,6 @@ recipient addresses with $relay_recipient_maps and rejects non-existent recipients. See also the relay domains address class in the ADDRESS_CLASS_README file. .PP -The list of domains that are by default delivered via the -$local_transport mail delivery transport. By default this is the -Postfix local(8) delivery agent which looks up all recipients in -/etc/passwd and /etc/aliases. The SMTP server validates recipient -addresses with $local_recipient_maps. See also the local domain -address class in the ADDRESS_CLASS_README file. -.PP NOTE: Postfix will not automatically forward mail for domains that list this system as their primary or backup MX host. See the permit_mx_backup restriction in the postconf(5) manual page. @@ -2723,7 +2717,7 @@ Use the native service for hosts not found in the DNS. This feature is available in Postfix 2.1 and later. .SH smtp_line_length_limit (default: 990) The maximal length of message header and body lines that Postfix -will send via SMTP. Longer lines are longer are broken by inserting +will send via SMTP. Longer lines are broken by inserting "<CR><LF><SPACE>". This minimizes the damage to MIME formatted mail. .PP @@ -2990,7 +2984,7 @@ restrictions. .PP By default, clients in trusted networks are excluded. Specify a list of network blocks, hostnames or .domain names (the initial -initial dot causes the domain to match any name below it). +dot causes the domain to match any name below it). .PP This feature is not part of the stable Postfix 2.1 release. .SH smtpd_client_connection_rate_limit (default: 0) @@ -3372,7 +3366,7 @@ The proxy receives all mail from the Postfix SMTP server, and is supposed to give the result to another Postfix SMTP server process. .PP Specify host:port. The host can be specified as an IP address -or was a symbolic name; no MX lookups are done. When no host or +or as a symbolic name; no MX lookups are done. When no host or host: are specified, the local machine is assumed. .PP This feature is available in Postfix 2.1 and later. @@ -3509,9 +3503,8 @@ address. The unknown_address_reject_code parameter specifies the response code for rejected requests (default: 450). The response is always 450 in case of a temporary DNS error. -.IP "\fBreject_unlisted_recipient\fR -(Postfix 2.0 name: check_recipient_maps)" - Reject the request when the RCPT TO address is not listed in +.IP "\fBreject_unlisted_recipient\fR (Postfix 2.0 name: check_recipient_maps)" +Reject the request when the RCPT TO address is not listed in the list of valid recipients for its domain class. See the smtpd_reject_unlisted_recipient parameter description for details. This feature is available in Postfix 2.1 and later. diff --git a/gnu/dist/postfix/man/man5/regexp_table.5 b/gnu/dist/postfix/man/man5/regexp_table.5 index cd17b7d7b3e..1eb9a9aa0b6 100644 --- a/gnu/dist/postfix/man/man5/regexp_table.5 +++ b/gnu/dist/postfix/man/man5/regexp_table.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: regexp_table.5,v 1.1.1.8 2004/05/31 00:24:18 heas Exp $ +.\" $NetBSD: regexp_table.5,v 1.1.1.9 2004/07/28 22:49:05 heas Exp $ .\" .TH REGEXP_TABLE 5 .ad @@ -64,7 +64,7 @@ starts with whitespace continues a logical line. .PP Each pattern is a POSIX regular expression enclosed by a pair of delimiters. The regular expression syntax is documented in -re_format(7) with 4.4BSD, in regcomp(3C) with Solaris, and in +re_format(7) with 4.4BSD, in regex(5) with Solaris, and in regex(7) with Linux. Other systems may use other document names. The expression delimiter can be any character, except whitespace diff --git a/gnu/dist/postfix/man/man8/pickup.8 b/gnu/dist/postfix/man/man8/pickup.8 index b07eb1c126f..a2c7e697d14 100644 --- a/gnu/dist/postfix/man/man8/pickup.8 +++ b/gnu/dist/postfix/man/man8/pickup.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: pickup.8,v 1.1.1.6 2004/05/31 00:24:19 heas Exp $ +.\" $NetBSD: pickup.8,v 1.1.1.7 2004/07/28 22:49:05 heas Exp $ .\" .TH PICKUP 8 .ad @@ -53,7 +53,7 @@ descriptor instead of file data, but then the already complex .nf .ad .fi -As the pickup daemon is a relatively long-running process, up +As the pickup(8) daemon is a relatively long-running process, up to an hour may pass before a \fBmain.cf\fR change takes effect. Use the command "\fBpostfix reload\fR" command to speed up a change. diff --git a/gnu/dist/postfix/man/man8/proxymap.8 b/gnu/dist/postfix/man/man8/proxymap.8 index be0d57080a4..c322c7dbf31 100644 --- a/gnu/dist/postfix/man/man8/proxymap.8 +++ b/gnu/dist/postfix/man/man8/proxymap.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: proxymap.8,v 1.1.1.4 2004/05/31 00:24:19 heas Exp $ +.\" $NetBSD: proxymap.8,v 1.1.1.5 2004/07/28 22:49:05 heas Exp $ .\" .TH PROXYMAP 8 .ad @@ -44,8 +44,8 @@ The proxymap server implements the following requests: .IP "\fBopen\fR \fImaptype:mapname flags\fR" Open the table with type \fImaptype\fR and name \fImapname\fR, as controlled by \fIflags\fR. The reply includes the \fImaptype\fR -dependent flags (to distinguish a fixed string table from regular -a expression table). +dependent flags (to distinguish a fixed string table from a regular +expression table). .IP "\fBlookup\fR \fImaptype:mapname flags key\fR" Look up the data stored under the requested key. The reply is the request completion status code (below) and diff --git a/gnu/dist/postfix/man/man8/qmgr.8 b/gnu/dist/postfix/man/man8/qmgr.8 index 18de6867d08..5dd0a468b47 100644 --- a/gnu/dist/postfix/man/man8/qmgr.8 +++ b/gnu/dist/postfix/man/man8/qmgr.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: qmgr.8,v 1.1.1.5 2004/05/31 00:24:19 heas Exp $ +.\" $NetBSD: qmgr.8,v 1.1.1.6 2004/07/28 22:49:05 heas Exp $ .\" .TH QMGR 8 .ad @@ -62,7 +62,7 @@ Per-recipient status information about why mail is delayed. These files are maintained by the \fBdefer\fR(8) daemon. .IP \fBtrace\fR Per-recipient status information as requested with the -Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv" command\fR. +Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv\fR" command. These files are maintained by the \fBtrace\fR(8) daemon. .PP The \fBqmgr\fR daemon is responsible for asking the @@ -327,7 +327,7 @@ records, so that "smtpd" becomes, for example, "postfix/smtpd". .nf trivial-rewrite(8), address routing bounce(8), delivery status reports -postconf(5) configuration parameters +postconf(5), configuration parameters master(8), process manager syslogd(8) system logging .SH "README FILES" diff --git a/gnu/dist/postfix/man/man8/smtpd.8 b/gnu/dist/postfix/man/man8/smtpd.8 index b70e8b232ab..8aa0f24456e 100644 --- a/gnu/dist/postfix/man/man8/smtpd.8 +++ b/gnu/dist/postfix/man/man8/smtpd.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: smtpd.8,v 1.1.1.9 2004/05/31 00:24:20 heas Exp $ +.\" $NetBSD: smtpd.8,v 1.1.1.10 2004/07/28 22:49:06 heas Exp $ .\" .TH SMTPD 8 .ad @@ -376,6 +376,8 @@ make without delivering mail. The number of junk commands (NOOP, VRFY, ETRN or RSET) that a remote SMTP client can send before the Postfix SMTP server starts to increment the error counter with each junk command. +.PP +Available in Postfix version 2.1 and later: .IP "\fBsmtpd_recipient_overshoot_limit (1000)\fR" The number of recipients that a remote SMTP client can send in excess of the limit specified with $smtpd_recipient_limit, before @@ -389,9 +391,6 @@ for each excess recipient. As of version 2.1, Postfix can be configured to delegate access policy decisions to an external server that runs outside Postfix. See the file SMTPD_POLICY_README for more information. -.IP "\fBsmtpd_policy_service_timeout (100s)\fR" -The time limit for connecting to, writing to or receiving from a -delegated SMTPD policy server. .IP "\fBsmtpd_policy_service_max_idle (300s)\fR" The time after which an idle SMTPD policy service connection is closed. @@ -468,7 +467,7 @@ access restriction is specified. .nf .ad .fi -Postfix version 2.1 introduces sender and address verification. +Postfix version 2.1 introduces sender and recipient address verification. This feature is implemented by sending probe email messages that are not actually delivered. This feature is requested via the reject_unverified_sender and @@ -583,7 +582,7 @@ The internet hostname of this mail system. The list of "trusted" SMTP clients that have more privileges than "strangers". .IP "\fBmyorigin ($myhostname)\fR" -The default domain name that locally-posted mail appears to come +The domain name that locally-posted mail appears to come from, and that locally posted mail is delivered to. .IP "\fBprocess_id (read-only)\fR" The process ID of a Postfix command or daemon process. diff --git a/gnu/dist/postfix/man/man8/spawn.8 b/gnu/dist/postfix/man/man8/spawn.8 index 354308faa67..7b2c96f4d33 100644 --- a/gnu/dist/postfix/man/man8/spawn.8 +++ b/gnu/dist/postfix/man/man8/spawn.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: spawn.8,v 1.1.1.4 2004/05/31 00:24:20 heas Exp $ +.\" $NetBSD: spawn.8,v 1.1.1.5 2004/07/28 22:49:06 heas Exp $ .\" .TH SPAWN 8 .ad @@ -71,7 +71,7 @@ and thus is not vulnerable to data-driven attacks. .nf .ad .fi -Changes to \fBmain.cf\fR are picked up automatically as smtpd(8) +Changes to \fBmain.cf\fR are picked up automatically as spawn(8) processes run for only a limited amount of time. Use the command "\fBpostfix reload\fR" to speed up a change. diff --git a/gnu/dist/postfix/man/man8/trivial-rewrite.8 b/gnu/dist/postfix/man/man8/trivial-rewrite.8 index f39e1f5223f..a2495537cba 100644 --- a/gnu/dist/postfix/man/man8/trivial-rewrite.8 +++ b/gnu/dist/postfix/man/man8/trivial-rewrite.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: trivial-rewrite.8,v 1.1.1.8 2004/05/31 00:24:19 heas Exp $ +.\" $NetBSD: trivial-rewrite.8,v 1.1.1.9 2004/07/28 22:49:05 heas Exp $ .\" .TH TRIVIAL-REWRITE 8 .ad @@ -146,7 +146,7 @@ Optional lookup tables with mappings from recipient address to .nf .ad .fi -Postfix version 2.1 introduces sender and address verification. +Postfix version 2.1 introduces sender and recipient address verification. This feature is implemented by sending probe email messages that are not actually delivered. By default, address verification probes use the same route diff --git a/gnu/dist/postfix/mantools/postconf2man b/gnu/dist/postfix/mantools/postconf2man index e1298282e4f..9d94c07d1e0 100755 --- a/gnu/dist/postfix/mantools/postconf2man +++ b/gnu/dist/postfix/mantools/postconf2man @@ -57,7 +57,7 @@ while(<>) { #$block =~ s/<\/ul>/\n.PP\n/g; $block =~ s/<\/dl>/\n/g; $block =~ s/<\/ul>/\n/g; - $block =~ s/<dd>/\n/g; + $block =~ s/<dd>\s*/\n/g; $block =~ s/<\/dd>/\n/g; $block =~ s/<li>\s*/\n.IP \\(bu\n/g; $block =~ s/<dt>\s*/\n.IP "/g; diff --git a/gnu/dist/postfix/proto/BASIC_CONFIGURATION_README.html b/gnu/dist/postfix/proto/BASIC_CONFIGURATION_README.html index d658123bb71..24576b87f59 100644 --- a/gnu/dist/postfix/proto/BASIC_CONFIGURATION_README.html +++ b/gnu/dist/postfix/proto/BASIC_CONFIGURATION_README.html @@ -187,7 +187,7 @@ want to change that into $mydomain, which defaults to the parent domain of the machine name. </p> <p> For the sake of consistency between sender and recipient addresses, -myorigin also specifies the default domain name that is appended +myorigin also specifies the domain name that is appended to an unqualified recipient address. </p> <p> Examples (specify only one of the following): </p> diff --git a/gnu/dist/postfix/proto/header_checks b/gnu/dist/postfix/proto/header_checks index f3a7f835924..6c46afe8cf4 100644 --- a/gnu/dist/postfix/proto/header_checks +++ b/gnu/dist/postfix/proto/header_checks @@ -272,9 +272,9 @@ # .nf # /etc/postfix/main.cf: # .ti +4 -# header_checks = regexp:/etc/postfix/header_checks +# body_checks = regexp:/etc/postfix/body_checks # -# /etc/postfix/header_checks: +# /etc/postfix/body_checks: # .ti +4 # /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/ # .ti +8 diff --git a/gnu/dist/postfix/proto/postconf.proto b/gnu/dist/postfix/proto/postconf.proto index d07d2a83a02..f5c84c97bd2 100644 --- a/gnu/dist/postfix/proto/postconf.proto +++ b/gnu/dist/postfix/proto/postconf.proto @@ -1010,7 +1010,7 @@ Do not change this unless you have a complete understanding of RFC 821. The names of message delivery transports that should not be delivered to unless someone issues "<b>sendmail -q</b>" or equivalent. Specify zero or more names of mail delivery transports names that appear in the -first field of master.cf). +first field of master.cf. </p> <p> @@ -2064,7 +2064,7 @@ What addresses are subject to address masquerading. </p> <p> -By default, address masquerading is limited to envelope recipient +By default, address masquerading is limited to envelope sender addresses, and to header sender and header recipient addresses. This allows you to use address masquerading on a mail gateway while still being able to forward mail to users on individual machines. @@ -2370,7 +2370,7 @@ mynetworks = hash:/etc/postfix/network_table %PARAM myorigin $myhostname <p> -The default domain name that locally-posted mail appears to come +The domain name that locally-posted mail appears to come from, and that locally posted mail is delivered to. The default, $myhostname, is adequate for small sites. If you run a domain with multiple machines, you should (1) change this to $mydomain and (2) @@ -2406,7 +2406,7 @@ The error classes are: <dd>Send the postmaster copies of the headers of bounced mail, and send transcripts of SMTP sessions when Postfix rejects mail. The notification is sent to the address specified with the -bounce_notice_recipient configuration parameter (default: postmaster) +bounce_notice_recipient configuration parameter (default: postmaster). </dd> <dt><b>2bounce</b></dt> @@ -2829,13 +2829,6 @@ recipient addresses with $relay_recipient_maps and rejects non-existent recipients. See also the relay domains address class in the ADDRESS_CLASS_README file. </p> -<p> The list of domains that are by default delivered via the -$local_transport mail delivery transport. By default this is the -Postfix local(8) delivery agent which looks up all recipients in -/etc/passwd and /etc/aliases. The SMTP server validates recipient -addresses with $local_recipient_maps. See also the local domain -address class in the ADDRESS_CLASS_README file. </p> - <p> NOTE: Postfix will not automatically forward mail for domains that list this system as their primary or backup MX host. See the permit_mx_backup restriction in the postconf(5) manual page. </p> @@ -3327,7 +3320,7 @@ This feature is available in Postfix 2.1 and later. <p> The maximal length of message header and body lines that Postfix -will send via SMTP. Longer lines are longer are broken by inserting +will send via SMTP. Longer lines are broken by inserting "<CR><LF><SPACE>". This minimizes the damage to MIME formatted mail. </p> @@ -3611,6 +3604,7 @@ below it), "/file/name" or "type:table" patterns. A "/file/name" pattern is replaced by its contents; a "type:table" lookup table is matched when a table entry matches a lookup string (the lookup result is ignored). Continue long lines by starting the next line +with whitespace. </p> %PARAM smtpd_authorized_verp_clients $authorized_verp_clients @@ -3742,7 +3736,7 @@ restrictions. <p> By default, clients in trusted networks are excluded. Specify a list of network blocks, hostnames or .domain names (the initial -initial dot causes the domain to match any name below it). +dot causes the domain to match any name below it). </p> <p> @@ -4268,7 +4262,7 @@ supposed to give the result to another Postfix SMTP server process. </p> <p> Specify host:port. The host can be specified as an IP address -or was a symbolic name; no MX lookups are done. When no host or +or as a symbolic name; no MX lookups are done. When no host or host: are specified, the local machine is assumed. </p> <p> This feature is available in Postfix 2.1 and later. </p> @@ -4444,8 +4438,7 @@ address. <br> The unknown_address_reject_code parameter specifies the response code for rejected requests (default: 450). The response is always 450 in case of a temporary DNS error.</dd> -<dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b> -(Postfix 2.0 name: check_recipient_maps)</dt> +<dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b> (Postfix 2.0 name: check_recipient_maps)</dt> <dd> Reject the request when the RCPT TO address is not listed in the list of valid recipients for its domain class. See the diff --git a/gnu/dist/postfix/proto/regexp_table b/gnu/dist/postfix/proto/regexp_table index 92c8d782035..3dcd43b2605 100644 --- a/gnu/dist/postfix/proto/regexp_table +++ b/gnu/dist/postfix/proto/regexp_table @@ -54,7 +54,7 @@ # .PP # Each pattern is a POSIX regular expression enclosed by a pair of # delimiters. The regular expression syntax is documented in -# re_format(7) with 4.4BSD, in regcomp(3C) with Solaris, and in +# re_format(7) with 4.4BSD, in regex(5) with Solaris, and in # regex(7) with Linux. Other systems may use other document names. # # The expression delimiter can be any character, except whitespace diff --git a/gnu/dist/postfix/src/global/bounce.c b/gnu/dist/postfix/src/global/bounce.c index 8c5270e4be4..9159b891015 100644 --- a/gnu/dist/postfix/src/global/bounce.c +++ b/gnu/dist/postfix/src/global/bounce.c @@ -1,4 +1,4 @@ -/* $NetBSD: bounce.c,v 1.1.1.6 2004/05/31 00:24:29 heas Exp $ */ +/* $NetBSD: bounce.c,v 1.1.1.7 2004/07/28 22:49:14 heas Exp $ */ /*++ /* NAME @@ -259,10 +259,11 @@ int vbounce_append(int flags, const char *id, const char *orig_rcpt, ATTR_TYPE_STR, MAIL_ATTR_WHY, vstring_str(why), ATTR_TYPE_END) == 0 && ((flags & DEL_REQ_FLAG_RECORD) == 0 - || vtrace_append(flags, id, orig_rcpt, recipient, relay, - entry, dsn_code, dsn_action, fmt, ap) == 0)) { - vlog_adhoc(id, orig_rcpt, recipient, relay, - entry, log_status, fmt, ap); + || trace_append(flags, id, orig_rcpt, recipient, relay, + entry, dsn_code, dsn_action, + "%s", vstring_str(why)) == 0)) { + log_adhoc(id, orig_rcpt, recipient, relay, + entry, log_status, "%s", vstring_str(why)); status = (var_soft_bounce ? -1 : 0); } else if ((flags & BOUNCE_FLAG_CLEAN) == 0) { status = defer_append(flags, id, orig_rcpt, recipient, offset, @@ -386,10 +387,11 @@ int vbounce_one(int flags, const char *queue, const char *id, ATTR_TYPE_STR, MAIL_ATTR_WHY, vstring_str(why), ATTR_TYPE_END) == 0 && ((flags & DEL_REQ_FLAG_RECORD) == 0 - || vtrace_append(flags, id, orig_rcpt, recipient, relay, - entry, "5.0.0", "failed", fmt, ap) == 0)) { - vlog_adhoc(id, orig_rcpt, recipient, relay, - entry, "bounced", fmt, ap); + || trace_append(flags, id, orig_rcpt, recipient, relay, + entry, "5.0.0", "failed", + "%s", vstring_str(why)) == 0)) { + log_adhoc(id, orig_rcpt, recipient, relay, + entry, "bounced", "%s", vstring_str(why)); status = 0; } else if ((flags & BOUNCE_FLAG_CLEAN) == 0) { status = defer_append(flags, id, orig_rcpt, recipient, offset, diff --git a/gnu/dist/postfix/src/global/defer.c b/gnu/dist/postfix/src/global/defer.c index 76baa65c233..47a9399d5fc 100644 --- a/gnu/dist/postfix/src/global/defer.c +++ b/gnu/dist/postfix/src/global/defer.c @@ -1,4 +1,4 @@ -/* $NetBSD: defer.c,v 1.1.1.5 2004/05/31 00:24:29 heas Exp $ */ +/* $NetBSD: defer.c,v 1.1.1.6 2004/07/28 22:49:14 heas Exp $ */ /*++ /* NAME @@ -226,14 +226,16 @@ int vdefer_append(int flags, const char *id, const char *orig_rcpt, ATTR_TYPE_STR, MAIL_ATTR_WHY, vstring_str(why), ATTR_TYPE_END) != 0) msg_warn("%s: %s service failure", id, var_defer_service); - vlog_adhoc(id, orig_rcpt, recipient, relay, entry, "deferred", fmt, ap); + log_adhoc(id, orig_rcpt, recipient, relay, entry, "deferred", + "%s", vstring_str(why)); /* * Traced delivery. */ if (flags & DEL_REQ_FLAG_RECORD) - if (vtrace_append(flags, id, orig_rcpt, recipient, relay, - entry, "4.0.0", "deferred", fmt, ap) != 0) + if (trace_append(flags, id, orig_rcpt, recipient, relay, + entry, "4.0.0", "deferred", + "%s", vstring_str(why)) != 0) msg_warn("%s: %s service failure", id, var_trace_service); /* diff --git a/gnu/dist/postfix/src/global/mail_version.h b/gnu/dist/postfix/src/global/mail_version.h index ba9eb1a1df1..7fbeecaab81 100644 --- a/gnu/dist/postfix/src/global/mail_version.h +++ b/gnu/dist/postfix/src/global/mail_version.h @@ -1,4 +1,4 @@ -/* $NetBSD: mail_version.h,v 1.1.1.15 2004/05/31 00:24:32 heas Exp $ */ +/* $NetBSD: mail_version.h,v 1.1.1.16 2004/07/28 22:49:16 heas Exp $ */ #ifndef _MAIL_VERSION_H_INCLUDED_ #define _MAIL_VERSION_H_INCLUDED_ @@ -22,8 +22,8 @@ * Patches change the patchlevel and the release date. Snapshots change the * release date only. */ -#define MAIL_RELEASE_DATE "20040503" -#define MAIL_VERSION_NUMBER "2.1.1" +#define MAIL_RELEASE_DATE "20040628" +#define MAIL_VERSION_NUMBER "2.1.4" #define VAR_MAIL_VERSION "mail_version" #ifdef SNAPSHOT diff --git a/gnu/dist/postfix/src/global/resolve_clnt.c b/gnu/dist/postfix/src/global/resolve_clnt.c index 6fb6096f9ab..ac16085fdd7 100644 --- a/gnu/dist/postfix/src/global/resolve_clnt.c +++ b/gnu/dist/postfix/src/global/resolve_clnt.c @@ -1,4 +1,4 @@ -/* $NetBSD: resolve_clnt.c,v 1.1.1.7 2004/05/31 00:24:35 heas Exp $ */ +/* $NetBSD: resolve_clnt.c,v 1.1.1.8 2004/07/28 22:49:19 heas Exp $ */ /*++ /* NAME @@ -129,6 +129,7 @@ */ extern CLNT_STREAM *rewrite_clnt_stream; +static VSTRING *last_class; static VSTRING *last_addr; static RESOLVE_REPLY last_reply; @@ -153,6 +154,7 @@ void resolve_clnt(const char *class, const char *addr, RESOLVE_REPLY *reply) * One-entry cache. */ if (last_addr == 0) { + last_class = vstring_alloc(10); last_addr = vstring_alloc(100); resolve_clnt_init(&last_reply); } @@ -171,7 +173,8 @@ void resolve_clnt(const char *class, const char *addr, RESOLVE_REPLY *reply) */ #define IFSET(flag, text) ((reply->flags & (flag)) ? (text) : "") - if (*addr && strcmp(addr, STR(last_addr)) == 0) { + if (*addr && strcmp(addr, STR(last_addr)) == 0 + && strcmp(class, STR(last_class)) == 0) { vstring_strcpy(reply->transport, STR(last_reply.transport)); vstring_strcpy(reply->nexthop, STR(last_reply.nexthop)); vstring_strcpy(reply->recipient, STR(last_reply.recipient)); @@ -248,6 +251,7 @@ void resolve_clnt(const char *class, const char *addr, RESOLVE_REPLY *reply) /* * Update the cache. */ + vstring_strcpy(last_class, class); vstring_strcpy(last_addr, addr); vstring_strcpy(last_reply.transport, STR(reply->transport)); vstring_strcpy(last_reply.nexthop, STR(reply->nexthop)); diff --git a/gnu/dist/postfix/src/global/rewrite_clnt.c b/gnu/dist/postfix/src/global/rewrite_clnt.c index 4ec4b598fd2..5b659b00fa3 100644 --- a/gnu/dist/postfix/src/global/rewrite_clnt.c +++ b/gnu/dist/postfix/src/global/rewrite_clnt.c @@ -1,4 +1,4 @@ -/* $NetBSD: rewrite_clnt.c,v 1.1.1.6 2004/05/31 00:24:35 heas Exp $ */ +/* $NetBSD: rewrite_clnt.c,v 1.1.1.7 2004/07/28 22:49:19 heas Exp $ */ /*++ /* NAME @@ -74,6 +74,7 @@ */ CLNT_STREAM *rewrite_clnt_stream = 0; +static VSTRING *last_rule; static VSTRING *last_addr; static VSTRING *last_result; @@ -87,6 +88,7 @@ VSTRING *rewrite_clnt(const char *rule, const char *addr, VSTRING *result) * One-entry cache. */ if (last_addr == 0) { + last_rule = vstring_alloc(10); last_addr = vstring_alloc(100); last_result = vstring_alloc(100); } @@ -104,10 +106,9 @@ VSTRING *rewrite_clnt(const char *rule, const char *addr, VSTRING *result) /* * Peek at the cache. - * - * XXX Must be made "rule" specific. */ - if (strcmp(addr, STR(last_addr)) == 0) { + if (strcmp(addr, STR(last_addr)) == 0 + && strcmp(rule, STR(last_rule)) == 0) { vstring_strcpy(result, STR(last_result)); if (msg_verbose) msg_info("rewrite_clnt: cached: %s: %s -> %s", @@ -154,6 +155,7 @@ VSTRING *rewrite_clnt(const char *rule, const char *addr, VSTRING *result) /* * Update the cache. */ + vstring_strcpy(last_rule, rule); vstring_strcpy(last_addr, addr); vstring_strcpy(last_result, STR(result)); diff --git a/gnu/dist/postfix/src/global/sent.c b/gnu/dist/postfix/src/global/sent.c index 66d860387d8..28e3c0a42bf 100644 --- a/gnu/dist/postfix/src/global/sent.c +++ b/gnu/dist/postfix/src/global/sent.c @@ -1,4 +1,4 @@ -/* $NetBSD: sent.c,v 1.1.1.4 2004/05/31 00:24:35 heas Exp $ */ +/* $NetBSD: sent.c,v 1.1.1.5 2004/07/28 22:49:18 heas Exp $ */ /*++ /* NAME @@ -163,17 +163,22 @@ int vsent(int flags, const char *id, const char *orig_rcpt, * Normal mail delivery. May also send a delivery record to the user. */ else { + VSTRING *text = vstring_alloc(10); + + vstring_vsprintf(text, fmt, ap); if ((flags & DEL_REQ_FLAG_RECORD) == 0 - || vtrace_append(flags, id, orig_rcpt, recipient, relay, - entry, "2.0.0", "delivered", fmt, ap) == 0) { - vlog_adhoc(id, orig_rcpt, recipient, relay, - entry, "sent", fmt, ap); + || trace_append(flags, id, orig_rcpt, recipient, relay, + entry, "2.0.0", "delivered", + "%s", vstring_str(text)) == 0) { + log_adhoc(id, orig_rcpt, recipient, relay, + entry, "sent", "%s", vstring_str(text)); status = 0; } else { status = defer_append(flags, id, orig_rcpt, recipient, offset, relay, entry, "%s: %s service failed", id, var_trace_service); } + vstring_free(text); return (status); } } diff --git a/gnu/dist/postfix/src/global/trace.c b/gnu/dist/postfix/src/global/trace.c index adc600f81df..a2c588804b0 100644 --- a/gnu/dist/postfix/src/global/trace.c +++ b/gnu/dist/postfix/src/global/trace.c @@ -1,4 +1,4 @@ -/* $NetBSD: trace.c,v 1.1.1.2 2004/05/31 00:24:36 heas Exp $ */ +/* $NetBSD: trace.c,v 1.1.1.3 2004/07/28 22:49:19 heas Exp $ */ /*++ /* NAME @@ -174,8 +174,8 @@ int vtrace_append(int flags, const char *queue_id, req_stat = -1; } else { if (flags & DEL_REQ_FLAG_EXPAND) - vlog_adhoc(queue_id, orig_rcpt, recipient, relay, - entry, dsn_action, fmt, ap); + log_adhoc(queue_id, orig_rcpt, recipient, relay, + entry, dsn_action, "%s", vstring_str(why)); req_stat = 0; } vstring_free(why); diff --git a/gnu/dist/postfix/src/global/verify.c b/gnu/dist/postfix/src/global/verify.c index cc63a1e9f50..f3c80748aed 100644 --- a/gnu/dist/postfix/src/global/verify.c +++ b/gnu/dist/postfix/src/global/verify.c @@ -1,4 +1,4 @@ -/* $NetBSD: verify.c,v 1.1.1.2 2004/05/31 00:24:36 heas Exp $ */ +/* $NetBSD: verify.c,v 1.1.1.3 2004/07/28 22:49:19 heas Exp $ */ /*++ /* NAME @@ -136,26 +136,31 @@ int vverify_append(const char *queue_id, const char *orig_rcpt, time_t entry, const char *status, int rcpt_stat, const char *fmt, va_list ap) { + VSTRING *text = vstring_alloc(10); int req_stat; /* * Impedance adaptor between bounce/defer/sent and verify_clnt. */ + vstring_vsprintf(text, fmt, ap); if (var_verify_neg_cache || rcpt_stat == DEL_RCPT_STAT_OK) { - req_stat = verify_clnt_vupdate(orig_rcpt, rcpt_stat, fmt, ap); + req_stat = verify_clnt_update(orig_rcpt, rcpt_stat, + "%s", vstring_str(text)); if (req_stat == VRFY_STAT_OK && strcasecmp(recipient, orig_rcpt) != 0) - req_stat = verify_clnt_vupdate(recipient, rcpt_stat, fmt, ap); + req_stat = verify_clnt_update(recipient, rcpt_stat, + "%s", vstring_str(text)); } else { status = "undeliverable-but-not-cached"; req_stat = VRFY_STAT_OK; } if (req_stat == VRFY_STAT_OK) { - vlog_adhoc(queue_id, orig_rcpt, recipient, relay, - entry, status, fmt, ap); + log_adhoc(queue_id, orig_rcpt, recipient, relay, + entry, status, "%s", vstring_str(text)); req_stat = 0; } else { msg_warn("%s: %s service failure", queue_id, var_verify_service); req_stat = -1; } + vstring_free(text); return (req_stat); } diff --git a/gnu/dist/postfix/src/oqmgr/qmgr_message.c b/gnu/dist/postfix/src/oqmgr/qmgr_message.c index 647d0aafe4a..41c96836c65 100644 --- a/gnu/dist/postfix/src/oqmgr/qmgr_message.c +++ b/gnu/dist/postfix/src/oqmgr/qmgr_message.c @@ -1,4 +1,4 @@ -/* $NetBSD: qmgr_message.c,v 1.1.1.2 2004/05/31 00:24:40 heas Exp $ */ +/* $NetBSD: qmgr_message.c,v 1.1.1.3 2004/07/28 22:49:23 heas Exp $ */ /*++ /* NAME @@ -938,10 +938,9 @@ static void qmgr_message_resolve(QMGR_MESSAGE *message) * agent resources. We use recipient@nexthop as queue name rather * than the actual recipient domain name, so that one recipient in * multiple equivalent domains cannot evade the per-recipient - * concurrency limit. XXX Should split the address on the recipient - * delimiter if one is defined, but doing a proper job requires - * knowledge of local aliases. Yuck! I don't want to duplicate - * delivery-agent specific knowledge in the queue manager. + * concurrency limit. Split the address on the recipient delimiter if + * one is defined, so that extended addresses don't get extra + * delivery slots. * * Fold the result to lower case so that we don't have multiple queues * for the same name. @@ -949,18 +948,32 @@ static void qmgr_message_resolve(QMGR_MESSAGE *message) * Important! All recipients in a queue must have the same nexthop * value. It is OK to have multiple queues with the same nexthop * value, but only when those queues are named after recipients. + * + * The single-recipient code below was written for local(8) like + * delivery agents, and assumes that all domains that deliver to the + * same (transport + nexthop) are aliases for $nexthop. Delivery + * concurrency is changed from per-domain into per-recipient, by + * changing the queue name from nexthop into localpart@nexthop. + * + * XXX This assumption is incorrect when different destinations share + * the same (transport + nexthop). In reality, such transports are + * rarely configured to use single-recipient deliveries. The fix is + * to decouple the per-destination recipient limit from the + * per-destination concurrency. */ vstring_strcpy(queue_name, STR(reply.nexthop)); if (strcmp(transport->name, MAIL_SERVICE_ERROR) != 0 && transport->recipient_limit == 1) { + /* Copy the recipient localpart. */ at = strrchr(STR(reply.recipient), '@'); len = (at ? (at - STR(reply.recipient)) : strlen(STR(reply.recipient))); - VSTRING_SPACE(queue_name, len + 2); - memmove(STR(queue_name) + len + 1, STR(queue_name), - LEN(queue_name) + 1); - memcpy(STR(queue_name), STR(reply.recipient), len); - STR(queue_name)[len] = '@'; + vstring_strncpy(queue_name, STR(reply.recipient), len); + /* Remove the address extension from the recipient localpart. */ + if (*var_rcpt_delim && split_addr(STR(queue_name), *var_rcpt_delim)) + vstring_truncate(queue_name, strlen(STR(queue_name))); + /* Assume the recipient domain is equivalent to nexthop. */ + vstring_sprintf_append(queue_name, "@%s", STR(reply.nexthop)); } lowercase(STR(queue_name)); diff --git a/gnu/dist/postfix/src/pickup/pickup.c b/gnu/dist/postfix/src/pickup/pickup.c index 6d4a7976663..f000040c035 100644 --- a/gnu/dist/postfix/src/pickup/pickup.c +++ b/gnu/dist/postfix/src/pickup/pickup.c @@ -1,4 +1,4 @@ -/* $NetBSD: pickup.c,v 1.1.1.8 2004/05/31 00:24:41 heas Exp $ */ +/* $NetBSD: pickup.c,v 1.1.1.9 2004/07/28 22:49:23 heas Exp $ */ /*++ /* NAME @@ -37,7 +37,7 @@ /* CONFIGURATION PARAMETERS /* .ad /* .fi -/* As the pickup daemon is a relatively long-running process, up +/* As the pickup(8) daemon is a relatively long-running process, up /* to an hour may pass before a \fBmain.cf\fR change takes effect. /* Use the command "\fBpostfix reload\fR" command to speed up a change. /* diff --git a/gnu/dist/postfix/src/proxymap/proxymap.c b/gnu/dist/postfix/src/proxymap/proxymap.c index 186e14e5f9a..165cbe57e3f 100644 --- a/gnu/dist/postfix/src/proxymap/proxymap.c +++ b/gnu/dist/postfix/src/proxymap/proxymap.c @@ -1,4 +1,4 @@ -/* $NetBSD: proxymap.c,v 1.1.1.4 2004/05/31 00:24:43 heas Exp $ */ +/* $NetBSD: proxymap.c,v 1.1.1.5 2004/07/28 22:49:25 heas Exp $ */ /*++ /* NAME @@ -38,8 +38,8 @@ /* .IP "\fBopen\fR \fImaptype:mapname flags\fR" /* Open the table with type \fImaptype\fR and name \fImapname\fR, /* as controlled by \fIflags\fR. The reply includes the \fImaptype\fR -/* dependent flags (to distinguish a fixed string table from regular -/* a expression table). +/* dependent flags (to distinguish a fixed string table from a regular +/* expression table). /* .IP "\fBlookup\fR \fImaptype:mapname flags key\fR" /* Look up the data stored under the requested key. /* The reply is the request completion status code (below) and diff --git a/gnu/dist/postfix/src/qmgr/qmgr.c b/gnu/dist/postfix/src/qmgr/qmgr.c index 424839ef3e9..8aa2cde40ce 100644 --- a/gnu/dist/postfix/src/qmgr/qmgr.c +++ b/gnu/dist/postfix/src/qmgr/qmgr.c @@ -1,4 +1,4 @@ -/* $NetBSD: qmgr.c,v 1.1.1.6 2004/05/31 00:24:43 heas Exp $ */ +/* $NetBSD: qmgr.c,v 1.1.1.7 2004/07/28 22:49:25 heas Exp $ */ /*++ /* NAME @@ -52,7 +52,7 @@ /* These files are maintained by the \fBdefer\fR(8) daemon. /* .IP \fBtrace\fR /* Per-recipient status information as requested with the -/* Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv" command\fR. +/* Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv\fR" command. /* These files are maintained by the \fBtrace\fR(8) daemon. /* .PP /* The \fBqmgr\fR daemon is responsible for asking the @@ -285,7 +285,7 @@ /* SEE ALSO /* trivial-rewrite(8), address routing /* bounce(8), delivery status reports -/* postconf(5) configuration parameters +/* postconf(5), configuration parameters /* master(8), process manager /* syslogd(8) system logging /* README FILES diff --git a/gnu/dist/postfix/src/smtpd/smtpd_proxy.h b/gnu/dist/postfix/src/smtpd/smtpd_proxy.h index 5a637a3a547..2dbcf5b1ff9 100644 --- a/gnu/dist/postfix/src/smtpd/smtpd_proxy.h +++ b/gnu/dist/postfix/src/smtpd/smtpd_proxy.h @@ -1,4 +1,4 @@ -/* $NetBSD: smtpd_proxy.h,v 1.1.1.2 2004/05/31 00:24:50 heas Exp $ */ +/* $NetBSD: smtpd_proxy.h,v 1.1.1.3 2004/07/28 22:49:29 heas Exp $ */ /*++ /* NAME @@ -26,9 +26,9 @@ #define SMTPD_PROX_WANT_MORE '3' /* Expect 3XX reply */ extern int smtpd_proxy_open(SMTPD_STATE *, const char *, int, const char *, const char *); -extern int smtpd_proxy_cmd(SMTPD_STATE *, int, const char *,...); +extern int PRINTFLIKE(3, 4) smtpd_proxy_cmd(SMTPD_STATE *, int, const char *,...); extern int smtpd_proxy_rec_put(VSTREAM *, int, const char *, int); -extern int smtpd_proxy_rec_fprintf(VSTREAM *, int, const char *,...); +extern int PRINTFLIKE(3, 4) smtpd_proxy_rec_fprintf(VSTREAM *, int, const char *,...); extern void smtpd_proxy_close(SMTPD_STATE *); /* LICENSE diff --git a/gnu/dist/postfix/src/spawn/spawn.c b/gnu/dist/postfix/src/spawn/spawn.c index 3898e22f657..b436139c42c 100644 --- a/gnu/dist/postfix/src/spawn/spawn.c +++ b/gnu/dist/postfix/src/spawn/spawn.c @@ -1,4 +1,4 @@ -/* $NetBSD: spawn.c,v 1.1.1.4 2004/05/31 00:24:51 heas Exp $ */ +/* $NetBSD: spawn.c,v 1.1.1.5 2004/07/28 22:49:30 heas Exp $ */ /*++ /* NAME @@ -55,7 +55,7 @@ /* CONFIGURATION PARAMETERS /* .ad /* .fi -/* Changes to \fBmain.cf\fR are picked up automatically as smtpd(8) +/* Changes to \fBmain.cf\fR are picked up automatically as spawn(8) /* processes run for only a limited amount of time. Use the command /* "\fBpostfix reload\fR" to speed up a change. /* diff --git a/gnu/dist/postfix/src/trivial-rewrite/trivial-rewrite.c b/gnu/dist/postfix/src/trivial-rewrite/trivial-rewrite.c index f87b24bce87..a4b762c6388 100644 --- a/gnu/dist/postfix/src/trivial-rewrite/trivial-rewrite.c +++ b/gnu/dist/postfix/src/trivial-rewrite/trivial-rewrite.c @@ -1,4 +1,4 @@ -/* $NetBSD: trivial-rewrite.c,v 1.1.1.7 2004/05/31 00:24:51 heas Exp $ */ +/* $NetBSD: trivial-rewrite.c,v 1.1.1.8 2004/07/28 22:49:30 heas Exp $ */ /*++ /* NAME @@ -122,7 +122,7 @@ /* ADDRESS VERIFICATION CONTROLS /* .ad /* .fi -/* Postfix version 2.1 introduces sender and address verification. +/* Postfix version 2.1 introduces sender and recipient address verification. /* This feature is implemented by sending probe email messages that /* are not actually delivered. /* By default, address verification probes use the same route |
