From 1122052b5a2d75d7cb84d10082ed7b4f92c820e7 Mon Sep 17 00:00:00 2001
From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Tue, 19 May 2015 01:30:34 -0400
Subject: [PATCH] Support plus-addressing since wildcards are deprecated

Added several years ago but left uncommitted.
---
 conf.d/router/250_exim4-config_spamcheck_vmail         | 3 +++
 conf.d/router/310_exim4-config_virtual_user            | 3 +++
 conf.d/router/450_exim4-config_hosted_aliases          | 3 +++
 conf.d/router/480_exim4-config_hosted_wildcard_aliases | 3 +++
 conf.d/router/550_exim4-config_spamcheck_localuser     | 3 +++
 conf.d/router/600_exim4-config_userforward             | 3 +++
 conf.d/router/900_exim4-config_local_user              | 3 +++
 7 files changed, 21 insertions(+)

diff --git a/conf.d/router/250_exim4-config_spamcheck_vmail b/conf.d/router/250_exim4-config_spamcheck_vmail
index 94f1bb8..89b83ee 100644
--- a/conf.d/router/250_exim4-config_spamcheck_vmail
+++ b/conf.d/router/250_exim4-config_spamcheck_vmail
@@ -3,6 +3,9 @@
 
 spamcheck_router_vmail:
   debug_print = "R: spamcheck_router_vmail  for $local_part@$domain"
+  # hcoop-change: deliver $user+$suffix to $user
+  local_part_suffix = +*
+  local_part_suffix_optional
   no_verify
   condition = "${if !eq {$received_protocol}{spam-scanned} {1}{0}}"
   require_files = /etc/spamassassin/addrs/${local_part}@${domain}
diff --git a/conf.d/router/310_exim4-config_virtual_user b/conf.d/router/310_exim4-config_virtual_user
index e7499c4..a4276d2 100644
--- a/conf.d/router/310_exim4-config_virtual_user
+++ b/conf.d/router/310_exim4-config_virtual_user
@@ -2,6 +2,9 @@
 
 virtual_user:
   debug_print = "R: virtual_user for $local_part@$domain"
+  # hcoop-change: deliver $user+$suffix to $user
+  local_part_suffix = +*
+  local_part_suffix_optional
   driver = accept
   transport = virtual_delivery
   # Look up the parameters for this email address, and store them in
diff --git a/conf.d/router/450_exim4-config_hosted_aliases b/conf.d/router/450_exim4-config_hosted_aliases
index 21796e3..3cf675a 100644
--- a/conf.d/router/450_exim4-config_hosted_aliases
+++ b/conf.d/router/450_exim4-config_hosted_aliases
@@ -8,6 +8,9 @@ hosted_aliases:
   domains = +local_domains
   allow_fail
   allow_defer
+  # hcoop-change: deliver $user+$suffix to $user
+  local_part_suffix = +*
+  local_part_suffix_optional
   data = ${lookup{$local_part@$domain}lsearch{/etc/aliases.hosted}}
   .ifdef SYSTEM_ALIASES_USER
   user = SYSTEM_ALIASES_USER
diff --git a/conf.d/router/480_exim4-config_hosted_wildcard_aliases b/conf.d/router/480_exim4-config_hosted_wildcard_aliases
index 7ab9cec..0ab5262 100644
--- a/conf.d/router/480_exim4-config_hosted_wildcard_aliases
+++ b/conf.d/router/480_exim4-config_hosted_wildcard_aliases
@@ -8,6 +8,9 @@ hosted_wildcard_aliases:
   domains = +local_domains
   allow_fail
   allow_defer
+  # hcoop-change: deliver $user+$suffix to $user
+  local_part_suffix = +*
+  local_part_suffix_optional
   data = ${lookup{$local_part@$domain}lsearch*@{/etc/aliases.wildcard}}
   .ifdef SYSTEM_ALIASES_USER
   user = SYSTEM_ALIASES_USER
diff --git a/conf.d/router/550_exim4-config_spamcheck_localuser b/conf.d/router/550_exim4-config_spamcheck_localuser
index f144747..7201348 100644
--- a/conf.d/router/550_exim4-config_spamcheck_localuser
+++ b/conf.d/router/550_exim4-config_spamcheck_localuser
@@ -3,6 +3,9 @@
 
 spamcheck_router_localuser:
   debug_print = "R: spamcheck_router_localuser for $local_part@$domain"
+  # hcoop-change: deliver $user+$suffix to $user
+  local_part_suffix = +*
+  local_part_suffix_optional
   no_verify
   condition = "${if !eq {$received_protocol}{spam-scanned} {1}{0}}"
   check_local_user
diff --git a/conf.d/router/600_exim4-config_userforward b/conf.d/router/600_exim4-config_userforward
index 727ba8b..ec0e1d6 100644
--- a/conf.d/router/600_exim4-config_userforward
+++ b/conf.d/router/600_exim4-config_userforward
@@ -27,6 +27,9 @@ userforward:
   debug_print = "R: userforward for $local_part@$domain"
   driver = redirect
   domains = +unix_domains
+  # hcoop-change: deliver $user+$suffix to $user
+  local_part_suffix = +*
+  local_part_suffix_optional
   check_local_user
   check_owner = false
   check_group = false
diff --git a/conf.d/router/900_exim4-config_local_user b/conf.d/router/900_exim4-config_local_user
index 7d13100..bcadd0c 100644
--- a/conf.d/router/900_exim4-config_local_user
+++ b/conf.d/router/900_exim4-config_local_user
@@ -9,6 +9,9 @@
 
 local_user:
   debug_print = "R: local_user for $local_part@$domain"
+  # hcoop-change: deliver $user+$suffix to $user
+  local_part_suffix = +*
+  local_part_suffix_optional
   driver = accept
   domains = +unix_domains
   check_local_user
-- 
2.20.1