Use ${local_part_data} for local delivery lookups because ${local_part} is tainted

diff --git a/master b/master
index 97af95e0a71b01c535f79a1d6a466d766a5f568f..b98f2dfd5459dbcc7199069650f8561b274f679d 100644 (file)
--- a/master
+++ b/master
@@ -376,7 +376,7 @@ userforward:
 procmail:
   driver = accept
   check_local_user
-  require_files = ${local_part}:${home}/.procmailrc
+  require_files = ${local_part_data}:${home}/.procmailrc
   transport = procmail
   no_verify
 
@@ -448,7 +448,7 @@ procmail:
   delivery_date_add
   envelope_to_add
   return_path_add
-  command = "/usr/bin/procmail -d ${local_part}"
+  command = "/usr/bin/procmail -d ${local_part_data}"
   user = $local_part
   initgroups
   check_string = "From "
@@ -460,7 +460,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   return_path_add
-  file = /var/spool/mail/${local_part}
+  file = /var/spool/mail/${local_part_data}
   group = mail
   mode = 0660
   no_mode_fail_narrower