From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 11 May 2016 00:17:19 +0000 (+0100)
Subject: vhost-local.m4: Fix missing newline.
X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/commitdiff_plain/cab82f26abce4161412ad9c434c5cbd5fc9303b4

vhost-local.m4: Fix missing newline.

I left a trap for myself: the extra-stuff argument to the
`USER_SPAMLIMIT_ROUTERS' macro wants a trailing newline (and tab);
otherwise the following material ends up following without a line break.

This went badly wrong: a `condition = ' line was extended with extra
material causing it to always match!  Fortunately little harm was
actually done.
---

diff --git a/vhost-local.m4 b/vhost-local.m4
index 7794669..700593b 100644
--- a/vhost-local.m4
+++ b/vhost-local.m4
@@ -28,7 +28,8 @@ FILTER_ROUTER(filter_vhost,
 	VHOST
 	condition = DOMKV(sysusers, {$value}{false})
 	local_part_suffix = CONF_user_suffix_list
-	local_part_suffix_optional = true:>)
+	local_part_suffix_optional = true
+	:>)
 
 SECTION(routers, virtual-sysusers-spam)m4_dnl
 ## If we're letting general system users receive mail through this vhost then
@@ -36,6 +37,7 @@ SECTION(routers, virtual-sysusers-spam)m4_dnl
 USER_SPAMLIMIT_ROUTERS(<:vhost:>,
 	<:CURRENT_LOCAL_PART:>, <:$domain:>, <:$sender_address:>,
 	<:VHOST
-	condition = DOMKV(sysusers, {$value}{false}):>)
+	condition = DOMKV(sysusers, {$value}{false})
+	:>)
 
 ###----- That's all, folks --------------------------------------------------