diff --git a/gnu/dist/postfix/COPYRIGHT b/gnu/dist/postfix/COPYRIGHT new file mode 100644 index 000000000000..beb9c97d96fb --- /dev/null +++ b/gnu/dist/postfix/COPYRIGHT @@ -0,0 +1,35 @@ +Included for the use of the fix_strcasecmp.c module which works +around a Solaris problem. + +/* + * Copyright (c) 1987, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ diff --git a/gnu/dist/postfix/HISTORY b/gnu/dist/postfix/HISTORY index 14e3ce8cf6da..a6791ab36164 100644 --- a/gnu/dist/postfix/HISTORY +++ b/gnu/dist/postfix/HISTORY @@ -6052,8 +6052,289 @@ Apologies for any names omitted. and /usr/sbin/sendmail differ, and will propose to replace one by a symlink to the other. File: conf/postfix-script. +20020204 + + Sanity: additional permission checks for "postfix check" + that warn for setgid_group group ownership mismatches. by + Matthias Andree, uni-dortmund.de. File: conf/postfix-script. + + Bugfix: "postfix check" used a too simplistic way to + recognize file ownership (grepping ls output). It now uses + the recently discovered "find -prune". Peter Bieringer, + Matthias Andree. File: conf/postfix-script. + +20020218 + + Workaround: log a warning and disconnect when an SMTP client + ignores our negative replies and starts sending message + content without permission. File: smtpd/smtpd.c. + +20020220 + + Bugfix: mismatch in the file being locked by dict_dbm and + the file being locked by postmap, so that locks did not + work correctly. Victor Duchovni, Morgan Stanley. + +20020222 + + Workaround: Solaris bug 4380626: strcasecmp() and strncasecmp() + produce incorrect results with 8-bit characters. For example, + non-ASCII characters could compare equal to ASCII characters, + and that could result in any number of security problems. + Files: util/strcasecmp.c, COPYRIGHT (the BSD license). + + Bugfix: off-by-one error, causing a null byte to be written + outside dynamically allocated memory in the queue manager + with addresses of exactly 100 bytes long, resulting in + SIGSEGV on systems with an "exact fit" malloc routine. + Experienced by Ralf Hildebrandt; diagnosed by Victor + Duchovny. Files: *qmgr/qmgr_message.c. This is not a + security problem. + + Bugfix: make all recipient comparisons transitive, because + Solaris qsort() causes SIGSEGV errors otherwise. Victor + Duchovny, Morgan Stanley. File: *qmgr/qmgr_message.c. + +20020302 + + Bugfix: don't strip source route (@domain...:) when the + result would be an empty address. This avoids problems when + append_at_myorigin is set to "no" (which is not supported). + Problem reported by Charles McColgan, Big Fish Communications. + File: trivial-rewrite/rewrite.c. + +20020304 + + Cleanup: postqueue should not not complain when output + fails with "broken pipe". + +20020308 + + Bugfix? reply with 550 not 552 when content is rejected. + 552 is reserved for "too much mail". + + Documentation: add note to sendmail manual page that running + "sendmail -bs" as $mail_owner enables SMTP server UCE and + access control checks. This is meant for use from inetd etc. + Matthias Andree. + +20020311 + + Bugfix: DBM maps should use different files for locking + and for change detection. Problem reported by Victor + Duchovny, Morgan Stanley. Files: util/dict.h util/dict.c + util/dict_db.c util/dict_dbm.c global/mkmap.c local/alias.c. + +20020313 + + Bugfix: mailq could show addresses with unusual characters + twice. Problem reported by Victor Duchovny, Morgan Stanley. + File: showq/showq.c. + + Bugfix: null recipients weren't properly recorded in + bounce/defer logfiles. Such recipient addresses are not + accepted in SMTP mail, but they could appear within locally + submitted mail. File: bounce/bounce_append_service.c. + +20020318 + + Workaround: Berkeley DB can't handle null key lookups, + which happen with HELO names ending in ".". Victor Duchovni, + Morgan Stanley. File: smtpd/smtpd_check.c. + + Logging: log a hint when mail is deferred because the + soft_bounce parameter is set. People sometimes forget to + turn it off. File: global/bounce.c. + +20020319 + + Cleanup: add a msg_warn() call when fork() fails in + pipe_command(), to make problems easier to investigate. + Chris Wedgwood. File: global/pipe_command.c. + +20020324 + + Cleanup: more graceful handling of long physical message + header lines upon input. Physical header lines can now + extend up to $header_size_limit characters. When a logical + message header is too long, the excess text is discarded + and Postfix no longer switches to body mode, to avoid + breaking MIME encapsulation. Based on code by Victor + Duchovni, Morgan Stanley. Files: cleanup/cleanup_out.c, + cleanup/cleanup_message.c. + + Cleanup: more graceful handling of long physical message + header or body lines upon output by the SMTP client. The + SMTP client output line length is controlled by a new + parameter smtp_line_length_limit (default: 990; specify 0 + to disable the limit). Long lines are folded by inserting + , to avoid breaking MIME encapsulation. + Based on code by Victor Duchovni, Morgan Stanley. File: + smtp/smtp_proto.c. + +20020325 + + Cleanup: allow additional text after a WARN command in a + header/body_checks pattern file, so that one can change + REJECT+text into WARN+text and vice versa. Based on code + by Fredrik Thulin, Stockholm University. + + Cleanup: log a warning when an unknown command is found in + a header/body_checks pattern file, or when additional text + is found after a command that does not expect additional + text. Based on code by Fredrik Thulin, Stockholm University. + + Bugfix: sendmail should not recognize "." as the end of + input when the current read operation started in the middle + of a line. Victor Duchovni, Morgan Stanley. File: + sendmail/sendmail.c. + +20020328 + + Portability fix for OPENSTEP and NEXTSTEP by Gerben Wierda. + File: util/sys_defs.h. + +20020329 + + Bugfix: defer_transports broke because the flush server + triggered mail delivery (as if ETRN was sent) while doing + some internal housekeeping of per-destination logfiles. + Problem experienced by LaMont Jones, HP. File: flush/flush.c. + + Bugfix: virtual mapping broke for addresses with embedded + whitespace. Fix by Victor Duchovni, Morgan Stanley. File: + cleanup/cleanup_map1n.c. + +20020330 + + Bugfix: postqueue did not pass on non-default configuration + directory settings when running showq while the mail system + is down. The super-user is now exempted from environment + stripping in postqueue/postqueue.c. Problem reported by + Victor Duchovni, Morgan Stanley. + +20020414 + + Portability: Postfix will no longer attempt to build with + gdbm support, because gdbm is broken. File: makedefs. + +20020417 + + Bugfix: the post-install script failed to upgrade master.cf + settings from private to public if the service was explicitly + configured as private. + +20020426 + + Bugfix: the SMTP client forgot to quote whitespace etc. + in a sender/recipient address when DNS lookup was turned + off (disable_dns_lookups = yes). Problem experienced by + Chip Paswater. Files: smtp/smtp_proto.c. + +20020503 + + Cleanup: postqueue silently ignored command-line arguments + following -p or -f options, instead of complaining; postqueue + produced an incorrect error message (mail system down) when + the command was installed with incorrect privileges. File: + postqueue/postqueue.c. + + Bugfix: while reporting a domain name or IP address syntax + error, postqueue could dereference a dangling pointer with + some getopt() implementations. LaMont Jones, HP. File: + postqueue/postqueue.c. + +20020504 + + Portability: run-time test to avoid GDBM trouble. File: + util/dict_dbm.c. + +20020508 + + Bugfix: close user@domain@postfix-style.virtual.domain + source routing relaying loophole involving postfix-style + virtual domains with @virtual.domain catch-all patterns. + Problem reported by Victor Duchovny. File: smtpd/smtpd_check.c. + + Bugfix: mail_addr_map() used the "wrong" @ character in + addresses with multiple @. Victor Duchovny. File: + global/mail_addr_map.c. + + Bugfix: for address localpart quoting, now quote @ as a + special character everywhere, except when resolving addresses. + Previously, the @ was nowhere quoted as a special character, + not even in SMTP commands. Files: global/quote_82[12]_local.c + and some clients. + +20020509 + + Safety: don't allow an OK access rule lookup result for + user@domain@postfix-style.virtual.domain. Suggested by + Victor Duchovny, Morgan Stanley. File: smtpd/smtpd_check.c. + + Bugfix: quote unquoted address localparts that need quoting. + Files: global/tok822_parse.c, global/quote_82[12]_local.c. + +20020512 + + Cleanup: the SMTP client logged and bounced the CNAME + expanded recipient address, and thereby complicated trouble + shooting. File: src/smtp_proto.c. + + Bugfix: the SMTP and LMTP clients bounced the quoted + recipient address, resulting in too much quoting in bounce + reports. Files: src/smtp_proto.c, lmtp/lmtp_proto.c. + +20020513 + + Bugfix: the LDAP client used the "wrong" @ character in + addresses with multiple @. LaMont Jones, HP. File: + util/dict_ldap.c. + + Compatibility: forwards "postqueue -r" compatibility with + the additional queue file records that are stored by snapshot + 20050512. + + Cleanup: specify "resolve_dequoted_address = no" to prevent + Postfix from looking inside quotes for extra @ etc. characters + when resolving an address. This behavior is technically + more correct, but it opens a mail relay loophole with "user + @domain"@domain when relaying mail to a Sendmail system. + +20020514 + + Bugfix: the new code for header address quoting sometimes + did not null terminate strings so that arbitrary garbage + could appear at the end of message headers. Reported by + Ralf Hildebrandt. File: global/tok822_parse.c. + + Safety: user@domain@domain is no longer accepted by the + permit_mx_backup uce restriction (unless Postfix is configured + with "resolve_dequoted_address = no"). Victor Duchovny, + Morgan Stanley. File: smtpd/smtpd_check.c. + +20020517 + + Cleanup: Mailbox-Line: message header labels should be + X-Mailbox-Line: labels. Files: smtpd/smtpd.c, qmqpd/qmqpd.c. + +20020526 + + Bugfix: the SMTP server now disallows RCPT TO:<"">, just + like it disallows RCPT TO:<>. File: smtpd/smtpd.c. + + Documentation: replace domain.name by domain.tld in the + example config files. The domain exists. They were getting + mail from poorly configured Postfix boxes. + + Bugfix: The Postfix sendmail command did not export the + MAIL_CONFIG environment setting to the postdrop command. + File: global/mail_config.h. + Open problems: + Low: sendmail does not store null command-line recipients. + Low: don't do user@domain and @domain lookups in local_recipient_maps queries. diff --git a/gnu/dist/postfix/INSTALL b/gnu/dist/postfix/INSTALL index 117cd6d6ec89..cd6d229a9133 100644 --- a/gnu/dist/postfix/INSTALL +++ b/gnu/dist/postfix/INSTALL @@ -222,6 +222,11 @@ In order to install or upgrade Postfix: NB: this group was optional with older Postfix releases; it is now required. +- Optional: If you want to install symbol-stripped (non-debug) versions + of the Postfix programs and daemons, do: + + % strip bin/* libexec/* + - Run one of the following commands as the super-user: # make install (interactive version, first time install) @@ -295,7 +300,7 @@ up virtual interfaces for a variety of UNIX versions. In the /etc/postfix/main.cf file, I would specify - myhostname = virtual.host.name + myhostname = virtual.host.tld inet_interfaces = $myhostname mydestination = $myhostname @@ -381,7 +386,7 @@ configuration language uses lazy evaluation, and does not look at a parameter value until it is needed at runtime. First of all, you must specify what domain will be appended to an -unqualified address (i.e. an address without @domain.name). The +unqualified address (i.e. an address without @domain.tld). The "myorigin" parameter defaults to the local hostname, but that is probably OK only for very small sites. diff --git a/gnu/dist/postfix/README_FILES/ETRN_README b/gnu/dist/postfix/README_FILES/ETRN_README index c7b18d31daec..0dc5d7c12d1e 100644 --- a/gnu/dist/postfix/README_FILES/ETRN_README +++ b/gnu/dist/postfix/README_FILES/ETRN_README @@ -77,7 +77,7 @@ can take a while), you're ready to test the "fast ETRN" service. Telnet to the Postfix SMTP server from a client that is allowed to execute ETRN commands (by default, that's every client), and type: - helo my.client.name + helo my.client.tld etrn some.customer.domain where "some.customer.domain" is the name of a domain that has a @@ -99,7 +99,7 @@ Repeat the exercise with another domain that your server is willing to relay to (domain listed in "relay_domains"), but that has no mail queued. - helo my.client.name + helo my.client.tld etrn some.other.customer.domain This time, the "etrn" command should trigger NO mail deliveries at @@ -110,7 +110,7 @@ Finally, repeat the exercise with a destination that your mail server is not willing to relay to. It does not matter if your server has mail queued for that destination. - helo my.client.name + helo my.client.tld etrn not.a.customer.domain If your "fast ETRN" caching policy is left at its default setting, diff --git a/gnu/dist/postfix/README_FILES/FILTER_README b/gnu/dist/postfix/README_FILES/FILTER_README index a325aa7abdf9..6394904cdbdc 100644 --- a/gnu/dist/postfix/README_FILES/FILTER_README +++ b/gnu/dist/postfix/README_FILES/FILTER_README @@ -51,7 +51,7 @@ The /some/where/filter program can be a simple shell script like this: exit $? The idea is to first capture the message to file and then run the -content through run a third-party content filter program. If the +content through a third-party content filter program. If the mail cannot be captured to file, mail delivery is deferred by terminating with exit status 75 (EX_TEMPFAIL). If the content filter program finds a problem, the mail is bounced by terminating @@ -213,7 +213,7 @@ a dedicated listener on port localhost 10026: localhost:10026 inet n - n - 10 smtpd -o content_filter= -o local_recipient_maps= - -o myhostname=localhost.domain.name + -o myhostname=localhost.domain.tld This is just another SMTP server. It is configured NOT to request content filtering for incoming mail. The server has the same process diff --git a/gnu/dist/postfix/README_FILES/INSTALL b/gnu/dist/postfix/README_FILES/INSTALL index 117cd6d6ec89..cd6d229a9133 100644 --- a/gnu/dist/postfix/README_FILES/INSTALL +++ b/gnu/dist/postfix/README_FILES/INSTALL @@ -222,6 +222,11 @@ In order to install or upgrade Postfix: NB: this group was optional with older Postfix releases; it is now required. +- Optional: If you want to install symbol-stripped (non-debug) versions + of the Postfix programs and daemons, do: + + % strip bin/* libexec/* + - Run one of the following commands as the super-user: # make install (interactive version, first time install) @@ -295,7 +300,7 @@ up virtual interfaces for a variety of UNIX versions. In the /etc/postfix/main.cf file, I would specify - myhostname = virtual.host.name + myhostname = virtual.host.tld inet_interfaces = $myhostname mydestination = $myhostname @@ -381,7 +386,7 @@ configuration language uses lazy evaluation, and does not look at a parameter value until it is needed at runtime. First of all, you must specify what domain will be appended to an -unqualified address (i.e. an address without @domain.name). The +unqualified address (i.e. an address without @domain.tld). The "myorigin" parameter defaults to the local hostname, but that is probably OK only for very small sites. diff --git a/gnu/dist/postfix/README_FILES/LMTP_README b/gnu/dist/postfix/README_FILES/LMTP_README index ca051466b772..06a6878eafc9 100644 --- a/gnu/dist/postfix/README_FILES/LMTP_README +++ b/gnu/dist/postfix/README_FILES/LMTP_README @@ -265,8 +265,8 @@ to route mail for multiple domains to their respective mail retrieval /etc/postfix/transport: - domain1.name lmtp1:unix:/path/name - domain2.name lmtp2:lmtp2host + domain1.tld lmtp1:unix:/path/name + domain2.tld lmtp2:lmtp2host /etc/postfix/master.cf: @@ -466,8 +466,8 @@ Cyrus 1.6.24 LMTP server: /etc/postfix/transport: - domain1.name lmtp1:lmtp1host - domain2.name lmtp2:lmtp2host + domain1.tld lmtp1:lmtp1host + domain2.tld lmtp2:lmtp2host /etc/postfix/master.cf: diff --git a/gnu/dist/postfix/README_FILES/SASL_README b/gnu/dist/postfix/README_FILES/SASL_README index e334ca9fc0f0..aeb6f66db70b 100644 --- a/gnu/dist/postfix/README_FILES/SASL_README +++ b/gnu/dist/postfix/README_FILES/SASL_README @@ -144,9 +144,9 @@ Testing SASL authentication in the Postfix SMTP server To test the whole mess, connect to the SMTP server, and you should be able to have a conversation like this: - 220 server.host.name ESMTP Postfix - EHLO client.host.name - 250-server.host.name + 220 server.host.tld ESMTP Postfix + EHLO client.host.tld + 250-server.host.tld 250-PIPELINING 250-SIZE 10240000 250-ETRN diff --git a/gnu/dist/postfix/README_FILES/VIRTUAL_README b/gnu/dist/postfix/README_FILES/VIRTUAL_README index 0a648ab08611..821919026a95 100644 --- a/gnu/dist/postfix/README_FILES/VIRTUAL_README +++ b/gnu/dist/postfix/README_FILES/VIRTUAL_README @@ -270,11 +270,11 @@ domains): virtual_maps = hash:/etc/postfix/virtual /etc/postfix/virtual: - user@domain.name user@domain.name, user@autoreply.domain.name + user@domain.tld user@domain.tld, user@autoreply.domain.tld This delivers mail to the recipient, and sends a copy of the mail to the address that produces automatic replies. The address can be serviced on a different machine, or it can be serviced locally by setting up a transport map entry that pipes all mail for the -autoreply.domain.name into some script that sends an automatic +autoreply.domain.tld into some script that sends an automatic reply back to the sender. diff --git a/gnu/dist/postfix/RELEASE_NOTES b/gnu/dist/postfix/RELEASE_NOTES index 6b174f3191f9..78a50af89362 100644 --- a/gnu/dist/postfix/RELEASE_NOTES +++ b/gnu/dist/postfix/RELEASE_NOTES @@ -12,6 +12,62 @@ snapshot release). Patches change the patchlevel and the release date. Snapshots change only the release date, unless they include the same bugfix as a patch release. +Incompatible changes with Postfix version 1.1.10 (released 20020514) +==================================================================== + +For safety reasons, the permit_mx_backup restriction no longer +accepts mail for user@domain@domain. To recover the old behavior, +specify "resolve_dequoted_address = no" which opens up a completely +different can of worms as described a few paragraphs down in this +document. + +Incompatible changes with Postfix version 1.1.9 (released 20020513) +=================================================================== + +The Postfix SMTP server by default no longer accepts mail for +user@domain@postfix-style.virtual.domain, to close a relaying +loophole with postfix-style virtual domains that have @domain.name +catch-all patterns. + +To allow such addresses, specify "resolve_dequoted_address = no" +in main.cf (quote the address localpart as per RFC 822, and don't +look for @ or % or ! characters inside the address localpart). +However, this opens opportunities for obscure mail relay attacks +when Postfix provides backup MX service for Sendmail systems. + +The appearance of user@domain1@domain2 addresses has changed. In +mail headers, such addresses are now properly quoted as +"user@domain1"@domain2. As a side effect, this quoted form is now +also expected on the left-hand side of virtual and canonical lookup +tables, but only by some of the Postfix components. For now, it +is better not to use user@domain1@domain2 address forms on the +left-hand side of lookup tables. + +Incompatible changes with Postfix version 1.1.6 (released 20020326) +=================================================================== + +The Postfix SMTP client now breaks message header or body lines +that are longer than $smtp_line_length_limit characters (default: +990). Earlier Postfix versions broke lines at $line_length_limit +characters (default: 2048). Postfix versions before 20010611 did +not break long lines at all. Reportedly, some mail servers refuse +to receive mail with lines that exceed the 1000 character limit +that is specified by the SMTP standard. + +The Postfix SMTP client now breaks long message header or body +lines by inserting . Earlier Postfix versions +broke long lines by inserting only. This broke MIME +encapsulation, causing MIME attachments to "disappear" with Postfix +versions after 20010611. + +Postfix now discards text when a logical message header exceeds +$header_size_limit characters (default: 102400). Earlier Postfix +versions would place excess text, and all following text, in the +message body. The same thing was done when a physical header line +exceeded $line_length_limit characters (default: 2048). Both +behaviors broke MIME encapsulation, causing MIME attachments to +"disappear" with all previous Postfix versions. + Incompatible changes with Postfix version 1.1.3 (released 20020201) =================================================================== @@ -20,7 +76,7 @@ lookup key for the null address, in order to work around bugs in some Berkeley DB implementations. This behavior is controlled with the smtpd_null_access_lookup_key configuration parameter. -On SCO #.2 UNIX, the input rate flow control is now turned off by +On SCO 3.2 UNIX, the input rate flow control is now turned off by default, because of limitations in the SCO UNIX kernel. Incompatible changes with Postfix version 1.1.2 (released 20020125) diff --git a/gnu/dist/postfix/conf/access b/gnu/dist/postfix/conf/access index 4bc39ca06264..0b1148ed08d6 100644 --- a/gnu/dist/postfix/conf/access +++ b/gnu/dist/postfix/conf/access @@ -53,16 +53,16 @@ # user@domain # Matches the specified mail address. # -# domain.name -# Matches domain.name as the domain part of an email +# domain.tld +# Matches domain.tld as the domain part of an email # address. # -# The pattern domain.name also matches subdomains, -# but only when the string smtpd_access_maps is -# listed in the Postfix parent_domain_matches_subdo- -# mains configuration setting. Otherwise, specify -# .domain.name (note the initial dot) in order to -# match subdomains. +# The pattern domain.tld also matches subdomains, but +# only when the string smtpd_access_maps is listed in +# the Postfix parent_domain_matches_subdomains con- +# figuration setting. Otherwise, specify .domain.tld +# (note the initial dot) in order to match subdo- +# mains. # # user@ Matches all mail addresses with the specified user # part. @@ -85,15 +85,15 @@ # networked tables such as NIS, LDAP or SQL, the following # lookup patterns are examined in the order as listed: # -# domain.name -# Matches domain.name. +# domain.tld +# Matches domain.tld. # -# The pattern domain.name also matches subdomains, -# but only when the string smtpd_access_maps is -# listed in the Postfix parent_domain_matches_subdo- -# mains configuration setting. Otherwise, specify -# .domain.name (note the initial dot) in order to -# match subdomains. +# The pattern domain.tld also matches subdomains, but +# only when the string smtpd_access_maps is listed in +# the Postfix parent_domain_matches_subdomains con- +# figuration setting. Otherwise, specify .domain.tld +# (note the initial dot) in order to match subdo- +# mains. # # net.work.addr.ess # diff --git a/gnu/dist/postfix/conf/master.cf b/gnu/dist/postfix/conf/master.cf index 622615671d2e..70a33f47af67 100644 --- a/gnu/dist/postfix/conf/master.cf +++ b/gnu/dist/postfix/conf/master.cf @@ -1,3 +1,5 @@ +# $NetBSD: master.cf,v 1.1.1.5 2002/06/08 22:36:13 itojun Exp $ +# # # Postfix master process configuration file. Each line describes how # a mailer component program should be run. The fields that make up @@ -24,9 +26,9 @@ # Chroot: whether or not the service runs chrooted to the mail queue # directory (pathname is controlled by the queue_directory configuration # variable in the main.cf file). Presently, all Postfix daemons can run -# chrooted, except for the pipe and local daemons. The files in the -# examples/chroot-setup subdirectory describe how to set up a Postfix -# chroot environment for your type of machine. +# chrooted, except for the pipe, virtual and local delivery daemons. +# The files in the examples/chroot-setup subdirectory describe how +# to set up a Postfix chroot environment for your type of machine. # # Wakeup time: automatically wake up the named service after the # specified number of seconds. A ? at the end of the wakeup time diff --git a/gnu/dist/postfix/conf/post-install b/gnu/dist/postfix/conf/post-install index 3feeb4a2e974..4fd59c312450 100644 --- a/gnu/dist/postfix/conf/post-install +++ b/gnu/dist/postfix/conf/post-install @@ -487,12 +487,12 @@ EOF for name in cleanup flush do - grep "^$name[ ]*unix[ ]*-" \ + grep "^$name[ ]*unix[ ]*[-y]" \ $config_directory/master.cf >/dev/null && { echo Editing $config_directory/master.cf, making the $name service public ed $config_directory/master.cf </dev/null || - $WARN not owned by $mail_owner: $dir) - done + # WARNING: this should not descend into the maildrop directory. + # maildrop is the least trusted Postfix directory. + + find $queue_directory/maildrop/. -prune ! -user $mail_owner \ + -exec $WARN not owned by $mail_owner: $queue_directory/maildrop \; for dir in bin etc lib sbin usr do diff --git a/gnu/dist/postfix/conf/sample-aliases.cf b/gnu/dist/postfix/conf/sample-aliases.cf index 6ebebb66de1b..ad9bcc20cfca 100644 --- a/gnu/dist/postfix/conf/sample-aliases.cf +++ b/gnu/dist/postfix/conf/sample-aliases.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-aliases.cf,v 1.1.1.3 2002/06/08 22:36:14 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-auth.cf b/gnu/dist/postfix/conf/sample-auth.cf index 00920bde7369..29805efc7df9 100644 --- a/gnu/dist/postfix/conf/sample-auth.cf +++ b/gnu/dist/postfix/conf/sample-auth.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-auth.cf,v 1.1.1.3 2002/06/08 22:36:15 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-canonical.cf b/gnu/dist/postfix/conf/sample-canonical.cf index 474976b70a8c..413557ba2333 100644 --- a/gnu/dist/postfix/conf/sample-canonical.cf +++ b/gnu/dist/postfix/conf/sample-canonical.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-canonical.cf,v 1.1.1.3 2002/06/08 22:36:15 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-compatibility.cf b/gnu/dist/postfix/conf/sample-compatibility.cf index 868ee5df0f9c..5445c25bd1d5 100644 --- a/gnu/dist/postfix/conf/sample-compatibility.cf +++ b/gnu/dist/postfix/conf/sample-compatibility.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-compatibility.cf,v 1.1.1.3 2002/06/08 22:36:15 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # @@ -24,19 +26,15 @@ ignore_mx_lookup_error = no # The smtp_always_send_ehlo parameter specifies that the SMTP client # should always send EHLO at the start of an SMTP session. # -# By default, Postfix sends EHLO only when the word "ESMTP" appears -# in the server greeting banner (example: 220 spike.porcupine.org +# If you specify "no", Postfix sends EHLO only when the word "ESMTP" +# appears in the server greeting banner (example: 220 spike.porcupine.org # ESMTP Postfix). # -smtp_always_send_ehlo = no +smtp_always_send_ehlo = yes # The smtp_never_send_ehlo parameter specifies that the SMTP client # should never send EHLO at the start of an SMTP session. # -# By default, Postfix sends EHLO whenever the word "ESMTP" appears -# in the server greeting banner (example: 220 spike.porcupine.org -# ESMTP Postfix). -# smtp_never_send_ehlo = no # The smtp_skip_4xx_greeting parameter controls what happens when diff --git a/gnu/dist/postfix/conf/sample-debug.cf b/gnu/dist/postfix/conf/sample-debug.cf index 5f850ddc7513..3f8e358cf966 100644 --- a/gnu/dist/postfix/conf/sample-debug.cf +++ b/gnu/dist/postfix/conf/sample-debug.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-debug.cf,v 1.1.1.3 2002/06/08 22:36:15 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-filter.cf b/gnu/dist/postfix/conf/sample-filter.cf index 8b9c960384e0..826cebf4d8ac 100644 --- a/gnu/dist/postfix/conf/sample-filter.cf +++ b/gnu/dist/postfix/conf/sample-filter.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-filter.cf,v 1.1.1.4 2002/06/08 22:36:15 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # @@ -15,6 +17,7 @@ # REJECT text.... The text is sent to the originator. # IGNORE the header line is silently discarded. # WARN the header is logged (not rejected) with a warning message. +# WARN text... as above, and the text is logged, too. # # These patterns do not apply to MIME headers in the message body. # @@ -34,5 +37,6 @@ header_checks = regexp:/etc/postfix/header_checks # REJECT text.... The text is sent to the originator. # IGNORE the body line is silently discarded. # WARN the body line is logged (not rejected) with a warning message. +# WARN text... as above, and the text is logged, too. # body_checks = regexp:/etc/postfix/body_checks diff --git a/gnu/dist/postfix/conf/sample-flush.cf b/gnu/dist/postfix/conf/sample-flush.cf index 2db8143686bc..357421e3dec4 100644 --- a/gnu/dist/postfix/conf/sample-flush.cf +++ b/gnu/dist/postfix/conf/sample-flush.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-flush.cf,v 1.1.1.3 2002/06/08 22:36:15 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-ldap.cf b/gnu/dist/postfix/conf/sample-ldap.cf index 58a752a33b25..bf3a54bdbe81 100644 --- a/gnu/dist/postfix/conf/sample-ldap.cf +++ b/gnu/dist/postfix/conf/sample-ldap.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-ldap.cf,v 1.1.1.6 2002/06/08 22:36:15 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-lmtp.cf b/gnu/dist/postfix/conf/sample-lmtp.cf index 9e2699cccbd3..d2b8f47be2f5 100644 --- a/gnu/dist/postfix/conf/sample-lmtp.cf +++ b/gnu/dist/postfix/conf/sample-lmtp.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-lmtp.cf,v 1.1.1.3 2002/06/08 22:36:15 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-local.cf b/gnu/dist/postfix/conf/sample-local.cf index 5e61971bb207..f24545019301 100644 --- a/gnu/dist/postfix/conf/sample-local.cf +++ b/gnu/dist/postfix/conf/sample-local.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-local.cf,v 1.1.1.5 2002/06/08 22:36:15 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-misc.cf b/gnu/dist/postfix/conf/sample-misc.cf index d848d9119752..6b4f573519aa 100644 --- a/gnu/dist/postfix/conf/sample-misc.cf +++ b/gnu/dist/postfix/conf/sample-misc.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-misc.cf,v 1.1.1.6 2002/06/08 22:36:15 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # @@ -196,14 +198,14 @@ mydestination = $myhostname, localhost.$mydomain # $mydomain is used as a default value for many other configuration # parameters. # -#mydomain = domain.name +#mydomain = domain.tld # The myhostname parameter specifies the internet hostname of this # mail system. The default is to use the fully-qualified domain name # from gethostname(). $myhostname is used as a default value for many # other configuration parameters. # -#myhostname = host.domain.name +#myhostname = host.domain.tld # The myorigin parameter specifies the domain that locally-posted # mail appears to come from. The default is to append $myhostname, @@ -273,10 +275,10 @@ delay_notice_recipient = postmaster error_notice_recipient = postmaster # The parent_domain_matches_subdomains parameter specifies what -# Postfix features use "domain.name matches sub.domain.name" style -# pattern matching instead of requiring ".domain.name". This is +# Postfix features use "domain.tld matches sub.domain.tld" style +# pattern matching instead of requiring ".domain.tld". This is # planned backwards compatibility: eventually, all Postfix features -# are expected to require ".domain.name" style patterns. +# are expected to require ".domain.tld" style patterns. # parent_domain_matches_subdomains = debug_peer_list,fast_flush_domains, mynetworks,permit_mx_backup_networks,qmqpd_authorized_clients, @@ -362,6 +364,22 @@ relayhost = #relocated_maps = hash:/etc/postfix/relocated relocated_maps = +# The resolve_dequoted_address parameter controls how Postfix +# resolves addresses. +# +# By default, the Postfix address resolver does not quote the address +# localpart as per RFC 822, so that additional @ or % or ! operators +# remain visible. This behavior is safe but it is also technically +# incorrect. +# +# If you specify "resolve_dequoted_address = no", then the Postfix +# resolver will not know about additional @ etc. operators in the +# address localpart. This opens opportunities for obscure mail relay +# attacks with user@domain@domain addresses when Postfix provides +# backup MX service for Sendmail systems. +# +resolve_dequoted_address = no + # The syslog_facility parameter controls where Postfix logging is # sent by the syslog daemon. Specify a logging facility as defined # in syslog.conf(5). The default logging facility is "mail". diff --git a/gnu/dist/postfix/conf/sample-pcre-access.cf b/gnu/dist/postfix/conf/sample-pcre-access.cf index 849641fc0e74..936e5b4d5b44 100644 --- a/gnu/dist/postfix/conf/sample-pcre-access.cf +++ b/gnu/dist/postfix/conf/sample-pcre-access.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-pcre-access.cf,v 1.1.1.2 2002/06/08 22:36:15 itojun Exp $ +# # # Sample pcre (PERL-compatible regular expression) map file for # SMTPD access control. See pcre_table(5) and access(5) for diff --git a/gnu/dist/postfix/conf/sample-pcre-body.cf b/gnu/dist/postfix/conf/sample-pcre-body.cf index df3c6e03b6a6..bfee7c4eba16 100644 --- a/gnu/dist/postfix/conf/sample-pcre-body.cf +++ b/gnu/dist/postfix/conf/sample-pcre-body.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-pcre-body.cf,v 1.1.1.2 2002/06/08 22:36:16 itojun Exp $ +# # # Sample pcre (PERL-compatible regular expression) map file for # mail body filtering. See pcre_table(5) for syntax description. @@ -25,6 +27,7 @@ # REJECT text.... The text is sent to the originator. # IGNORE The line is silently discarded. # WARN The line is logged (not rejected) with a warning. +# WARN text.... As above, and the text is logged, too. # # Substitution of sub-strings from the matched expression is # possible using the conventional perl syntax. The macros in the diff --git a/gnu/dist/postfix/conf/sample-pcre-header.cf b/gnu/dist/postfix/conf/sample-pcre-header.cf index 6e5af4178cd9..d2b3aded96fd 100644 --- a/gnu/dist/postfix/conf/sample-pcre-header.cf +++ b/gnu/dist/postfix/conf/sample-pcre-header.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-pcre-header.cf,v 1.1.1.2 2002/06/08 22:36:16 itojun Exp $ +# # # Sample pcre (PERL-compatible regular expression) map file for # message header filtering. See pcre_table(5) for syntax description. @@ -25,6 +27,7 @@ # REJECT text.... The text is sent to the originator. # IGNORE The header line is silently discarded. # WARN The header is logged (not rejected) with a warning. +# WARN text.... As above, and the text is logged, too. # # Substitution of sub-strings from the matched expression is # possible using the conventional perl syntax. The macros in the diff --git a/gnu/dist/postfix/conf/sample-qmqpd.cf b/gnu/dist/postfix/conf/sample-qmqpd.cf index 03d26ee3c4fc..cbc38d75f608 100644 --- a/gnu/dist/postfix/conf/sample-qmqpd.cf +++ b/gnu/dist/postfix/conf/sample-qmqpd.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-qmqpd.cf,v 1.1.1.2 2002/06/08 22:36:16 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-rate.cf b/gnu/dist/postfix/conf/sample-rate.cf index 8cd1bb4e4d12..3225c290c601 100644 --- a/gnu/dist/postfix/conf/sample-rate.cf +++ b/gnu/dist/postfix/conf/sample-rate.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-rate.cf,v 1.1.1.3 2002/06/08 22:36:16 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-regexp-access.cf b/gnu/dist/postfix/conf/sample-regexp-access.cf index 9ac54c1ab769..71d2984c8976 100644 --- a/gnu/dist/postfix/conf/sample-regexp-access.cf +++ b/gnu/dist/postfix/conf/sample-regexp-access.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-regexp-access.cf,v 1.1.1.2 2002/06/08 22:36:16 itojun Exp $ +# # Sample regexp SMTPD access lookup "table". See regexp_table(5) # and access(5) for a description of the syntax. # diff --git a/gnu/dist/postfix/conf/sample-regexp-body.cf b/gnu/dist/postfix/conf/sample-regexp-body.cf index f9d3172dab3d..5f85cbac69cf 100644 --- a/gnu/dist/postfix/conf/sample-regexp-body.cf +++ b/gnu/dist/postfix/conf/sample-regexp-body.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-regexp-body.cf,v 1.1.1.2 2002/06/08 22:36:16 itojun Exp $ +# # Sample regexp message body filter lookup "table". See regexp_table(5) # for a description of the syntax. # @@ -21,3 +23,4 @@ # REJECT text.... The text is sent to the originator. # IGNORE The header line is silently discarded. # WARN The header is logged (not rejected) with a warning. +# WARN text.... As above, and the text is logged, too. diff --git a/gnu/dist/postfix/conf/sample-regexp-header.cf b/gnu/dist/postfix/conf/sample-regexp-header.cf index 6d46bdad2ebc..57a63002fb02 100644 --- a/gnu/dist/postfix/conf/sample-regexp-header.cf +++ b/gnu/dist/postfix/conf/sample-regexp-header.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-regexp-header.cf,v 1.1.1.2 2002/06/08 22:36:16 itojun Exp $ +# # Sample regexp message header filter lookup "table". See regexp_table(5) # for a description of the syntax. # @@ -22,6 +24,7 @@ # REJECT text.... The text is sent to the originator. # IGNORE the header line is silently discarded. # WARN the header is logged (not rejected) with a warning. +# WARN text... As above, and the text is logged, too. /^Subject: Make Money Fast/ REJECT /^To: friend@public.com/ REJECT diff --git a/gnu/dist/postfix/conf/sample-relocated.cf b/gnu/dist/postfix/conf/sample-relocated.cf index 611134b0a643..4e8617c6039f 100644 --- a/gnu/dist/postfix/conf/sample-relocated.cf +++ b/gnu/dist/postfix/conf/sample-relocated.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-relocated.cf,v 1.1.1.3 2002/06/08 22:36:16 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-resource.cf b/gnu/dist/postfix/conf/sample-resource.cf index 13c7211b55ad..878b4f9379dd 100644 --- a/gnu/dist/postfix/conf/sample-resource.cf +++ b/gnu/dist/postfix/conf/sample-resource.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-resource.cf,v 1.1.1.3 2002/06/08 22:36:16 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-rewrite.cf b/gnu/dist/postfix/conf/sample-rewrite.cf index c4d5e1ea1943..0b8a13dbac9c 100644 --- a/gnu/dist/postfix/conf/sample-rewrite.cf +++ b/gnu/dist/postfix/conf/sample-rewrite.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-rewrite.cf,v 1.1.1.4 2002/06/08 22:36:16 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-smtp.cf b/gnu/dist/postfix/conf/sample-smtp.cf index d2648e42ce4c..52e09953234a 100644 --- a/gnu/dist/postfix/conf/sample-smtp.cf +++ b/gnu/dist/postfix/conf/sample-smtp.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-smtp.cf,v 1.1.1.4 2002/06/08 22:36:16 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # @@ -65,13 +67,14 @@ smtp_never_send_ehlo = no # #smtp_bind_address=111.222.333.444 -# The smtp_break_lines parameter controls whether the SMTP client -# will break lines longer than $line_length_limit characters. +# The smtp_line_length_limit parameter controls the length of +# message header and body lines that Postfix will send via SMTP. +# Lines that are longer are broken by inserting . # -# By default, line breaking is turned on, because some fragile SMTP -# server implementations cannot receive mail with long lines. +# By default, the line length is limited to 990 characters, because +# some server implementations cannot receive mail with long lines. # -#smtp_break_lines = yes +#smtp_line_length_limit = 990 # The smtp_skip_4xx_greeting parameter controls what happens when # an SMTP server greets us with a 4XX status code (go away, try diff --git a/gnu/dist/postfix/conf/sample-smtpd.cf b/gnu/dist/postfix/conf/sample-smtpd.cf index 2882009b6951..c8960ccd70c0 100644 --- a/gnu/dist/postfix/conf/sample-smtpd.cf +++ b/gnu/dist/postfix/conf/sample-smtpd.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-smtpd.cf,v 1.1.1.5 2002/06/08 22:36:16 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # @@ -440,7 +442,7 @@ relay_domains = $mydestination # The access_map_reject_code parameter specifies the SMTP server # response code when a client violates an access map restriction. # -# Do not change this unless you have a complete understanding of RFC 822. +# Do not change this unless you have a complete understanding of RFC 821. # access_map_reject_code = 550 @@ -448,28 +450,28 @@ access_map_reject_code = 550 # response when a client violates the reject_invalid_hostname anti-UCE # restriction. # -# Do not change this unless you have a complete understanding of RFC 822. +# Do not change this unless you have a complete understanding of RFC 821. # invalid_hostname_reject_code = 501 # The maps_rbl_reject_code parameter specifies the SMTP server response # when a client violates the maps_rbl_domains restriction. # -# Do not change this unless you have a complete understanding of RFC 822. +# Do not change this unless you have a complete understanding of RFC 821. # maps_rbl_reject_code = 550 # The reject_code parameter specifies the SMTP server response code # when an SMTP client matches a reject restriction. # -# Do not change this unless you have a complete understanding of RFC 822. +# Do not change this unless you have a complete understanding of RFC 821. # reject_code = 550 # The relay_domains_reject_code parameter specifies the SMTP server # response when a client attempts to violate the mail relay policy. # -# Do not change this unless you have a complete understanding of RFC 822. +# Do not change this unless you have a complete understanding of RFC 821. # relay_domains_reject_code = 550 @@ -477,7 +479,7 @@ relay_domains_reject_code = 550 # response when a client violates the reject_unknown_sender_domain # or reject_unknown_recipient_domain restrictions. # -# Do not change this unless you have a complete understanding of RFC 822. +# Do not change this unless you have a complete understanding of RFC 821. # unknown_address_reject_code = 450 @@ -485,7 +487,7 @@ unknown_address_reject_code = 450 # response when a client without address to name mapping violates # the reject_unknown_clients restriction. # -# Do not change this unless you have a complete understanding of RFC 822. +# Do not change this unless you have a complete understanding of RFC 821. # unknown_client_reject_code = 450 @@ -493,6 +495,6 @@ unknown_client_reject_code = 450 # response when a client violates the reject_unknown_hostname # restriction. # -# Do not change this unless you have a complete understanding of RFC 822. +# Do not change this unless you have a complete understanding of RFC 821. # unknown_hostname_reject_code = 450 diff --git a/gnu/dist/postfix/conf/sample-transport.cf b/gnu/dist/postfix/conf/sample-transport.cf index 79d6f87d0f62..4576d96a5564 100644 --- a/gnu/dist/postfix/conf/sample-transport.cf +++ b/gnu/dist/postfix/conf/sample-transport.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-transport.cf,v 1.1.1.3 2002/06/08 22:36:16 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/sample-virtual.cf b/gnu/dist/postfix/conf/sample-virtual.cf index f11ccc317c35..875046662336 100644 --- a/gnu/dist/postfix/conf/sample-virtual.cf +++ b/gnu/dist/postfix/conf/sample-virtual.cf @@ -1,3 +1,5 @@ +# $NetBSD: sample-virtual.cf,v 1.1.1.3 2002/06/08 22:36:16 itojun Exp $ +# # DO NOT EDIT THIS FILE. EDIT THE MAIN.CF FILE INSTEAD. THE STUFF # HERE JUST SERVES AS AN EXAMPLE. # diff --git a/gnu/dist/postfix/conf/transport b/gnu/dist/postfix/conf/transport index 3d6e07f0dcb6..fc4cf85347aa 100644 --- a/gnu/dist/postfix/conf/transport +++ b/gnu/dist/postfix/conf/transport @@ -1,4 +1,3 @@ -# # TRANSPORT(5) TRANSPORT(5) # # NAME @@ -149,9 +148,9 @@ # command after a configuration change. # # parent_domain_matches_subdomains -# List of Postfix features that use domain.name pat- -# terns to match sub.domain.name (as opposed to -# requiring .domain.name patterns). +# List of Postfix features that use domain.tld pat- +# terns to match sub.domain.tld (as opposed to +# requiring .domain.tld patterns). # # transport_maps # List of transport lookup tables. @@ -182,5 +181,4 @@ # P.O. Box 704 # Yorktown Heights, NY 10598, USA # -# 1 -# +# TRANSPORT(5) diff --git a/gnu/dist/postfix/html/access.5.html b/gnu/dist/postfix/html/access.5.html index c393a7fee3e7..2e1400596516 100644 --- a/gnu/dist/postfix/html/access.5.html +++ b/gnu/dist/postfix/html/access.5.html @@ -54,16 +54,16 @@ ACCESS(5) ACCESS(5) user@domain Matches the specified mail address. - domain.name - Matches domain.name as the domain part of an email + domain.tld + Matches domain.tld as the domain part of an email address. - The pattern domain.name also matches subdomains, - but only when the string smtpd_access_maps is - listed in the Postfix parent_domain_matches_subdo- - mains configuration setting. Otherwise, specify - .domain.name (note the initial dot) in order to - match subdomains. + The pattern domain.tld also matches subdomains, but + only when the string smtpd_access_maps is listed in + the Postfix parent_domain_matches_subdomains con- + figuration setting. Otherwise, specify .domain.tld + (note the initial dot) in order to match subdo- + mains. user@ Matches all mail addresses with the specified user part. @@ -86,15 +86,15 @@ ACCESS(5) ACCESS(5) networked tables such as NIS, LDAP or SQL, the following lookup patterns are examined in the order as listed: - domain.name - Matches domain.name. + domain.tld + Matches domain.tld. - The pattern domain.name also matches subdomains, - but only when the string smtpd_access_maps is - listed in the Postfix parent_domain_matches_subdo- - mains configuration setting. Otherwise, specify - .domain.name (note the initial dot) in order to - match subdomains. + The pattern domain.tld also matches subdomains, but + only when the string smtpd_access_maps is listed in + the Postfix parent_domain_matches_subdomains con- + figuration setting. Otherwise, specify .domain.tld + (note the initial dot) in order to match subdo- + mains. net.work.addr.ess @@ -122,7 +122,7 @@ ACCESS(5) ACCESS(5) tion schemes. restriction... - Apply the named UCE restriction(s) (permit, reject, + Apply the named UCE restriction(s) (permit, reject, reject_unauth_destination, and so on). REGULAR EXPRESSION TABLES diff --git a/gnu/dist/postfix/html/basic.html b/gnu/dist/postfix/html/basic.html index 7e38a8d6c454..26db800a8615 100644 --- a/gnu/dist/postfix/html/basic.html +++ b/gnu/dist/postfix/html/basic.html @@ -410,7 +410,7 @@ or you would have a mailer loop.
Host running virtual mailers: -
inet_interfaces = virtual.host.name (virtual domain) +
inet_interfaces = virtual.host.tld (virtual domain)
inet_interfaces = $myhostname localhost.$mydomain (non-virtual mailer) diff --git a/gnu/dist/postfix/html/faq.html b/gnu/dist/postfix/html/faq.html index 85f8cb644e4e..a3a1dccf247e 100644 --- a/gnu/dist/postfix/html/faq.html +++ b/gnu/dist/postfix/html/faq.html @@ -1748,10 +1748,10 @@ all you need: 
     DNS:
-        the.backed-up.domain.name        IN      MX 100 your.machine.name
+        the.backed-up.domain.tld        IN      MX 100 your.machine.tld
 
     /etc/postfix/main.cf:
-        relay_domains = $mydestination the.backed-up.domain.name
+        relay_domains = $mydestination the.backed-up.domain.tld
 	smtpd_recipient_restrictions = permit_mynetworks check_relay_domains
@@ -1767,7 +1767,7 @@ need: transport_maps = hash:/etc/postfix/transport /etc/postfix/transport: - the.backed-up.domain.name smtp:[their.mail.host.name] + the.backed-up.domain.tld smtp:[their.mail.host.tld]

@@ -2208,14 +2208,14 @@ mail as user@domain