postfix-3.4-20180903

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 554aa5c7da88788944c7907566572afb3bd26a96..865455ec949259d9c0684c37b7582580fe4ffadf 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23713,3 +23713,10 @@ Apologies for any names omitted.
 
        Miscellaneous documentation updates, and a correction in
        the byte count for sending a large SASL initial response.
+
+20180903
+
+       Bugfix (introduced: 20180825): postscreen falsely claimed
+       that the remote SMTP client was pipelining after sending
+       BDAT. Found by Ralf Hildebrandt. File:
+       postscreen/postscreen_smtpd.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 237f0274890738bb586bc3bda6e220a411addeea..d4718e14558f636934d43d64e8f074c137314e1b 100644 (file)
--- 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      "20180827"
+#define MAIL_RELEASE_DATE      "20180903"
 #define MAIL_VERSION_NUMBER    "3.4"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postscreen/postscreen_smtpd.c b/postfix/src/postscreen/postscreen_smtpd.c
index 50148917a9984782027b6e84364e7a0399649b06..af3525fe72ec39149c9c546cb2cd9636c47833a8 100644 (file)
--- a/postfix/src/postscreen/postscreen_smtpd.c
+++ b/postfix/src/postscreen/postscreen_smtpd.c
@@ -625,8 +625,8 @@ static int psc_bdat_cmd(PSC_STATE *state, char *args)
                                           psc_smtpd_time_event,
                            "502 5.5.1 Error: command not implemented\r\n");
     else if (PSC_SMTPD_NEXT_TOKEN(args) == 0)
-           PSC_CLEAR_EVENT_DROP_SESSION_STATE(state,
-                                              psc_smtpd_time_event,
+       PSC_CLEAR_EVENT_DROP_SESSION_STATE(state,
+                                          psc_smtpd_time_event,
                                 "501 5.5.4 Syntax: BDAT count [LAST]\r\n");
     else if (state->sender == 0)
        PSC_CLEAR_EVENT_DROP_SESSION_STATE(state,
@@ -737,6 +737,7 @@ typedef struct {
 #define PSC_SMTPD_CMD_FLAG_DESTROY     (1<<1)  /* dangling pointer alert */
 #define PSC_SMTPD_CMD_FLAG_PRE_TLS     (1<<2)  /* allowed with mandatory TLS */
 #define PSC_SMTPD_CMD_FLAG_SUSPEND     (1<<3)  /* suspend command engine */
+#define PSC_SMTPD_CMD_FLAG_HAS_PAYLOAD (1<<4)  /* command has payload */
 
 static const PSC_SMTPD_COMMAND command_table[] = {
     "HELO", psc_helo_cmd, PSC_SMTPD_CMD_FLAG_ENABLE | PSC_SMTPD_CMD_FLAG_PRE_TLS,
@@ -749,7 +750,7 @@ static const PSC_SMTPD_COMMAND command_table[] = {
     "RCPT", psc_rcpt_cmd, PSC_SMTPD_CMD_FLAG_ENABLE,
     "DATA", psc_data_cmd, PSC_SMTPD_CMD_FLAG_ENABLE | PSC_SMTPD_CMD_FLAG_DESTROY,
     /* ".", psc_dot_cmd, PSC_SMTPD_CMD_FLAG_NONE, */
-    "BDAT", psc_bdat_cmd, PSC_SMTPD_CMD_FLAG_ENABLE | PSC_SMTPD_CMD_FLAG_DESTROY,
+    "BDAT", psc_bdat_cmd, PSC_SMTPD_CMD_FLAG_ENABLE | PSC_SMTPD_CMD_FLAG_DESTROY | PSC_SMTPD_CMD_FLAG_HAS_PAYLOAD,
     "RSET", psc_rset_cmd, PSC_SMTPD_CMD_FLAG_ENABLE,
     "NOOP", psc_noop_cmd, PSC_SMTPD_CMD_FLAG_ENABLE | PSC_SMTPD_CMD_FLAG_PRE_TLS,
     "VRFY", psc_vrfy_cmd, PSC_SMTPD_CMD_FLAG_ENABLE,
@@ -1031,7 +1032,8 @@ static void psc_smtpd_read_event(int event, void *context)
            }
        }
        /* Command PIPELINING test. */
-       if ((state->flags & PSC_STATE_MASK_PIPEL_TODO_SKIP)
+       if ((state->flags & PSC_SMTPD_CMD_FLAG_HAS_PAYLOAD) == 0
+           && (state->flags & PSC_STATE_MASK_PIPEL_TODO_SKIP)
            == PSC_STATE_FLAG_PIPEL_TODO && !PSC_SMTPD_BUFFER_EMPTY(state)) {
            printable(command, '?');
            PSC_SMTPD_ESCAPE_TEXT(psc_temp, PSC_SMTPD_PEEK_DATA(state),