projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update concat
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
8281867
..
7517c26
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-782,7
+782,11
@@
check_recipient:
protocol_name=${uc:$received_protocol}\n\
instance=${acl_m_grey}\n\
helo_name=${sender_helo_name}\n\
protocol_name=${uc:$received_protocol}\n\
instance=${acl_m_grey}\n\
helo_name=${sender_helo_name}\n\
+<%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%>
client_address=${substr_-3:${mask:$sender_host_address/24}}\n\
client_address=${substr_-3:${mask:$sender_host_address/24}}\n\
+<%- else -%>
+ client_address=${sender_host_address}\n\
+<%- end -%>
client_name=${sender_host_name}\n\
sender=${sender_address}\n\
recipient=$local_part@$domain\n\n
client_name=${sender_host_name}\n\
sender=${sender_address}\n\
recipient=$local_part@$domain\n\n