Revert introduction of alloc_insecure_tainted_data

[exim.git] / src / src / transports / pipe.c

diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
index e22722fd06a4e50f838cac94d63582a78e3c47a8..2ec4a72fbcd8dd3115d48fdab35166c4830e2d1c 100644 (file)
--- a/src/src/transports/pipe.c
+++ b/src/src/transports/pipe.c
@@ -592,16 +592,13 @@ if (!cmd || !*cmd)
     tblock->name);
   return FALSE;
   }
-
-{ uschar *m;
-if ((m = is_tainted2(cmd, 0, "Tainted '%s' (command "
-    "for %s transport) not permitted", cmd, tblock->name)))
+if (is_tainted(cmd))
   {
+  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