From a2da6db108a0f70cb500cc8f655330adaf696a74 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Mon, 9 May 2005 00:00:00 -0500 Subject: [PATCH] postfix-2.1.6 --- postfix/HISTORY | 73 +++++++++++++++++++++++++ postfix/README_FILES/SMTPD_PROXY_README | 12 ++-- postfix/RELEASE_NOTES | 5 ++ postfix/auxiliary/qshape/qshape.pl | 13 +++-- postfix/conf/post-install | 7 ++- postfix/html/SMTPD_PROXY_README.html | 7 ++- postfix/html/cleanup.8.html | 6 +- postfix/html/local.8.html | 6 +- postfix/html/postconf.5.html | 7 ++- postfix/html/qshape.1.html | 14 ++--- postfix/man/man1/qshape.1 | 10 ++-- postfix/man/man5/postconf.5 | 19 ++++--- postfix/man/man8/cleanup.8 | 2 +- postfix/man/man8/local.8 | 2 +- postfix/mantools/postconf2man | 2 + postfix/proto/SMTPD_PROXY_README.html | 7 ++- postfix/proto/postconf.proto | 7 ++- postfix/src/bounce/bounce_notify_util.c | 2 +- postfix/src/cleanup/cleanup.c | 6 +- postfix/src/global/mail_version.h | 4 +- postfix/src/lmtp/lmtp_chat.c | 8 ++- postfix/src/lmtp/lmtp_sasl_glue.c | 2 +- postfix/src/lmtp/lmtp_trouble.c | 2 + postfix/src/local/local.c | 4 +- postfix/src/postdrop/postdrop.c | 23 ++++---- postfix/src/sendmail/sendmail.c | 21 ++++++- postfix/src/smtp/smtp_chat.c | 8 ++- postfix/src/smtp/smtp_sasl_glue.c | 2 +- postfix/src/smtp/smtp_trouble.c | 3 + postfix/src/smtpd/smtpd_sasl_glue.c | 2 +- postfix/src/virtual/virtual.c | 2 +- 31 files changed, 204 insertions(+), 84 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index 2b87ee8c9..365a412d8 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -9452,3 +9452,76 @@ Apologies for any names omitted. Bugfix (introduced 20020803): sent the wrong bounce message type when a Delivered-To: loop was detected for a mailing list alias. Nicolas Riendeau. File: bounce_notify_util.c. + +20041006 + + Bugfix: "sendmail -bv" did not reject the -t option. File: + sendmail/sendmail.c + +20041228 + + Bugfix: SMTPD_PROXY_README incorrectly claimed that ":port" + in master.cf causes a server to listen only on "localhost" + without exposing the service to the network. Instead, + ":port" causes a client to connect to "localhost". + + +20050131 + + Bugfix: when extracting recipients from message headers, + the Postfix sendmail command produced output records longer + than $line_length_limit, causing postdrop to reject the + mail. Diagnosis by Victor Duchovni. File: sendmail/sendmail.c. + +20050208 + + Sanity check: don't allow unlimited message size with limited + mailbox size. File: local/local.c, virtual/virtual.c. + +20050215 + + Bugfix: don't chmod queue files while running "postfix + set-permissions". This prevents mail from being labeled as + "corrupt" when a live Postfix system is upgraded. Found + by Victor Duchovni. File: conf/post-install. + +20050227 + + Bugfix (bug introduced 20040331): with SIGHUP ignored, the + postdrop signal handler would effectively ignore SIGINT, + SIGQUIT and SIGTERM. Simplified the overly-conservative + protection against nested signals in postdrop. File: + postdrop/postdrop.c. + +20050321 + + Robustness: don't look for SMTP status code when there was + none. File: smtp/smtp_chat.c, lmtp/lmtp_chat.c. + +20050327 + + Bugfix: the SMTP and LMTP clients did not ask the queue + manager to reduce destination concurrency when "lost + connection" or "connection timed out" happened AFTER Postfix + received the server greeting. Files: smtp/smtp_trouble.c, + lmtp/lmtp-trouble.c. + +20050407 + + @%^!#& Thanks to inadequate SASL documentation the client + could negotiate a security layer where none was desired. + Better documentation has become available since Postfix + SASL support was implemented, and now Postfix needs to be + fixed. Files: */*_sasl_glue.c. + +20050412 + + Bugfix: while updating the cleanup_flush() infrastructure + in the 2.3 development release, eliminated a portability + problem that was introduced when "REJECT text" support was + added. File: cleanup/cleanup.c. + +20050417 + + Safety: don't call syslog from a user-triggered signal + handler. File: postdrop/postdrop.c. diff --git a/postfix/README_FILES/SMTPD_PROXY_README b/postfix/README_FILES/SMTPD_PROXY_README index 812569931..aa9bb8d4f 100644 --- a/postfix/README_FILES/SMTPD_PROXY_README +++ b/postfix/README_FILES/SMTPD_PROXY_README @@ -111,7 +111,7 @@ This is configured by editing the master.cf file: # After-filter SMTP server. Receive mail from the content filter # on localhost port 10026. # - :10026 inet n - n - - smtpd + 127.0.0.1:10026 inet n - n - - smtpd -o smtpd_authorized_xforward_hosts=127.0.0.0/8 -o smtpd_client_restrictions= -o smtpd_helo_restrictions= @@ -145,9 +145,9 @@ master.cf file: The after-filter SMTP server is a new master.cf entry: - * The ":10026" makes the after-filter SMTP server listen on the localhost - address only, without exposing it to the network. NEVER expose the after- - filter SMTP server to the Internet :-) + * The "127.0.0.1:10026" makes the after-filter SMTP server listen on the + localhost address only, without exposing it to the network. NEVER expose + the after-filter SMTP server to the Internet :-) * The "-o smtpd_authorized_xforward_hosts=127.0.0.0/8" allows the after- filter SMTP server to receive remote SMTP client information from the @@ -168,8 +168,8 @@ CCoonnffiigguurraattiioonn ppaarraammeetteerrss Parameters that control proxying: * smtpd_proxy_filter (syntax: host:port): The host and TCP port of the - before-queue content filter. When no host or host: is specified, localhost - is assumed. + before-queue content filter. When no host or host: is specified in client + context, localhost is assumed. * smtpd_proxy_timeout (default: 100s): Timeout for connecting to the before- queue content filter and for sending and receiving commands and data. All diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index d88b93e04..7226f4bee 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -67,6 +67,11 @@ The form user@[ipaddress] is still allowed. [Incompat 20031226] Bounce messages now have a separate queue life time. This is controlled by the bounce_queue_lifetime parameter. +[Incompat 20031019] The authorized_verp_clients parameter was +renamed to smtpd_authorized_verp_clients, and the default value +was changed to disable this feature. You now have to turn it on +explicitly. + Major changes - build environment --------------------------------- diff --git a/postfix/auxiliary/qshape/qshape.pl b/postfix/auxiliary/qshape/qshape.pl index 1f3e7552b..fc273dd64 100644 --- a/postfix/auxiliary/qshape/qshape.pl +++ b/postfix/auxiliary/qshape/qshape.pl @@ -28,7 +28,7 @@ # domain distribution. By default the recipient distribution is # displayed. There can be more recipients than messages, but as # each message has only one sender, the sender distribution is a -# a message distribution. +# message distribution. # .IP \fB-p\fR # Generate aggregate statistics for parent domains. Top level domains # are not shown, nor are domains with fewer than \fImin_subdomains\fR @@ -43,7 +43,7 @@ # or "buckets". Each bucket has a maximum queue age that is twice # as large as that of the previous bucket. The last bucket has no # age limit. -# .IP "\fB-b \fIbucket_time\fR" +# .IP "\fB-t \fIbucket_time\fR" # The age limit in minutes for the first time bucket. The default # value is 5, meaning that the first bucket counts messages between # 0 and 5 minutes old. @@ -51,7 +51,7 @@ # The output is right justified, with the counts for the last # bucket shown on the 80th column, the \fIterminal_width\fR can be # adjusted for wider screens allowing more buckets to be displayed -# with truncating the domain names on the left. When a row for a +# without truncating the domain names on the left. When a row for a # full domain name and its counters does not fit in the specified # number of columns, only the last 17 bytes of the domain name # are shown with the prefix replaced by a '+' character. Truncated @@ -76,8 +76,8 @@ # absolute path for each queue subdirectory even if you want the # default incoming and active queue distribution. # SEE ALSO -# mailq(1) List all messages in the queue. -# QSHAPE_README Examples and background material. +# mailq(1), List all messages in the queue. +# QSHAPE_README, Examples and background material. # FILES # $config_directory/main.cf, Postfix installation parameters. # $queue_directory/maildrop/, local submission directory. @@ -258,8 +258,9 @@ sub wanted { ++$q{"TOTAL"}->[0]; ++$q{"TOTAL"}->[$b]; $a = "MAILER-DAEMON" if ($a eq ""); - $a =~ s/.*\@\.*(.*[^.])?\.*$/$1/; + $a =~ s/.*\@//; $a =~ s/\.\././g; + $a =~ s/\.?(.+?)\.?$/$1/; my $new = 0; do { my $old = (++$q{$a}->[0] > 1); diff --git a/postfix/conf/post-install b/postfix/conf/post-install index bedcdeac0..95310c0bf 100644 --- a/postfix/conf/post-install +++ b/postfix/conf/post-install @@ -473,7 +473,12 @@ test -n "$create" && { test -n "$set_permission" && { chown $recursive $owner $path || exit 1 test -z "$group" || chgrp $recursive $group $path || exit 1 - chmod $recursive $mode $path || exit 1 + if [ "$type" = "d" -a -n "$recursive" ] + then + find $path -type d -exec chmod $mode "{}" ";" + else + chmod $mode $path + fi || exit 1 } done IFS="$BACKUP_IFS" diff --git a/postfix/html/SMTPD_PROXY_README.html b/postfix/html/SMTPD_PROXY_README.html index 3004232ee..8ee2c186f 100644 --- a/postfix/html/SMTPD_PROXY_README.html +++ b/postfix/html/SMTPD_PROXY_README.html @@ -240,7 +240,7 @@ PERL/SMTP content filtering framework. See: # After-filter SMTP server. Receive mail from the content filter # on localhost port 10026. # - :10026 inet n - n - - smtpd + 127.0.0.1:10026 inet n - n - - smtpd -o smtpd_authorized_xforward_hosts=127.0.0.0/8 -o smtpd_client_restrictions= -o smtpd_helo_restrictions= @@ -283,7 +283,8 @@ the top of the master.cf file: