summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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