summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2021-04-02 17:30:27 +0200
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2021-06-24 21:43:09 +0200
commitdbac5a049acbe645a816b4a5e895c5be0de53483 (patch)
tree55a9412c663f57491a753d196f1b86d37911b824 /src
parentf7509ba6fb5e1033c1406b87f057c9c48a217d27 (diff)
pipe
(cherry picked from commit f9628406706112be459adb3f121db8e6cf282c2d)
Diffstat (limited to 'src')
-rw-r--r--src/src/transports/pipe.c9
1 files 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