Taintcheck transport-process arguments

8 files changed, 38 insertions, 15 deletions

diff --git a/test/confs/0101 b/test/confs/0101
index cf89fa83a..8fd0841cb 100644
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -25,11 +25,13 @@ all:
 mmdf_localuser:
   driver = accept
   local_part_prefix = mmdf-
+  local_parts = userx
   transport = mmdf_local_delivery
 
 filtered_localuser:
   driver = accept
   local_part_prefix = filter-
+  local_parts = userx
   transport = filtered_local_delivery
 
 bsmtp_localuser:
@@ -55,7 +57,7 @@ smtp:
 local_delivery:
   driver = pipe
   check_string = "From "
-  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part'
+  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data'
   escape_string = ">From "
   user = CALLER
   current_directory = /
@@ -63,7 +65,7 @@ local_delivery:
 bsmtp_local_delivery:
   driver = pipe
   use_bsmtp
-  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part'
+  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data'
   delivery_date_add
   envelope_to_add
   return_path_add
@@ -72,7 +74,7 @@ bsmtp_local_delivery:
 
 filtered_local_delivery:
   driver = pipe
-  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part'
+  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data'
   delivery_date_add
   envelope_to_add
   return_path_add
@@ -83,7 +85,7 @@ filtered_local_delivery:
 mmdf_local_delivery:
   driver = pipe
   check_string = "\1\1\1\1\n"
-  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part'
+  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data'
   escape_string = "\1\1\1\1 \n"
   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
diff --git a/test/confs/0134 b/test/confs/0134
index 3376f05f3..0358e12ae 100644
--- a/test/confs/0134
+++ b/test/confs/0134
@@ -88,7 +88,7 @@ directfile:
 
 pipe:
   driver = pipe
-  command = /bin/sh -c "echo $local_part $domain >DIR/test-mail/$local_part"
+  command = /bin/sh -c "echo $local_part_data $domain_data >DIR/test-mail/$local_part_data"
   user = CALLER
 
 
diff --git a/test/confs/0194 b/test/confs/0194
index 4d0ac7c89..15906b996 100644
--- a/test/confs/0194
+++ b/test/confs/0194
@@ -45,7 +45,7 @@ pipe:
 piperet:
   driver = pipe
   batch_max = 100
-  command = DIR/aux-fixed/TESTNUM.ret $h_ret:
+  command = DIR/aux-fixed/TESTNUM.ret "${if inlist {$h_ret:} {75:99} {$value}}"
   return_fail_output
   user = CALLER
 
diff --git a/test/confs/0321 b/test/confs/0321
index b063cdeb1..658ad15ce 100644
--- a/test/confs/0321
+++ b/test/confs/0321
@@ -29,7 +29,9 @@ begin transports
 
 pipe:
   driver = pipe
-  command = /non/exist/command -f <$sender_address> -d $pipe_addresses
+  command = /non/exist/command -f \
+	"<${if match_local_part {$sender_address}{CALLER@test.ex}{$value}}>" \
+	-d $pipe_addresses
   message_prefix =
   message_suffix =
   check_string =
diff --git a/test/confs/0369 b/test/confs/0369
index 511c541f6..a9eae39e5 100644
--- a/test/confs/0369
+++ b/test/confs/0369
@@ -29,13 +29,13 @@ begin transports
 
 t1:
   driver = pipe
-  command = /bin/sh -c 'exit $local_part'
+  command = /bin/sh -c 'exit "${if inlist {$local_part}{0:10:45}{$value}}"'
   user = CALLER
   temp_errors = 45 : 56
 
 t2:
   driver = pipe
-  command = /bin/sh -c 'exit $local_part'
+  command = /bin/sh -c 'exit "${if inlist {$local_part}{0:10:45}{$value}}"'
   user = CALLER
   temp_errors = *
 
diff --git a/test/confs/0383 b/test/confs/0383
index 44aff1cef..4c5bcfbf6 100644
--- a/test/confs/0383
+++ b/test/confs/0383
@@ -9,7 +9,7 @@ primary_hostname = myhost.test.ex
 qualify_domain = test.ex
 system_filter = DIR/aux-var/TESTNUM.F
 system_filter_pipe_transport = t1
-
+log_selector = +received_recipients
 
 # ----- Routers -----
 
diff --git a/test/confs/0594 b/test/confs/0594
index 981261206..6a877e2e9 100644
--- a/test/confs/0594
+++ b/test/confs/0594
@@ -12,22 +12,40 @@ primary_hostname = myhost.test.ex
 
 begin routers
 
-r2:
+r0:
   driver = redirect
   local_part_prefix = pipe-
   local_part_suffix = =*
   caseful_local_part = true
   data = |${substr_1:$local_part_suffix}
-  pipe_transport = t2
+  pipe_transport = t0
+
+r1:
+  driver = redirect
+  local_parts =	rtr_user
+  data = |echo $local_part
+  pipe_transport = t0
+
+r2:
+  driver = redirect
+  local_parts =	tpt_user
+  data = |unused_word
+  pipe_transport = t1
+  errors_to = ""
 
 
 # ----- Transports -----
 
 begin transports
 
-t2:
+t0:
+  driver = pipe
+  user = CALLER
+
+t1:
   driver = pipe
+  force_command
+  command = echo $local_part
   user = CALLER
-  batch_max = 10
 
 # End
diff --git a/test/confs/5100 b/test/confs/5100
index 61a371176..3cc4e8ade 100644
--- a/test/confs/5100
+++ b/test/confs/5100
@@ -25,6 +25,7 @@ bounces:
 smartuser:
   driver = accept
   retry_use_local_part
+  address_data =	${if inlist {$h_script:}{01:02:03:04:05:06:07:08:09:10} {$value}}
   transport = lmtp
 
 
@@ -35,7 +36,7 @@ begin transports
 lmtp:
   driver = lmtp
   batch_max = 100
-  command = DIR/bin/mtpscript DIR/aux-fixed/TESTNUM.script.$h_script: +DIR/spool/log/mainlog
+  command = DIR/bin/mtpscript DIR/aux-fixed/TESTNUM.script.$address_data +DIR/spool/log/mainlog
   timeout = 1s
   user = EXIMUSER
   ignore_quota = IGNORE_QUOTA