From: Wietse Venema <wietse@porcupine.org>
Date: Wed, 11 Jun 2003 05:00:00 +0000 (-0500)
Subject: postfix-2.0.12
X-Git-Tag: v2.0.12^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54254f676c171fd296514191dff3cdc223a0eea8;p=thirdparty%2Fpostfix.git

postfix-2.0.12
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 66ab3f69f..85746bbb1 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -7811,8 +7811,13 @@ Apologies for any names omitted.
 
 20030609
 
-	Workaround: Solaris non-blocking socket read() may hang.
-	Leandro Santi. File: smtpd/smtpd.c.
+	Workaround: Solaris blocking socket read() may hang.  Hernan
+	Perez Masci and Leandro Santi. File: smtpd/smtpd.c.
+
+20030612
+
+	Bugfix: the stricter postdrop input filter broke "sendmail
+	-bs". Found by Lutz Jaenicke. File: smtpd/smtpd.c.
 
 Open problems:
 
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index f55dc59bc..cda2da2fe 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,10 +20,10 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only, unless they include the same bugfix as a patch release.
   */
-#define MAIL_RELEASE_DATE	"20030609"
+#define MAIL_RELEASE_DATE	"20030611"
 
 #define VAR_MAIL_VERSION	"mail_version"
-#define DEF_MAIL_VERSION	"2.0.11"
+#define DEF_MAIL_VERSION	"2.0.12"
 extern char *var_mail_version;
 
  /*
diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index 851c4db19..e1ff57398 100644
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -710,7 +710,7 @@ static char *extract_addr(SMTPD_STATE *state, SMTPD_TOKEN *arg,
      * Report trouble. Log a warning only if we are going to sleep+reject so
      * that attackers can't flood our logfiles.
      */
-    if ((arg->strval[0] == 0 && !allow_empty_addr) || arg->strval[0] == '@') {
+    if (arg->strval[0] == 0 && !allow_empty_addr) {
 	msg_warn("Illegal address syntax from %s in %s command: %s",
 		 state->namaddr, state->where, STR(arg->vstrval));
 	err = "501 Bad address syntax";
@@ -848,10 +848,12 @@ static int mail_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
     /*
      * Record the time of arrival and the sender envelope address.
      */
-    rec_fprintf(state->cleanup, REC_TYPE_TIME, "%ld",
-		(long) time((time_t *) 0));
-    if (*var_filter_xport)
-	rec_fprintf(state->cleanup, REC_TYPE_FILT, "%s", var_filter_xport);
+    if (SMTPD_STAND_ALONE(state) == 0) {
+	rec_fprintf(state->cleanup, REC_TYPE_TIME, "%ld",
+		    (long) time((time_t *) 0));
+	if (*var_filter_xport)
+	    rec_fprintf(state->cleanup, REC_TYPE_FILT, "%s", var_filter_xport);
+    }
     rec_fputs(state->cleanup, REC_TYPE_FROM, argv[2].strval);
     if (encoding != 0)
 	rec_fprintf(state->cleanup, REC_TYPE_ATTR, "%s=%s",