summaryrefslogtreecommitdiffstats
path: root/debian/patches/75_15-deliver.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 09:44:08 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 09:44:08 +0000
commit933bbaf3ed7bd659a5c044745aea763815928598 (patch)
tree6fe3906ff9f7121999800da3683c206d128b7d39 /debian/patches/75_15-deliver.patch
parentAdding upstream version 4.94.2. (diff)
downloadexim4-933bbaf3ed7bd659a5c044745aea763815928598.tar.xz
exim4-933bbaf3ed7bd659a5c044745aea763815928598.zip
Adding debian version 4.94.2-7+deb11u2.debian/4.94.2-7+deb11u2debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/75_15-deliver.patch')
-rw-r--r--debian/patches/75_15-deliver.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches/75_15-deliver.patch b/debian/patches/75_15-deliver.patch
new file mode 100644
index 0000000..0c2ca27
--- /dev/null
+++ b/debian/patches/75_15-deliver.patch
@@ -0,0 +1,31 @@
+From 2bafe3fc82cf62f0c21f939f5891b8d067f3abc7 Mon Sep 17 00:00:00 2001
+From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
+Date: Sat, 3 Apr 2021 10:54:22 +0200
+Subject: [PATCH 15/23] deliver
+
+---
+ src/deliver.c | 5 +++--
+ test/paniclog/0622 | 2 +-
+ test/stderr/0622 | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/deliver.c b/src/deliver.c
+index 8b7998f37..87e944b03 100644
+--- a/src/deliver.c
++++ b/src/deliver.c
+@@ -6153,9 +6153,10 @@ else if (system_filter && process_recipients != RECIP_FAIL_TIMEOUT)
+ if (!tmp)
+ p->message = string_sprintf("failed to expand \"%s\" as a "
+ "system filter transport name", tpname);
+- if (is_tainted2(tmp, 0, m = string_sprintf("Tainted values '%s' "
+- "for transport '%s' as a system filter", tmp, tpname)))
++ { uschar *m;
++ if (m = is_tainted2(tmp, 0, "Tainted values '%s' " "for transport '%s' as a system filter", tmp, tpname))
+ p->message = m;
++ }
+ tpname = tmp;
+ }
+ else
+--
+2.30.2
+