From: Wietse Venema <wietse@porcupine.org>
Date: Wed, 14 Nov 2001 05:00:00 +0000 (-0500)
Subject: postfix-20010228-pl07
X-Git-Tag: v20010228-pl07
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c99241d073181583d6516e04cd57c395643e3e7c;p=thirdparty%2Fpostfix.git

postfix-20010228-pl07
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 0f2644441..36d644a41 100644
--- 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 b0477dd12..c41f68f91 100644
--- 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 48f8c82e8..256bbe358 100644
--- 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.
      */