local.m4: Switch `aliases' file to `nwildlsearch' and expand the result.

[exim-config] / vhost.m4

diff --git a/vhost.m4 b/vhost.m4
index 07ca79eba51a766a0b5b1ba655a1156d11c0fb33..d37edd9ea0c709aec1c0dcf2fdd6ab06dcd98f11 100644 (file)
--- a/vhost.m4
+++ b/vhost.m4
@@ -22,11 +22,15 @@
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 m4_define(<:VHOST:>,
-       <:domains = partial0-lsearch; CONF_sysconf_dir/domains.conf
+       <:domains = ${if exists{CONF_sysconf_dir/domains.conf} \
+                        {partial0-lsearch; CONF_sysconf_dir/domains.conf} \
+                        {}}
        condition = DOMKV($1):>)
 m4_define(<:VHOST_FILTER:>,
        <:FILTER_BASE
        VHOST(<:$1:>)
+       router_home_directory = DOMKV(home, {$value} fail)
+       more = ${if bool{DOMKV(final, {$value}{true})} {false} {true}}
        $2 = ${expand:DOMKV($1, {$value} fail)}:>)
 m4_define(<:VHOST_USER:>,
        <:user = DOMKV(owner, {$value}{CONF_filter_user})