- synced with this one from 4.40

Changed files:
    exim4.conf -> 1.12

diff --git a/exim4.conf b/exim4.conf
index f2f5db72052d90782b2ee148d73d4e5eb65e02be..11abc058377ba734ba09443f53e8c3f095575bb0 100644 (file)
--- a/exim4.conf
+++ b/exim4.conf
@@ -499,8 +499,14 @@ system_aliases:
 
 # This router handles forwarding using traditional .forward files in users'
 # home directories. If you want it also to allow mail filtering when a forward
-# file starts with the string "# Exim filter", uncomment the "allow_filter"
-# option.
+# file starts with the string "# Exim filter" or "# Sieve filter", uncomment
+# the "allow_filter" option.
+
+# If you want this router to treat local parts with suffixes introduced by "-"
+# or "+" characters as if the suffixes did not exist, uncomment the two local_
+# part_suffix options. Then, for example, xxxx-foo@your.domain will be treated
+# in the same way as xxxx@your.domain by this router. You probably want to make
+# the same change to the localuser router.
 
 # The no_verify setting means that this router is skipped when Exim is
 # verifying addresses. Similarly, no_expn means that this router is skipped if
@@ -518,11 +524,13 @@ system_aliases:
 userforward:
   driver = redirect
   check_local_user
+# local_part_suffix = +* : -*
+# local_part_suffix_optional
   file = $home/.forward
+# allow_filter
   no_verify
   no_expn
   check_ancestor
-# allow_filter
   file_transport = address_file
   pipe_transport = address_pipe
   reply_transport = address_reply
@@ -541,9 +549,16 @@ userforward:
 # This router matches local user mailboxes. If the router fails, the error
 # message is "Unknown user".
 
+# If you want this router to treat local parts with suffixes introduced by "-"
+# or "+" characters as if the suffixes did not exist, uncomment the two local_
+# part_suffix options. Then, for example, xxxx-foo@your.domain will be treated
+# in the same way as xxxx@your.domain by this router.
+
 localuser:
   driver = accept
   check_local_user
+# local_part_suffix = +* : -*
+# local_part_suffix_optional
   transport = local_delivery
   cannot_route_message = Unknown user