Change how filtering routers work.

[exim-config] / vhost.m4

diff --git a/vhost.m4 b/vhost.m4
index 603b238..6a710cb 100644 (file)
--- a/vhost.m4
+++ b/vhost.m4
@@ -55,21 +55,12 @@ SECTION(routers, virtual)m4_dnl
 ## Remap recipients according to the virtual host's instructions.  This must
 ## be done in two passes, so that we can identify the correct user's spam
 ## threshold during address verification.
-virtual_verify_data:
-       VHOST_FILTER(redirect, data)
-       FILTER_VERIFY
-virtual_verify_file:
-       VHOST_FILTER(filter, file)
-       FILTER_VERIFY
-
-virtual_filter_data:
-       VHOST_FILTER(redirect, data)
-       VHOST_USER
-       FILTER_TRANSPORTS
-virtual_filter_file:
-       VHOST_FILTER(filter, file)
-       VHOST_USER
-       FILTER_TRANSPORTS
+FILTER_ROUTER(virtual_data,
+       <:VHOST_FILTER(redirect, data):>,, <:
+       VHOST_USER:>)
+FILTER_ROUTER(virtual_file,
+       <:VHOST_FILTER(filter, file):>,, <:
+       VHOST_USER:>)
 
 DIVERT(null)
 ###----- That's all, folks --------------------------------------------------