diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 10:22:01 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 10:22:01 +0000 |
| commit | a8124680264223db14cd09a7e3a763a8309faf54 (patch) | |
| tree | ea37b6dc47f4cb0d95db48b8b4569066112e1cd0 /src/qmgr/qmgr_deliver.c | |
| parent | Releasing progress-linux version 3.7.10-0+deb12u1~progress6.99u1. (diff) | |
| download | postfix-a8124680264223db14cd09a7e3a763a8309faf54.tar.xz postfix-a8124680264223db14cd09a7e3a763a8309faf54.zip | |
Merging upstream version 3.7.11.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | src/qmgr/qmgr_deliver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qmgr/qmgr_deliver.c b/src/qmgr/qmgr_deliver.c index 07e89d4..577bb98 100644 --- a/src/qmgr/qmgr_deliver.c +++ b/src/qmgr/qmgr_deliver.c @@ -288,6 +288,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 @@ -322,6 +323,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. @@ -336,7 +338,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. */ |