projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
40f9f01
)
Don't forward to '@' if the user lookup fails
author
Tollef Fog Heen
<tfheen@err.no>
Sat, 27 Jul 2013 19:34:28 +0000
(21:34 +0200)
committer
Tollef Fog Heen
<tfheen@err.no>
Sat, 27 Jul 2013 19:34:28 +0000
(21:34 +0200)
modules/exim/templates/eximconf.erb
patch
|
blob
|
history
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
71cf113
..
bafc7d2
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.
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\
{${local_part:${lookup{$local_part}cdb\
{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}\
${if eq {${domain:${lookup{$local_part}cdb\