From: Wietse Venema Date: Tue, 15 Jun 2004 05:00:00 +0000 (-0500) Subject: postfix-2.2-20040615 X-Git-Tag: v2.2.0-RC1~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92655d1f643240ce20d032e36af4371e6a3f9604;p=thirdparty%2Fpostfix.git postfix-2.2-20040615 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index 34d87b875..0e38da29b 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -9364,8 +9364,44 @@ Apologies for any names omitted. Bugfix: missing "sasl enabled" guard in the SMTPD policy client. File: smtpd/smtpd_check.c. +20040606 + + Portability. UnixWare has strcasecmp() in strings.h. Patch + by Andreas Winkelmann. File: util/sys_defs.h. + + Portability. The postlink script is transformed from sed(1) + to perl(1). + +20040608 + + Portability. Introduced SET_H_ERRNO() macro for compilation + environments where h_errno can't be used as an lvalue. + Files: util/sys_defs.h, dns/dns_lookup.c. + + Portability. Eliminate assumption on bits per byte from + vbuf_print.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. + Open problems: + Low: make sure CCARGS -I options come at the end. + Low: add INSTALL section for pre-existing Postfix systems. Low: add INSTALL section for pre-existing RPM Postfixes. diff --git a/postfix/README_FILES/DEBUG_README b/postfix/README_FILES/DEBUG_README index e29c367e1..81c2fa94b 100644 --- a/postfix/README_FILES/DEBUG_README +++ b/postfix/README_FILES/DEBUG_README @@ -250,8 +250,9 @@ the ggddbb debugger: /etc/postfix/main.cf: debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; - echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 + PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; echo + where; sleep 8640000) | gdb $daemon_directory/$process_name + $process_id 2>&1 >$config_directory/$process_name.$process_id.log & sleep 5 Append a --DD option to the suspect daemon in /etc/postfix/master.cf, for diff --git a/postfix/auxiliary/qshape/qshape.pl b/postfix/auxiliary/qshape/qshape.pl index 1f3e7552b..13430dd4b 100644 --- a/postfix/auxiliary/qshape/qshape.pl +++ b/postfix/auxiliary/qshape/qshape.pl @@ -12,7 +12,7 @@ # .fi # \fBqshape\fR [\fB-s\fR] [\fB-p\fR] [\fB-m \fImin_subdomains\fR] # [\fB-b \fIbucket_count\fR] [\fB-t \fIbucket_time\fR] -# [\fB-w \fIterminal_width\fR] +# [\fB-l\fR] [\fB-w \fIterminal_width\fR] # [\fB-c \fIconfig_directory\fR] [\fIqueue_name\fR ...] # DESCRIPTION # The \fBqshape\fR program helps the administrator understand the @@ -43,10 +43,15 @@ # 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. +# .IP "\fB-l\fR" +# Instead of using a geometric age sequence, use a linear age sequence, +# in other words simple multiples of \fBbucket_time\fR. +# +# This feature is available in Postfix 2.2 and later. # .IP "\fB-w \fIterminal_width\fR" # The output is right justified, with the counts for the last # bucket shown on the 80th column, the \fIterminal_width\fR can be @@ -113,7 +118,7 @@ my @qlist = qw(incoming active); do { local $SIG{__WARN__} = sub { warn "$0: $_[0]" unless exists($opts{"h"}); - die "Usage: $0 [ -s ] [ -p ] [ -m ]\n". + die "Usage: $0 [ -s ] [ -p ] [ -m ] [ -l ]\n". "\t[ -b ] [ -t ] [ -w ]\n". "\t[ -c ] [ ... ]\n". "The 's' option shows sender domain counts.\n". @@ -127,7 +132,7 @@ do { "\tthe first bucket is [0, bucket_time) minutes\n". "\tthe second bucket is [bucket_time, 2*bucket_time) minutes\n". "\tthe third bucket is [2*bucket_time, 4*bucket_time) minutes...\n". - "The number of buckets shown is .\n\n". + "'-l' makes the ages linear, the number of buckets shown is \n\n". "The default summary is for the incoming and active queues. An explicit\n". "list of queue names can be given on the command line. Non-absolute queue\n". @@ -137,7 +142,7 @@ do { "not supported. If necessary, use explicit absolute paths for all queues.\n"; }; - getopts("hc:psw:b:t:m:", \%opts); + getopts("lhc:psw:b:t:m:", \%opts); warn "Help message" if (exists $opts{"h"}); @qlist = @ARGV if (@ARGV > 0); @@ -245,7 +250,7 @@ sub bucket { my ($qt, $now) = @_; my $m = ($now - $qt) / (60 * $tick); return 1 if ($m < 1); - my $b = 2 + int(log($m) / log(2)); + my $b = $opts{"l"} ? int($m+1) : 2 + int(log($m) / log(2)); $b < $bnum ? $b : $bnum; } @@ -285,7 +290,7 @@ for (my $i = 0, my $t = 0; $i <= $bnum; ) { push(@heads, $h); $fmt .= sprintf "%%%ds", $l; $dw -= $l; - if (++$i < $bnum) { $t += $t ? $t : $tick; } else { $t = "$t+"; } + if (++$i < $bnum) { $t += ($t && !$opts{"l"}) ? $t : $tick; } else { $t = "$t+"; } } $dw = $dwidth if ($dw < $dwidth); diff --git a/postfix/conf/header_checks b/postfix/conf/header_checks index dcb25d5ae..cc01dfd44 100644 --- a/postfix/conf/header_checks +++ b/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: # /^