X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=7517c26b67f59200449ec4fdeaebb9cca680614c;hb=1b40c402500f4a7df439bf2c6b0bab5084f5e676;hp=8281867844b83868d2ea1a8bcabfb2a090e47e9c;hpb=57ff971603fd14d7f511f090ae32bef85effbc16;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 828186784..7517c26b6 100644 --- 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\ +<%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%> 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