From: Wietse Venema <wietse@porcupine.org>
Date: Wed, 31 Dec 2003 05:00:00 +0000 (-0500)
Subject: postfix-2.0.16-20031231
X-Git-Tag: v2.1-RC1-20040331~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d989f852c6cfc8ea3c3541289f175299cae9ff0;p=thirdparty%2Fpostfix.git

postfix-2.0.16-20031231
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 8ef99027b..81bcad503 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -8937,6 +8937,11 @@ Apologies for any names omitted.
 	Cleanup: cleaned up the naming of internal symbols in the
 	SMTP client.
 
+20031231
+
+	Bugfix: stricter address syntax test broke "sendmail -bs".
+	File: smtpd/smtpd.c.
+
 Open problems:
 
 	Low: in the SMTP client, pass the session, request and
diff --git a/postfix/html/rate.html b/postfix/html/rate.html
index e603b703a..894aaf344 100644
--- a/postfix/html/rate.html
+++ b/postfix/html/rate.html
@@ -307,9 +307,9 @@ immediately after the first unsuccessful delivery attempt.
 
 <p>
 
-<dt> <b>bounce_queue_lifetime</b> (default: 2 days) <dd> How
-long a bounce message stays in the queue before it is considered
-undeliverable. Specify 0 for mail that should be returned
+<dt> <b>bounce_queue_lifetime</b> (default: $maximal_queue_lifetime)
+<dd> How long a bounce message stays in the queue before it is
+considered undeliverable. Specify 0 for mail that should be returned
 immediately after the first unsuccessful delivery attempt.
 
 <p>
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 8b276b0fe..734fd52db 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * 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	"20031226"
+#define MAIL_RELEASE_DATE	"20031231"
 
 #define VAR_MAIL_VERSION	"mail_version"
 #define DEF_MAIL_VERSION	"2.0.16-" MAIL_RELEASE_DATE
diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index 6d87f1d52..63ea1c212 100644
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -969,7 +969,8 @@ static char *extract_addr(SMTPD_STATE *state, SMTPD_TOKEN *arg,
     if (err == 0)
 	if ((arg->strval[0] == 0 && !allow_empty_addr)
 	    || (strict_rfc821 && arg->strval[0] == '@')
-	    || smtpd_check_addr(STR(arg->vstrval)) != 0) {
+	    || (SMTPD_STAND_ALONE(state) == 0
+		&& smtpd_check_addr(STR(arg->vstrval)) != 0)) {
 	    msg_warn("Illegal address syntax from %s in %s command: %s",
 		     state->namaddr, state->where, STR(arg->vstrval));
 	    err = "501 Bad address syntax";