diff --git a/postfix/HISTORY b/postfix/HISTORY index 7137d82c4..6b1ca9886 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -16745,3 +16745,11 @@ Apologies for any names omitted. long->short or short->short queue file names. As a side benefit, renaming long->short queue IDs will not change the result from queue hashing. File: postsuper/postsuper.c. + +20110323 + + Bitrot: qshape regexp pattern for long queue file names. + Ralf Hildebrandt. File: auxiliary/qshape/qshape.pl. + + Bitrot: text about queue ID reuse in the postsuper manpage. + File: postsuper/postsuper.c. diff --git a/postfix/WISHLIST b/postfix/WISHLIST index bf1570fd3..ebcbabc1e 100644 --- a/postfix/WISHLIST +++ b/postfix/WISHLIST @@ -17,6 +17,12 @@ Wish list: times. Individual "pass" flags are still needed as proof that the client didn't skip tests by hanging up early. + In the SMTP server, check if the connection is closed before + replying to ".", and discard the message if the reply can't + be sent. This reduces the time window for RFC 1047 message + duplication, and may even prevent the delivery of some spam. + http://www.exim.org/lurker/message/20070416.103159.9d5ff0ce.en.html + postconf command-line option to show the compile-time settings (CCARGS, AUXLIBS) in case binary packages don't install the makedefs.out file. diff --git a/postfix/auxiliary/qshape/qshape.pl b/postfix/auxiliary/qshape/qshape.pl index 243df445a..2ad88e179 100644 --- a/postfix/auxiliary/qshape/qshape.pl +++ b/postfix/auxiliary/qshape/qshape.pl @@ -212,7 +212,7 @@ sub rec_get { sub qenv { my ($qfile) = @_; - return unless $qfile =~ m{(^|/)[A-F0-9]{6,}$}; + return unless $qfile =~ m{(^|/)[A-Za-z0-9]{6,}$}; my @st = lstat($qfile); return unless (@st > 0 && -f _ && (($st[2] & 0733) == 0700)); diff --git a/postfix/html/postsuper.1.html b/postfix/html/postsuper.1.html index 1421c48eb..c7afceb54 100644 --- a/postfix/html/postsuper.1.html +++ b/postfix/html/postsuper.1.html @@ -56,10 +56,12 @@ POSTSUPER(1) POSTSUPER(1) in the deferred queue. As a safety measure, the word ALL must be specified in upper case. - Warning: Postfix queue IDs are reused. There is a - very small possibility that postsuper deletes the - wrong message file when it is executed while the - Postfix mail system is delivering mail. + Warning: Postfix queue IDs are reused (always with + Postfix <= 2.8; and with Postfix >= 2.9 when + enable_long_queue_ids=no). There is a very small + possibility that postsuper deletes the wrong mes- + sage file when it is executed while the Postfix + mail system is delivering mail. The scenario is as follows: @@ -166,11 +168,12 @@ POSTSUPER(1) POSTSUPER(1) new local mail submissions. This is useful when content_filter settings have changed. - Warning: Postfix queue IDs are reused. There is a - very small possibility that postsuper(1) requeues - the wrong message file when it is executed while - the Postfix mail system is running, but no harm - should be done. + Warning: Postfix queue IDs are reused (always with + Postfix <= 2.8; and with Postfix >= 2.9 when + enable_long_queue_ids=no). There is a very small + possibility that postsuper(1) requeues the wrong + message file when it is executed while the Postfix + mail system is running, but no harm should be done. This feature is available in Postfix 1.1 and later. @@ -205,20 +208,21 @@ POSTSUPER(1) POSTSUPER(1) -S A redundant version of -s that requires that long file names also match the message file inode num- - ber. This option exists for testing purposes. + ber. This option exists for testing purposes, and + is available with Postfix 2.9 and later. -v Enable verbose logging for debugging purposes. Mul- - tiple -v options make the software increasingly + tiple -v options make the software increasingly verbose. DIAGNOSTICS - Problems are reported to the standard error stream and to + Problems are reported to the standard error stream and to syslogd(8). - postsuper(1) reports the number of messages deleted with - -d, the number of messages requeued with -r, and the num- - ber of messages whose queue file name was fixed with -s. - The report is written to the standard error stream and to + postsuper(1) reports the number of messages deleted with + -d, the number of messages requeued with -r, and the num- + ber of messages whose queue file name was fixed with -s. + The report is written to the standard error stream and to syslogd(8). ENVIRONMENT @@ -226,43 +230,43 @@ POSTSUPER(1) POSTSUPER(1) Directory with the main.cf file. BUGS - Mail that is not sanitized by Postfix (i.e. mail in the + Mail that is not sanitized by Postfix (i.e. mail in the maildrop queue) cannot be placed "on hold". CONFIGURATION PARAMETERS - The following main.cf parameters are especially relevant + The following main.cf parameters are especially relevant to this program. The text below provides only a parameter - summary. See postconf(5) for more details including exam- + summary. See postconf(5) for more details including exam- ples. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and + The default location of the Postfix main.cf and master.cf configuration files. hash_queue_depth (1) - The number of subdirectory levels for queue direc- - tories listed with the hash_queue_names parameter. + The number of subdirectory levels for queue direc- + tories listed with the hash_queue_names parameter. hash_queue_names (deferred, defer) - The names of queue directories that are split + The names of queue directories that are split across multiple subdirectory levels. queue_directory (see 'postconf -d' output) - The location of the Postfix top-level queue direc- + The location of the Postfix top-level queue direc- tory. syslog_facility (mail) The syslog facility of Postfix logging. syslog_name (see 'postconf -d' output) - The mail system name that is prepended to the - process name in syslog records, so that "smtpd" + The mail system name that is prepended to the + process name in syslog records, so that "smtpd" becomes, for example, "postfix/smtpd". Available in Postfix version 2.9 and later: enable_long_queue_ids (no) - Enable long, non-repeating, queue IDs (queue file + Enable long, non-repeating, queue IDs (queue file names). SEE ALSO @@ -270,7 +274,7 @@ POSTSUPER(1) POSTSUPER(1) postqueue(1), unprivileged queue operations LICENSE - The Secure Mailer license must be distributed with this + The Secure Mailer license must be distributed with this software. AUTHOR(S) diff --git a/postfix/man/man1/postsuper.1 b/postfix/man/man1/postsuper.1 index 093315de3..861c0d885 100644 --- a/postfix/man/man1/postsuper.1 +++ b/postfix/man/man1/postsuper.1 @@ -55,7 +55,8 @@ Specify "\fB-d ALL\fR" to remove all messages; for example, specify As a safety measure, the word \fBALL\fR must be specified in upper case. .sp -Warning: Postfix queue IDs are reused. +Warning: Postfix queue IDs are reused (always with Postfix +<= 2.8; and with Postfix >= 2.9 when enable_long_queue_ids=no). There is a very small possibility that postsuper deletes the wrong message file when it is executed while the Postfix mail system is delivering mail. @@ -154,7 +155,8 @@ The message is subjected to the same content_filter settings useful when content_filter settings have changed. .RE .IP -Warning: Postfix queue IDs are reused. +Warning: Postfix queue IDs are reused (always with Postfix +<= 2.8; and with Postfix >= 2.9 when enable_long_queue_ids=no). There is a very small possibility that \fBpostsuper\fR(1) requeues the wrong message file when it is executed while the Postfix mail system is running, but no harm should be done. @@ -195,7 +197,8 @@ file name changes. .IP \fB-S\fR A redundant version of \fB-s\fR that requires that long file names also match the message file inode number. This -option exists for testing purposes. +option exists for testing purposes, and is available with +Postfix 2.9 and later. .IP \fB-v\fR Enable verbose logging for debugging purposes. Multiple \fB-v\fR options make the software increasingly verbose. diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index e2beacd03..5f2097448 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20110322" +#define MAIL_RELEASE_DATE "20110323" #define MAIL_VERSION_NUMBER "2.9" #ifdef SNAPSHOT diff --git a/postfix/src/postsuper/postsuper.c b/postfix/src/postsuper/postsuper.c index c8ebb947d..fba2f1a39 100644 --- a/postfix/src/postsuper/postsuper.c +++ b/postfix/src/postsuper/postsuper.c @@ -49,7 +49,8 @@ /* As a safety measure, the word \fBALL\fR must be specified in upper /* case. /* .sp -/* Warning: Postfix queue IDs are reused. +/* Warning: Postfix queue IDs are reused (always with Postfix +/* <= 2.8; and with Postfix >= 2.9 when enable_long_queue_ids=no). /* There is a very small possibility that postsuper deletes the /* wrong message file when it is executed while the Postfix mail /* system is delivering mail. @@ -148,7 +149,8 @@ /* useful when content_filter settings have changed. /* .RE /* .IP -/* Warning: Postfix queue IDs are reused. +/* Warning: Postfix queue IDs are reused (always with Postfix +/* <= 2.8; and with Postfix >= 2.9 when enable_long_queue_ids=no). /* There is a very small possibility that \fBpostsuper\fR(1) requeues /* the wrong message file when it is executed while the Postfix mail /* system is running, but no harm should be done. @@ -189,7 +191,8 @@ /* .IP \fB-S\fR /* A redundant version of \fB-s\fR that requires that long /* file names also match the message file inode number. This -/* option exists for testing purposes. +/* option exists for testing purposes, and is available with +/* Postfix 2.9 and later. /* .IP \fB-v\fR /* Enable verbose logging for debugging purposes. Multiple \fB-v\fR /* options make the software increasingly verbose.