Commit 6b4fbe1c authored by Paul Cammish's avatar Paul Cammish
Browse files

Fixes email aliases for domains

parent 5e37e271
......@@ -7,7 +7,10 @@ vhost_aliases:
local_part_suffix_optional
# Make sure the files exists to avoid awkward failures
condition = ${if exists{VHOST_DIR/$domain/config/aliases}}
data = ${lookup{$local_part}lsearch{VHOST_DIR/$domain/config/aliases}}
# this uses detaint which is a nasty hack to de-taint the submitted $local_part variable
# a proper fix should be made which checks the relevant values and populates
# $local_parts
data = ${lookup{${lookup{$local_part} lsearch*,ret=key{/etc/exim4/detaint}}}lsearch{VHOST_DIR/$domain_data/config/aliases}}
# Set permissions for any actions we might take
user = ${extract{uid}{${stat:VHOST_DIR/$domain/VHOST_CONFIG_DIR}}}
group = ${extract{gid}{${stat:VHOST_DIR/$domain/VHOST_CONFIG_DIR}}}
......@@ -37,8 +40,8 @@ vhost_aliases_check:
local_part_suffix = +*
local_part_suffix_optional
condition = ${if and{\
{exists{VHOST_DIR/$domain/config/aliases}}\
{eq{${lookup{$local_part}lsearch{VHOST_DIR/$domain/config/aliases}{yes}}}{yes}}\
}}
{exists{VHOST_DIR/$domain/config/aliases}}\
{eq{${lookup{${lookup{$local_part} lsearch*,ret=key{/etc/exim4/detaint}}}lsearch{VHOST_DIR/${lookup{$domain} lsearch*,ret=key{/etc/exim4/detaint}}/config/aliases}{yes}}}{yes}}\
}}
verify_only
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment