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

postfix-2.2-20041221

Browse Source
This commit is contained in:
Wietse Venema
2004-12-21 00:00:00 -05:00
committed by Viktor Dukhovni
parent 712d9c8293
commit a4391d0e17
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
postfix/HISTORY
View File

@@ -9989,6 +9989,10 @@ Apologies for any names omitted.
Dummy VSTREAM read-write routines. Files: util/dummy_read.c, Dummy VSTREAM read-write routines. Files: util/dummy_read.c,
util/dummy_write.c. util/dummy_write.c.
20041221
Bugfix: further postcat corner cases.
Open problems: Open problems:
Med: implement ${name[?:]value} in main.cf or update the Med: implement ${name[?:]value} in main.cf or update the

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

@@ -20,7 +20,7 @@
* Patches change the patchlevel and the release date. Snapshots change the * Patches change the patchlevel and the release date. Snapshots change the
* release date only. * release date only.
*/ */
#define MAIL_RELEASE_DATE "20041220" #define MAIL_RELEASE_DATE "20041221"
#define MAIL_VERSION_NUMBER "2.2" #define MAIL_VERSION_NUMBER "2.2"
#define VAR_MAIL_VERSION "mail_version" #define VAR_MAIL_VERSION "mail_version"

11
postfix/src/postcat/postcat.c
View File

@@ -136,8 +136,7 @@ static void postcat(VSTREAM *fp, VSTRING *buffer, int flags)
vstream_printf("*** ENVELOPE RECORDS %s ***\n", VSTREAM_PATH(fp)); vstream_printf("*** ENVELOPE RECORDS %s ***\n", VSTREAM_PATH(fp));
first = 0; first = 0;
} }
if (prev_type == REC_TYPE_CONT && in_message && !msg_verbose if (prev_type == REC_TYPE_CONT && !TEXT_RECORD(rec_type))
&& ((flags & PC_FLAG_OFFSET) != 0 || !TEXT_RECORD(rec_type)))
VSTREAM_PUTCHAR('\n'); VSTREAM_PUTCHAR('\n');
if (flags & PC_FLAG_OFFSET) if (flags & PC_FLAG_OFFSET)
vstream_printf("%9lu ", (unsigned long) offset); vstream_printf("%9lu ", (unsigned long) offset);
@@ -149,11 +148,15 @@ static void postcat(VSTREAM *fp, VSTRING *buffer, int flags)
asctime(localtime(&time))); asctime(localtime(&time)));
break; break;
case REC_TYPE_CONT: /* REC_TYPE_FILT collision */ case REC_TYPE_CONT: /* REC_TYPE_FILT collision */
if (msg_verbose) if (!in_message)
vstream_printf("%s: ", rec_type_name(rec_type));
else if (msg_verbose)
vstream_printf("unterminated_text: "); vstream_printf("unterminated_text: ");
vstream_fwrite(VSTREAM_OUT, STR(buffer), LEN(buffer)); vstream_fwrite(VSTREAM_OUT, STR(buffer), LEN(buffer));
if (msg_verbose) if (!in_message || msg_verbose || (flags & PC_FLAG_OFFSET) != 0) {
rec_type = 0;
VSTREAM_PUTCHAR('\n'); VSTREAM_PUTCHAR('\n');
}
break; break;
case REC_TYPE_NORM: case REC_TYPE_NORM:
if (msg_verbose) if (msg_verbose)