Don't forward to '@' if the user lookup fails

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 71cf113de11557005056169ff31c8ec3d47f6ef2..bafc7d29f94b550b9bfa33b12dd152fc0a0626d8 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1428,7 +1428,10 @@ virt_users:
   group = ${extract{group}{VDOMAINDATA}}
   # Manually construct the forwarding address, preserving the
   # local_part_suffix if the remote host is master.
-  data = ${if exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}\
+  data = ${if and {{exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}\
+                     {! eq {${lookup{$local_part}cdb\
+                            {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}\
+                           {}}}\
              {${local_part:${lookup{$local_part}cdb\
              {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}\
              ${if eq {${domain:${lookup{$local_part}cdb\