postfix-20010228-pl07

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 0f26444411280f3186abd121091474df80ae1a11..36d644a415e7354f390c32e648323c6afadc5669 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -5153,3 +5153,8 @@ Apologies for any names omitted.
        exist.  The behavior is now consistent: treat non-existant
        DN's in a special result attribute expansion the same as
        DN's with no attribute.  LaMont Jones, HP.
+
+20011114
+
+       Bugfix: reset the smtpd command transaction log between
+       deliveries. File: smtpd/smtpd.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index b0477dd12e708106899fc6a1cca138bfb556ab71..c41f68f919e2ee16d3a5485da78a7ccb22fb8a5d 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       "Postfix-20010228-pl06"
+#define DEF_MAIL_VERSION       "Postfix-20010228-pl07"
 extern char *var_mail_version;
 
 /* LICENSE

diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index 48f8c82e871342d909929d0550eb3a8fa0b8e81d..256bbe358da8d556cb90c81c1792753043ada011 100644 (file)
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -987,6 +987,18 @@ static int data_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *unused_argv)
      */
     state->where = SMTPD_AFTER_DOT;
 
+    /*
+     * Notify the postmaster if there were errors. This usually indicates a
+     * client configuration problem, or that someone is trying nasty things.
+     * Either is significant enough to bother the postmaster. XXX Can't
+     * report problems when running in stand-alone mode: postmaster notices
+     * require availability of the cleanup service.
+     */
+    if (state->history != 0 && state->client != VSTREAM_IN
+       && (state->error_mask & state->notify_mask))
+       smtpd_chat_notify(state);
+    smtpd_chat_reset(state);
+
     /*
      * Cleanup. The client may send another MAIL command.
      */