snapshot-20001212

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 367e86c242300ceba382bc0b7ed1f9064a1e020c..02d9d4413155520cda730b8509f81fb9199319d5 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -4614,3 +4614,14 @@ Apologies for any names omitted.
        Small dirt: postconf -m produced too much output due to a
        missing "else", and the optional SASL code needed a fix
        for the changed name_mask API.
+
+20001212
+
+       Workaround: due to an error, record type L for "filter
+       transport name" was the same as that for the already existing
+       record type L for "record not ending in newline", causing
+       the pickup daemon to discard all records not ending in
+       newline. The code cannot be changed without breaking
+       compatibility with queued mail, so the pickup server is
+       changed to discard type L records only from the message
+       envelope, not from the content. File: pickup/pickup.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index de06b8f6cd6a28157e1b61079f6c10fc0b02b217..38ec674e73a37a8f849482805d7cca3e3824eb21 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -15,7 +15,7 @@
   * Version of this program.
   */
 #define VAR_MAIL_VERSION       "mail_version"
-#define DEF_MAIL_VERSION       "Snapshot-20001211"
+#define DEF_MAIL_VERSION       "Snapshot-20001212"
 extern char *var_mail_version;
 
 /* LICENSE

diff --git a/postfix/src/pickup/pickup.c b/postfix/src/pickup/pickup.c
index 2bb748dac532e96258a88871f1bda49db3bfd3b7..38d798e39cccfeedc6f385b521da72153349a1af 100644 (file)
--- a/postfix/src/pickup/pickup.c
+++ b/postfix/src/pickup/pickup.c
@@ -180,7 +180,7 @@ static int copy_segment(VSTREAM *qfile, VSTREAM *cleanup, PICKUP_INFO *info,
                info->rcpt = mystrdup(vstring_str(buf));
        if (type == REC_TYPE_TIME)
            continue;
-       if (type == REC_TYPE_FILT)
+       if (type == REC_TYPE_FILT && *expected == REC_TYPE_ENVELOPE[0])
            continue;
        else {