From: Wietse Venema Date: Mon, 9 Feb 2004 05:00:00 +0000 (-0500) Subject: postfix-2.0.18-20040209 X-Git-Tag: v2.1-RC1-20040331~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a12d9151a4070723ff0df210f6bfe1af776e407;p=thirdparty%2Fpostfix.git postfix-2.0.18-20040209 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index edb53b26b..5bd89779c 100644 --- 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 ." 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 df3313eb2..f272874c0 100644 --- 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 2739dcba3..36146f61d 100644 --- a/postfix/html/header_checks.5.html +++ b/postfix/html/header_checks.5.html @@ -166,15 +166,6 @@ HEADER_CHECKS(5) HEADER_CHECKS(5) 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/man/man5/header_checks.5 b/postfix/man/man5/header_checks.5 index f6c4f4213..cacd215ac 100644 --- 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 efc3eed68..967e4771e 100644 --- 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 eb411ce02..9ec15a8b1 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 "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 a94406b20..cb090a196 100644 --- 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); }