From b9f62b456d5a361c6507353ce56a60809100265b Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Fri, 8 Dec 2006 00:00:00 -0500 Subject: [PATCH] postfix-2.3.5-RC2 --- postfix/HISTORY | 18 ++++++++++++++++++ postfix/src/bounce/bounce_templates.c | 4 ++-- postfix/src/global/mail_version.h | 4 ++-- postfix/src/global/pipe_command.c | 2 +- postfix/src/smtp/smtp_proto.c | 2 +- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index ba6c0b991..9d8872889 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -12827,3 +12827,21 @@ Apologies for any names omitted. a connection. The symptoms were "recipient rejected .. in reply to DATA". Fix by Victor Duchovni and Wietse. File: smtp/smtp_proto.c. + +20061207 + + Compatibility with Postfix < 2.3: undo the change to bounce + instead of defer after pipe-to-command delivery fails with + a signal. File: global/pipe_command.c. + +20061208 + + Workaround: apparently, some mail software removes or hides + "" in the Postfix bounce text, because it + processes the text as if it were HTML. This confuses users. + The bounce template has been updated to remove the < and + >. File: bounce/bounce_templates.c. + + Cleanup: when smtp_generic_maps is turned on, don't parse + MIME structures in the message body. Victor Duchovni. File: + smtp/smtp_proto.c. diff --git a/postfix/src/bounce/bounce_templates.c b/postfix/src/bounce/bounce_templates.c index d3e53c3b3..cf4ce98b1 100644 --- a/postfix/src/bounce/bounce_templates.c +++ b/postfix/src/bounce/bounce_templates.c @@ -98,7 +98,7 @@ static const char *def_bounce_failure_body[] = { "I'm sorry to have to inform you that your message could not", "be delivered to one or more recipients. It's attached below.", "", - "For further assistance, please send mail to <" MAIL_ADDR_POSTMASTER ">", + "For further assistance, please send mail to " MAIL_ADDR_POSTMASTER, "", "If you do so, please include this problem report. You can", "delete your own text from the attached returned message.", @@ -134,7 +134,7 @@ static const char *def_bounce_delay_body[] = { , "It will be retried until it is $maximal_queue_lifetime_days day(s) old.", "", - "For further assistance, please send mail to <" MAIL_ADDR_POSTMASTER ">", + "For further assistance, please send mail to " MAIL_ADDR_POSTMASTER, "", "If you do so, please include this problem report. You can", "delete your own text from the attached returned message.", diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 22caf42e5..2e1d3093c 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20061205" -#define MAIL_VERSION_NUMBER "2.3.5-RC1" +#define MAIL_RELEASE_DATE "20061208" +#define MAIL_VERSION_NUMBER "2.3.5-RC2" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff --git a/postfix/src/global/pipe_command.c b/postfix/src/global/pipe_command.c index 0fac5f7a8..d305f79d0 100644 --- a/postfix/src/global/pipe_command.c +++ b/postfix/src/global/pipe_command.c @@ -633,7 +633,7 @@ int pipe_command(VSTREAM *src, DSN_BUF *why,...) "Command died with signal %d: \"%s\"%s%s", WTERMSIG(wait_status), args.command, log_len ? ". Command output: " : "", log_buf); - return (PIPE_STAT_BOUNCE); + return (PIPE_STAT_DEFER); } /* Use "D.S.N text" command output. XXX What diagnostic code? */ else if (dsn_valid(log_buf) > 0) { diff --git a/postfix/src/smtp/smtp_proto.c b/postfix/src/smtp/smtp_proto.c index 23ed31648..442e3d695 100644 --- a/postfix/src/smtp/smtp_proto.c +++ b/postfix/src/smtp/smtp_proto.c @@ -1634,7 +1634,7 @@ static int smtp_loop(SMTP_STATE *state, NOCLOBBER int send_state, session->mime_state = mime_state_alloc(downgrading ? MIME_OPT_DOWNGRADE | MIME_OPT_REPORT_NESTING : - MIME_OPT_REPORT_NESTING, + MIME_OPT_DISABLE_MIME, smtp_generic_maps ? smtp_header_rewrite : smtp_header_out,