From dbac5a049acbe645a816b4a5e895c5be0de53483 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Fri, 2 Apr 2021 17:30:27 +0200
Subject: [PATCH] pipe

(cherry picked from commit f9628406706112be459adb3f121db8e6cf282c2d)
---
 src/src/transports/pipe.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
index 1cb574ee7..929681422 100644
--- a/src/src/transports/pipe.c
+++ b/src/src/transports/pipe.c
@@ -592,13 +592,16 @@ if (!cmd || !*cmd)
     tblock->name);
   return FALSE;
   }
-if (is_tainted(cmd))
+
+{ uschar *m;
+if (m = is_tainted2(cmd, 0, "Tainted '%s' (command "
+    "for %s transport) not permitted", cmd, tblock->name))
   {
-  addr->message = string_sprintf("Tainted '%s' (command "
-    "for %s transport) not permitted", cmd, tblock->name);
   addr->transport_return = PANIC;
+  addr->message = m;
   return FALSE;
   }
+}
 
 /* When a pipe is set up by a filter file, there may be values for $thisaddress
 and numerical the variables in existence. These are passed in
-- 
2.30.2