From 15970ab8dc0624eeb8ccdfdc7e5ed2b148b2d953 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sat, 9 Mar 2019 11:22:39 +0100
Subject: [PATCH] [Postfix] Fix sasl_passwd query from alias domain, fixes
 #2410 [Web] Major fix, added a line break! [Compose] Update Postfix image

---
 data/Dockerfiles/postfix/postfix.sh | 5 ++---
 data/web/admin.php                  | 1 +
 docker-compose.yml                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/Dockerfiles/postfix/postfix.sh b/data/Dockerfiles/postfix/postfix.sh
index 6ec5cc1d..dd6beca4 100755
--- a/data/Dockerfiles/postfix/postfix.sh
+++ b/data/Dockerfiles/postfix/postfix.sh
@@ -104,13 +104,12 @@ query = SELECT CONCAT_WS(':', username, password) AS auth_data FROM relayhosts
   WHERE id IN (
     SELECT relayhost FROM domain
       WHERE CONCAT('@', domain) = '%s'
-      OR '%s' IN (
-        SELECT CONCAT('@', alias_domain) FROM alias_domain
+      OR domain IN (
+        SELECT target_domain FROM alias_domain WHERE CONCAT('@', alias_domain) =  '%s'
       )
   )
   AND active = '1'
   AND username != '';
-EOF
 
 cat <<EOF > /opt/postfix/conf/sql/mysql_sasl_passwd_maps_transport_maps.cf
 user = ${DBUSER}
diff --git a/data/web/admin.php b/data/web/admin.php
index 6ca89e97..6826fec5 100644
--- a/data/web/admin.php
+++ b/data/web/admin.php
@@ -746,6 +746,7 @@ $tfa_data = get_tfa();
       <div id="active_settings_map" class="collapse" >
         <textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code" rows="20" name="settings_map" readonly><?=file_get_contents('http://nginx:8081/settings.php');?></textarea>
       </div>
+      <br>
       <?php $rsettings = rsettings('get'); ?>
         <form class="form" data-id="rsettings" role="form" method="post">
           <div class="row">
diff --git a/docker-compose.yml b/docker-compose.yml
index 2fb625ac..ba6ee945 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -211,7 +211,7 @@ services:
             - dovecot
 
     postfix-mailcow:
-      image: mailcow/postfix:1.29
+      image: mailcow/postfix:1.30
       build: ./data/Dockerfiles/postfix
       volumes:
         - ./data/conf/postfix:/opt/postfix/conf