diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-12-12 16:10:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-12-12 16:10:49 +0000 |
| commit | 4bf2526f886d71a067a1004ee5be2b75d0f721f7 (patch) | |
| tree | 6d07da5e11537220569c748c2af66ae9db991d15 /src/cleanup | |
| parent | Releasing progress-linux version 3.9.0-2~progress7.99u1. (diff) | |
| download | postfix-4bf2526f886d71a067a1004ee5be2b75d0f721f7.tar.xz postfix-4bf2526f886d71a067a1004ee5be2b75d0f721f7.zip | |
Merging upstream version 3.9.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/cleanup')
| -rw-r--r-- | src/cleanup/cleanup_message.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/cleanup/cleanup_message.c b/src/cleanup/cleanup_message.c index 0d31598..d5b1271 100644 --- a/src/cleanup/cleanup_message.c +++ b/src/cleanup/cleanup_message.c @@ -723,8 +723,9 @@ static void cleanup_header_done_callback(void *context) vstring_sprintf(state->temp1, "%s.%s@%s", time_stamp, state->queue_id, var_myhostname); } - cleanup_out_format(state, REC_TYPE_NORM, "%sMessage-Id: <%s>", - state->resent, vstring_str(state->temp1)); + vstring_sprintf(state->temp2, "%sMessage-Id: <%s>", + state->resent, vstring_str(state->temp1)); + cleanup_out_header(state, state->temp2); msg_info("%s: %smessage-id=<%s>", state->queue_id, *state->resent ? "resent-" : "", vstring_str(state->temp1)); @@ -741,8 +742,9 @@ static void cleanup_header_done_callback(void *context) if ((state->hdr_rewrite_context || var_always_add_hdrs) && (state->headers_seen & (1 << (state->resent[0] ? HDR_RESENT_DATE : HDR_DATE))) == 0) { - cleanup_out_format(state, REC_TYPE_NORM, "%sDate: %s", + vstring_sprintf(state->temp2, "%sDate: %s", state->resent, mail_date(state->arrival_time.tv_sec)); + cleanup_out_header(state, state->temp2); } /* @@ -805,7 +807,7 @@ static void cleanup_header_done_callback(void *context) vstring_sprintf(state->temp2, "%sFrom: %s", state->resent, vstring_str(state->temp1)); } - CLEANUP_OUT_BUF(state, REC_TYPE_NORM, state->temp2); + cleanup_out_header(state, state->temp2); } /* |