X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/exim-config/blobdiff_plain/ccf76d8427e338b92e89971454ebf4ea57ad750f..31c922203e7c08f64c983044985d31d3470db13f:/vhost.m4

diff --git a/vhost.m4 b/vhost.m4
index b4cfb01..4c13c18 100644
--- a/vhost.m4
+++ b/vhost.m4
@@ -40,7 +40,8 @@ m4_define(<:VHOST_USER:>,
 
 SECTION(routers, route)m4_dnl
 ## If we're a front-end for some other domain, or we have special information
-## about the domain, then pass stuff along as instructed.
+## about the domain, then pass stuff along as instructed.  The hack for the
+## `transport' is very nasty; see the commentary for `smtp'.
 virtual_route:
 	driver = manualroute
 	self = fail
@@ -48,7 +49,7 @@ virtual_route:
 	condition = DOMKV(route, {true}{false})
 	route_data = <;DOMKV(route)
 	same_domain_copy_routing = true
-	transport = smtp
+	transport = DOMKV(tls-min-dh-bits, {smtp_dhbits_$value}{smtp})
 	no_more
 
 SECTION(routers, virtual)m4_dnl
@@ -62,6 +63,20 @@ FILTER_ROUTER(virtual_file,
 	<:VHOST_FILTER(file, filter):>,, <:
 	VHOST_USER:>)
 
+SECTION(routers, virtual-spam)m4_dnl
+## If we're dealing with a virtual host, see if we have special spam-limit
+## rules to apply.
+SPAMLIMIT_ROUTER(virtual_spam_limit_lookup)
+	VHOST
+	condition = DOMKV(spam-limit-file, {true}{false})
+	SPAMLIMIT_LOOKUP(DOMKV(spam-limit-file),
+		, $local_part,, $domain, $sender_address)
+SPAMLIMIT_ROUTER(virtual_spam_limit_userv)
+	VHOST
+	condition = DOMKV(spam-limit-userv, {true}{false})
+	SPAMLIMIT_USERV(DOMKV(spam-limit-userv),, $local_part,,
+		$domain, $sender_address)
+
 SECTION(routers, virtual-tail)m4_dnl
 ## Last ditch effort for required local parts.  This is a bit strange because
 ## we should only try this for `final' domains -- where we're not going to