summaryrefslogtreecommitdiffstats
path: root/src/qmgr
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:40:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:40:29 +0000
commitd6c33feab80875e4e2ab4ec8bf46425a292318bc (patch)
tree9e325e95e2c785049562a1fefc7e56cf65cd8679 /src/qmgr
parentAdding upstream version 3.8.5. (diff)
downloadpostfix-d6c33feab80875e4e2ab4ec8bf46425a292318bc.tar.xz
postfix-d6c33feab80875e4e2ab4ec8bf46425a292318bc.zip
Adding upstream version 3.8.6.upstream/3.8.6
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/qmgr')
-rw-r--r--src/qmgr/qmgr_deliver.c6
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. */