mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-31 06:05:37 +00:00
Code Issues Releases Wiki Activity

postfix-2.3.5-RC2

Browse Source
This commit is contained in:
Wietse Venema
2006-12-08 00:00:00 -05:00
committed by Viktor Dukhovni
parent fd0940608c
commit b9f62b456d
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
postfix/HISTORY
View File

@@ -12827,3 +12827,21 @@ Apologies for any names omitted.
a connection. The symptoms were "recipient rejected .. in a connection. The symptoms were "recipient rejected .. in
reply to DATA". Fix by Victor Duchovni and Wietse. File: reply to DATA". Fix by Victor Duchovni and Wietse. File:
smtp/smtp_proto.c. 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
"<postmaster>" 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.

4
postfix/src/bounce/bounce_templates.c
View File

@@ -98,7 +98,7 @@ static const char *def_bounce_failure_body[] = {
"I'm sorry to have to inform you that your message could not", "I'm sorry to have to inform you that your message could not",
"be delivered to one or more recipients. It's attached below.", "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", "If you do so, please include this problem report. You can",
"delete your own text from the attached returned message.", "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.", "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", "If you do so, please include this problem report. You can",
"delete your own text from the attached returned message.", "delete your own text from the attached returned message.",

4
postfix/src/global/mail_version.h
View File

@@ -20,8 +20,8 @@
* Patches change both the patchlevel and the release date. Snapshots have no * Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only. * patchlevel; they change the release date only.
*/ */
#define MAIL_RELEASE_DATE "20061205" #define MAIL_RELEASE_DATE "20061208"
#define MAIL_VERSION_NUMBER "2.3.5-RC1" #define MAIL_VERSION_NUMBER "2.3.5-RC2"
#ifdef SNAPSHOT #ifdef SNAPSHOT
# define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE

2
postfix/src/global/pipe_command.c
View File

@@ -633,7 +633,7 @@ int pipe_command(VSTREAM *src, DSN_BUF *why,...)
"Command died with signal %d: \"%s\"%s%s", "Command died with signal %d: \"%s\"%s%s",
WTERMSIG(wait_status), args.command, WTERMSIG(wait_status), args.command,
log_len ? ". Command output: " : "", log_buf); 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? */ /* Use "D.S.N text" command output. XXX What diagnostic code? */
else if (dsn_valid(log_buf) > 0) { else if (dsn_valid(log_buf) > 0) {

2
postfix/src/smtp/smtp_proto.c
View File

@@ -1634,7 +1634,7 @@ static int smtp_loop(SMTP_STATE *state, NOCLOBBER int send_state,
session->mime_state = mime_state_alloc(downgrading ? session->mime_state = mime_state_alloc(downgrading ?
MIME_OPT_DOWNGRADE MIME_OPT_DOWNGRADE
| MIME_OPT_REPORT_NESTING : | MIME_OPT_REPORT_NESTING :
MIME_OPT_REPORT_NESTING, MIME_OPT_DISABLE_MIME,
smtp_generic_maps ? smtp_generic_maps ?
smtp_header_rewrite : smtp_header_rewrite :
smtp_header_out, smtp_header_out,