X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/185b5456076ca86959643ce2f19c98c0f82f281e..7ab75d6f000cb2f27c85f9f38b597535efc5fa0b:/local.m4

diff --git a/local.m4 b/local.m4
index 78b3e64..52398aa 100644
--- a/local.m4
+++ b/local.m4
@@ -65,7 +65,8 @@ alias:
 	allow_defer = true
 	user = CONF_filter_user
 	FILTER_TRANSPORTS
-	data = ${lookup {$local_part} lsearch {CONF_alias_file}}
+	local_parts = nwildlsearch; CONF_alias_file
+	data = ${expand:$local_part_data}
 
 SECTION(routers, real)m4_dnl
 ## A special hack to get mail to a user who has a forward file.  Only for
@@ -86,20 +87,13 @@ SECTION(routers, forward)m4_dnl
 ## rejection if possible).  Mail sent directly to the user is handled through
 ## `~/.mail/forward', or `~/.forward', or if neither of those exists, by
 ## writing the message to `/var/mail/USER'.
-filter_verify:
-	FILTER_LOCALUSER(CONF_userconf_dir/forward.suffix)
-	FILTER_VERIFY
-	local_part_suffix = CONF_user_suffix_list
-filter_suffix:
-	FILTER_LOCALUSER(CONF_userconf_dir/forward.suffix)
-	local_part_suffix = CONF_user_suffix_list
-	FILTER_TRANSPORTS
-filter:
-	FILTER_LOCALUSER(CONF_userconf_dir/forward)
-	FILTER_TRANSPORTS
-dot_forward:
-	FILTER_LOCALUSER($home/.forward)
-	FILTER_TRANSPORTS
+FILTER_ROUTER(filter_suffix,
+	<:FILTER_LOCALUSER(CONF_userconf_dir/forward.suffix)
+	local_part_suffix = CONF_user_suffix_list:>)
+FILTER_ROUTER(filter,
+	<:FILTER_LOCALUSER(CONF_userconf_dir/forward):>)
+FILTER_ROUTER(dot_forward,
+	<:FILTER_LOCALUSER($home/.forward):>)
 
 SECTION(routers, deliver)m4_dnl
 ## Deliver mail to a user, in the absence of any other instructions.