postfix-2.0.16-20031231

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 8ef99027bdd11257a138c9f47bb6c47a3e564271..81bcad50323b290134b13bf88f7b66a0746276dd 100644 (file)
--- 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 e603b703adbe8ad2ca7cee7bb4c9cfa699606c9d..894aaf344cd8747ec491c9f47c956a3eeb579375 100644 (file)
--- 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 8b276b0fe3219a0b0445e57533733025def2b783..734fd52db8816f497326d857e8d77b2e012d3d23 100644 (file)
--- 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 6d87f1d524e4992559699805b077ceff0df20bc9..63ea1c21220bf0d87e572e6f3e4406d16341ce2c 100644 (file)
--- 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";