diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-28 00:00:39 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-28 00:00:39 +0000 |
| commit | 23f607076c3f633d640d1a6819a9b6dcc2a57c60 (patch) | |
| tree | 7339dd530a1dfa17a19720419e8f8d05ac10ed91 /src/oqmgr | |
| parent | Adding debian version 3.5.24-0+deb11u1. (diff) | |
| download | postfix-23f607076c3f633d640d1a6819a9b6dcc2a57c60.tar.xz postfix-23f607076c3f633d640d1a6819a9b6dcc2a57c60.zip | |
Merging upstream version 3.5.25.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/oqmgr')
| -rw-r--r-- | src/oqmgr/qmgr_deliver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/oqmgr/qmgr_deliver.c b/src/oqmgr/qmgr_deliver.c index d8ec7bb..0e26403 100644 --- a/src/oqmgr/qmgr_deliver.c +++ b/src/oqmgr/qmgr_deliver.c @@ -285,6 +285,7 @@ static void qmgr_deliver_update(int unused_event, void *context) * The queue itself won't go away before we dispose of the current queue * entry. */ +#if 0 if (status == DELIVER_STAT_CRASH) { message->flags |= DELIVER_STAT_DEFER; #if 0 @@ -319,6 +320,7 @@ static void qmgr_deliver_update(int unused_event, void *context) qmgr_defer_transport(transport, &dsb->dsn); return; } +#endif /* * This message must be tried again. @@ -333,7 +335,9 @@ static void qmgr_deliver_update(int unused_event, void *context) */ #define SUSPENDED "delivery temporarily suspended: " - if (status == DELIVER_STAT_DEFER) { + if (status == DELIVER_STAT_CRASH) + DSN_SIMPLE(&dsb->dsn, "4.3.0", "unknown mail transport error"); + if (status == DELIVER_STAT_CRASH || status == DELIVER_STAT_DEFER) { message->flags |= DELIVER_STAT_DEFER; if (VSTRING_LEN(dsb->status)) { /* Sanitize the DSN status/reason from the delivery agent. */ |