From: Wietse Venema After postfix has been built with cdb support, you can use
+ After Postfix has been built with cdb support, you can use
"cdb" tables wherever you can use read-only "hash", "btree" or
"dbm" tables. However, the "postmap -i" (incremental record
insertion) and "postmap -d" (incremental record deletion)
command-line options are not available. For the same reason the
"cdb" map type cannot be used to store the persistent address
-verification cache for the verify(8) service.
Dovecot SASL support is available in Postfix 2.3 and later. The -Dovecot source code is available via http://www.dovecot.org/. At -the time +
Support for the Dovecot version 1 SASL protocol is available +in Postfix 2.3 and later. At the time of writing, only server-side SASL support is available, so you can't use it to authenticate to your network provider's server. Dovecot uses its own daemon process for authentication. This keeps the @@ -127,7 +126,7 @@ in the Postfix top-level directory:
@@ -138,7 +137,7 @@ in the Postfix top-level directory:-% make makefiles CCARGS='-DUSE_SASL_AUTH -DDEF_SASL_SERVER_TYPE=\"dovecot\"' +% make makefiles CCARGS='-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"'
The "-DDEF_SASL_SERVER_TYPE" stuff is not necessary; it just +
The "-DDEF_SERVER_SASL_TYPE" stuff is not necessary; it just makes Postfix configuration a little more convenient because you don't have to specify the SASL plug-in type in the Postfix main.cf file.
diff --git a/postfix/html/bounce.5.html b/postfix/html/bounce.5.html index 104247f9e..7d5ebac31 100644 --- a/postfix/html/bounce.5.html +++ b/postfix/html/bounce.5.html @@ -76,7 +76,7 @@ BOUNCE(5) BOUNCE(5) Subject: Undelivered Mail Returned to Sender Postmaster-Subject: Postmaster Copy: Undelivered Mail - This is the $mail_name program at host $myhostname. + This is the mail system at host $myhostname. I'm sorry to have to inform you that your message could not be delivered to one or more recipients. It's attached below. @@ -86,7 +86,7 @@ BOUNCE(5) BOUNCE(5) If you do so, please include this problem report. You can delete your own text from the attached returned message. - The $mail_name program + The mail system EOF The usage and specification of bounce templates is subject diff --git a/postfix/html/master.5.html b/postfix/html/master.5.html index 06b0f6238..5bddcf7c3 100644 --- a/postfix/html/master.5.html +++ b/postfix/html/master.5.html @@ -147,8 +147,8 @@ MASTER(5) MASTER(5) mented by connecting to the service and sending a wake up request. A ? at the end of the wake-up time field requests that no wake up events be sent - before the service is used. Specify 0 for no auto- - matic wake up. + before the first time a service is used. Specify 0 + for no automatic wake up. The pickup(8), qmgr(8) and flush(8) daemons require a wake up timer. diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index b485dc1d8..3b2d15490 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -5508,6 +5508,11 @@ may wish to turn on the policy (UCE and mail relaying) and protocol error (broken mail software) reports. +NOTE: postmaster notifications may contain confidential information +such as SASL passwords or message content. It is the system +administrator's responsibility to treat such information with care. +
+The error classes are:
@@ -11823,7 +11828,8 @@ message contains no To: or Cc: message header.The numerical Postfix SMTP server response code when a sender or recipient address is rejected by the reject_unknown_sender_domain -or reject_unknown_recipient_domain restriction. +or reject_unknown_recipient_domain restriction. The response is +always 450 in case of a temporary DNS error.
diff --git a/postfix/makedefs b/postfix/makedefs index 02db2f623..db9852b84 100644 --- a/postfix/makedefs +++ b/postfix/makedefs @@ -122,6 +122,8 @@ case "$SYSTEM.$RELEASE" in ;; OpenBSD.3*) SYSTYPE=OPENBSD3 ;; + OpenBSD.4*) SYSTYPE=OPENBSD4 + ;; ekkoBSD.1*) SYSTYPE=EKKOBSD1 ;; NetBSD.1*) SYSTYPE=NETBSD1 diff --git a/postfix/man/man5/bounce.5 b/postfix/man/man5/bounce.5 index 4d2d591f0..ce3d03735 100644 --- a/postfix/man/man5/bounce.5 +++ b/postfix/man/man5/bounce.5 @@ -86,7 +86,7 @@ From: MAILER-DAEMON (Mail Delivery System) Subject: Undelivered Mail Returned to Sender Postmaster-Subject: Postmaster Copy: Undelivered Mail -This is the $mail_name program at host $myhostname. +This is the mail system at host $myhostname. I'm sorry to have to inform you that your message could not be delivered to one or more recipients. It's attached below. @@ -97,7 +97,7 @@ If you do so, please include this problem report. You can delete your own text from the attached returned message. .ti +12 - The $mail_name program + The mail system EOF .in -4 .ad diff --git a/postfix/man/man5/master.5 b/postfix/man/man5/master.5 index 012b1331a..632a5af0f 100644 --- a/postfix/man/man5/master.5 +++ b/postfix/man/man5/master.5 @@ -134,7 +134,7 @@ Automatically wake up the named service after the specified number of seconds. The wake up is implemented by connecting to the service and sending a wake up request. A ? at the end of the wake-up time field requests that no wake up -events be sent before the service is used. +events be sent before the first time a service is used. Specify 0 for no automatic wake up. .sp The \fBpickup\fR(8), \fBqmgr\fR(8) and \fBflush\fR(8) diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index 8484d0216..c37d800ba 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -3019,6 +3019,10 @@ default is to report only the most serious problems. The paranoid may wish to turn on the policy (UCE and mail relaying) and protocol error (broken mail software) reports. .PP +NOTE: postmaster notifications may contain confidential information +such as SASL passwords or message content. It is the system +administrator's responsibility to treat such information with care. +.PP The error classes are: .IP "\fBbounce\fR (also implies \fB2bounce\fR)" Send the postmaster copies of the headers of bounced mail, and @@ -7164,7 +7168,8 @@ message contains no To: or Cc: message header. .SH unknown_address_reject_code (default: 450) The numerical Postfix SMTP server response code when a sender or recipient address is rejected by the reject_unknown_sender_domain -or reject_unknown_recipient_domain restriction. +or reject_unknown_recipient_domain restriction. The response is +always 450 in case of a temporary DNS error. .PP Do not change this unless you have a complete understanding of RFC 821. .SH unknown_client_reject_code (default: 450) diff --git a/postfix/proto/CDB_README.html b/postfix/proto/CDB_README.html index fd56bdc2e..a025cd3e5 100644 --- a/postfix/proto/CDB_README.html +++ b/postfix/proto/CDB_README.html @@ -79,10 +79,11 @@ like:
-After postfix has been built with cdb support, you can use +
After Postfix has been built with cdb support, you can use "cdb" tables wherever you can use read-only "hash", "btree" or "dbm" tables. However, the "postmap -i" (incremental record insertion) and "postmap -d" (incremental record deletion) command-line options are not available. For the same reason the "cdb" map type cannot be used to store the persistent address -verification cache for the verify(8) service.
+verification cache for the verify(8) service, or to store +TLS session information for the tlsmgr(8) service. diff --git a/postfix/proto/SASL_README.html b/postfix/proto/SASL_README.html index cd6d23ab1..b9c662aaf 100644 --- a/postfix/proto/SASL_README.html +++ b/postfix/proto/SASL_README.html @@ -113,9 +113,8 @@ Postfix versions.Dovecot SASL support is available in Postfix 2.3 and later. The -Dovecot source code is available via http://www.dovecot.org/. At -the time +
Support for the Dovecot version 1 SASL protocol is available +in Postfix 2.3 and later. At the time of writing, only server-side SASL support is available, so you can't use it to authenticate to your network provider's server. Dovecot uses its own daemon process for authentication. This keeps the @@ -127,7 +126,7 @@ in the Postfix top-level directory:
@@ -138,7 +137,7 @@ INSTALL document.-% make makefiles CCARGS='-DUSE_SASL_AUTH -DDEF_SASL_SERVER_TYPE=\"dovecot\"' +% make makefiles CCARGS='-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"'
The "-DDEF_SASL_SERVER_TYPE" stuff is not necessary; it just +
The "-DDEF_SERVER_SASL_TYPE" stuff is not necessary; it just makes Postfix configuration a little more convenient because you don't have to specify the SASL plug-in type in the Postfix main.cf file.
diff --git a/postfix/proto/bounce b/postfix/proto/bounce index aaf5fd43f..f770a5e33 100644 --- a/postfix/proto/bounce +++ b/postfix/proto/bounce @@ -76,7 +76,7 @@ # Subject: Undelivered Mail Returned to Sender # Postmaster-Subject: Postmaster Copy: Undelivered Mail # -# This is the $mail_name program at host $myhostname. +# This is the mail system at host $myhostname. # # I'm sorry to have to inform you that your message could not # be delivered to one or more recipients. It's attached below. @@ -87,7 +87,7 @@ # delete your own text from the attached returned message. # # .ti +12 -# The $mail_name program +# The mail system # EOF # .in -4 # .ad diff --git a/postfix/proto/master b/postfix/proto/master index 4720caa8a..57674b13d 100644 --- a/postfix/proto/master +++ b/postfix/proto/master @@ -128,7 +128,7 @@ # number of seconds. The wake up is implemented by connecting # to the service and sending a wake up request. A ? at the # end of the wake-up time field requests that no wake up -# events be sent before the service is used. +# events be sent before the first time a service is used. # Specify 0 for no automatic wake up. # .sp # The \fBpickup\fR(8), \fBqmgr\fR(8) and \fBflush\fR(8) diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index 0918f8db9..f031b6f57 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -2801,6 +2801,11 @@ may wish to turn on the policy (UCE and mail relaying) and protocol error (broken mail software) reports. +NOTE: postmaster notifications may contain confidential information +such as SASL passwords or message content. It is the system +administrator's responsibility to treat such information with care. +
+The error classes are:
@@ -5894,7 +5899,8 @@ The default time unit is s (seconds).The numerical Postfix SMTP server response code when a sender or recipient address is rejected by the reject_unknown_sender_domain -or reject_unknown_recipient_domain restriction. +or reject_unknown_recipient_domain restriction. The response is +always 450 in case of a temporary DNS error.
diff --git a/postfix/src/bounce/2template_test.in b/postfix/src/bounce/2template_test.in
index 0a26bd64d..48063735e 100644
--- a/postfix/src/bounce/2template_test.in
+++ b/postfix/src/bounce/2template_test.in
@@ -4,7 +4,7 @@ From: MAILER-DAEMON (Mail Delivery System)
Subject: Undelivered Mail Returned to Sender
Postmaster-Subject: Postmaster Copy: Undelivered Mail
-This is the $mail_name program at host $myhostname.
+This is the mail system at host $myhostname.
I'm sorry to have to inform you that your message could not
be delivered to one or more recipients. It's attached below.
@@ -14,7 +14,7 @@ For further assistance, please send mail to