postfix-2.0.18-20040209

diff --git a/postfix/HISTORY b/postfix/HISTORY
index edb53b26b76e2ed331a16b939b52dafc663c3318..5bd89779c926211758f1eeb0b7001dc1ae52f91f 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -9117,6 +9117,13 @@ Apologies for any names omitted.
        Cleanup: sample-filter.cf is gone. Better documentation is
        available with "man header_checks".
 
+20040209
+
+       Bugfix: when delivery to smtpd_proxy_filter fails, report
+       "451 Queue file write error" instead of repeating the
+       previous "354 End data with <CR><LF>.<CR><LF>" response.
+       File:  smtpd/smtpd.c.
+
 Open problems:
 
        Low: log xdelay (esp. for SMTP and delivery to command).

diff --git a/postfix/conf/header_checks b/postfix/conf/header_checks
index df3313eb204a8d289723d5f503624df30ed3e9f0..f272874c0f9006552e594e1562255709f0b3f89e 100644 (file)
--- a/postfix/conf/header_checks
+++ b/postfix/conf/header_checks
@@ -165,15 +165,6 @@
 #        IGNORE Delete the current line from the input and  inspect
 #               the next input line.
 # 
-#        PREPEND text...
-#               Prepend  one  line  with  the  specified  text  and
-#               inspect the next input line. The prepended line  of
-#               text is output before the input line that triggered
-#               the PREPEND pattern.
-# 
-#               Note: this action cannot be used to prepend  multi-
-#               line text.
-# 
 #        REDIRECT user@domain
 #               Write  a  message  redirection request to the queue
 #               file and inspect the next  input  line.  After  the

diff --git a/postfix/html/header_checks.5.html b/postfix/html/header_checks.5.html
index 2739dcba31c4bb6d11068cac1ed2fa2646b2f284..36146f61dfde8ee41f3447c7637898eed19fa9d1 100644 (file)
--- a/postfix/html/header_checks.5.html
+++ b/postfix/html/header_checks.5.html
@@ -166,15 +166,6 @@ HEADER_CHECKS(5)                                 HEADER_CHECKS(5)
        <b>IGNORE</b> Delete the current line from the input and  inspect
               the next input line.
 
-       <b>PREPEND</b> <i>text...</i>
-              Prepend  one  line  with  the  specified  text  and
-              inspect the next input line. The prepended line  of
-              text is output before the input line that triggered
-              the <b>PREPEND</b> pattern.
-
-              Note: this action cannot be used to prepend  multi-
-              line text.
-
        <b>REDIRECT</b> <i>user@domain</i>
               Write  a  message  redirection request to the queue
               file and inspect the next  input  line.  After  the

diff --git a/postfix/man/man5/header_checks.5 b/postfix/man/man5/header_checks.5
index f6c4f4213d1d472ea35884181303f77e15b34aa6..cacd215aca9271dcecd688fc4b7b5fea678536ef 100644 (file)
--- a/postfix/man/man5/header_checks.5
+++ b/postfix/man/man5/header_checks.5
@@ -159,12 +159,6 @@ Note: this action affects all recipients of the message.
 .IP \fBIGNORE\fR
 Delete the current line from the input and inspect
 the next input line.
-.IP "\fBPREPEND \fItext...\fR"
-Prepend one line with the specified text and inspect the next
-input line. The prepended line of text is output before the
-input line that triggered the \fBPREPEND\fR pattern.
-.sp
-Note: this action cannot be used to prepend multi-line text.
 .IP "\fBREDIRECT \fIuser@domain\fR"
 Write a message redirection request to the queue file and
 inspect the next input line. After the message is queued,

diff --git a/postfix/proto/header_checks b/postfix/proto/header_checks
index efc3eed68c731af74cd53925d6a4c511b347ca93..967e4771e8a84d10a428819a08d30d4314310f06 100644 (file)
--- a/postfix/proto/header_checks
+++ b/postfix/proto/header_checks
@@ -145,12 +145,6 @@
 # .IP \fBIGNORE\fR
 #      Delete the current line from the input and inspect
 #      the next input line.
-# .IP "\fBPREPEND \fItext...\fR"
-#      Prepend one line with the specified text and inspect the next
-#      input line. The prepended line of text is output before the
-#      input line that triggered the \fBPREPEND\fR pattern.
-# .sp
-#      Note: this action cannot be used to prepend multi-line text.
 # .IP "\fBREDIRECT \fIuser@domain\fR"
 #      Write a message redirection request to the queue file and
 #      inspect the next input line. After the message is queued,

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index eb411ce02c105bdaa439c4f449d5055633c0caf9..9ec15a8b1d9013c9bcdbd9ba648bcc5c9850baed 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      "20040205"
+#define MAIL_RELEASE_DATE      "20040209"
 #define MAIL_VERSION_NUMBER    "2.0.18"
 
 #define VAR_MAIL_VERSION       "mail_version"

diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index a94406b20a1ecbba1e1af66d735ea0098aa860dc..cb090a196701502da49cb888a85efbe9df7d63ae 100644 (file)
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -1470,6 +1470,10 @@ static int data_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *unused_argv)
     /*
      * Send the end of DATA and finish the proxy connection. Set the
      * CLEANUP_STAT_PROXY error flag in case of trouble.
+     * 
+     * XXX The low-level proxy output routines should set "state" error
+     * attributes. This requires making "state" a context attribute of the
+     * VSTREAM.
      */
     if (state->proxy) {
        if (state->err == CLEANUP_STAT_OK) {
@@ -1477,6 +1481,11 @@ static int data_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *unused_argv)
            if (state->err == CLEANUP_STAT_OK &&
                *STR(state->proxy_buffer) != '2')
                state->err = CLEANUP_STAT_CONT;
+       } else {
+           state->error_mask |= MAIL_ERROR_SOFTWARE;
+           state->err |= CLEANUP_STAT_PROXY;
+           vstring_sprintf(state->proxy_buffer,
+                           "451 Error: queue file write error");
        }
        smtpd_proxy_close(state);
     }