git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/Dockerfiles/postfix/postfix.sh b/mailcow/src/mailcow-dockerized/data/Dockerfiles/postfix/postfix.sh
index e734a9a..78b070e 100755
--- a/mailcow/src/mailcow-dockerized/data/Dockerfiles/postfix/postfix.sh
+++ b/mailcow/src/mailcow-dockerized/data/Dockerfiles/postfix/postfix.sh
@@ -323,7 +323,19 @@
dbname = ${DBNAME}
# First select queries domain and alias_domain to determine if domains are active.
query = SELECT goto FROM alias
- WHERE address='%s'
+ WHERE id IN (
+ SELECT COALESCE (
+ (
+ SELECT id FROM alias
+ WHERE address='%s'
+ AND (active='1' OR active='2')
+ ), (
+ SELECT id FROM alias
+ WHERE address='@%d'
+ AND (active='1' OR active='2')
+ )
+ )
+ )
AND active='1'
AND (domain IN
(SELECT domain FROM domain
@@ -354,7 +366,7 @@
WHERE alias_domain.alias_domain = '%d'
AND mailbox.username = CONCAT('%u','@',alias_domain.target_domain)
AND (mailbox.active = '1' OR mailbox.active ='2')
- AND alias_domain.active='1'
+ AND alias_domain.active='1';
EOF
# MX based routing