postfix-2.0.12

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 66ab3f69f1e232f3dd8eafb9e8c03731ea6e75b4..85746bbb10b15681ddce932f98e347d258d217bd 100644 (file)
--- 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 f55dc59bcb0fc7dd8791bb22fc5da8828691fc33..cda2da2fe3a185148300c699b099856e7ea33e26 100644 (file)
--- 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 851c4db1947239b1ee2056e3ec5d8f02841a486d..e1ff5739806c9f5f01fcad3de846d786d7e6c989 100644 (file)
--- 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",