Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update postfix.sh, so mysql_sender_dependent_default_transport_maps.cf is in line with mysql_sasl_passwd_maps_sender_dependent.cf #6085

Open
wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Update postfix.sh, so mysql_sender_dependent_default_transport_maps.cf is in line with mysql_sasl_passwd_maps_sender_dependent.cf #6085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions data/Dockerfiles/postfix/postfix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,6 @@ dbname = ${DBNAME}
query = SELECT CONCAT_WS(':', username, password) AS auth_data FROM relayhosts
WHERE id IN (
SELECT COALESCE(
(SELECT id FROM relayhosts
LEFT OUTER JOIN domain ON domain.relayhost = relayhosts.id
WHERE relayhosts.active = '1'
AND (domain.domain = '%d'
OR domain.domain IN (
SELECT target_domain FROM alias_domain
WHERE alias_domain = '%d'
)
)
),
(SELECT id FROM relayhosts
LEFT OUTER JOIN mailbox ON JSON_UNQUOTE(JSON_VALUE(mailbox.attributes, '$.relayhost')) = relayhosts.id
WHERE relayhosts.active = '1'
Expand All @@ -204,6 +194,16 @@ query = SELECT CONCAT_WS(':', username, password) AS auth_data FROM relayhosts
AND alias.address NOT LIKE '@%%'
)
)
),
(SELECT id FROM relayhosts
LEFT OUTER JOIN domain ON domain.relayhost = relayhosts.id
WHERE relayhosts.active = '1'
AND (domain.domain = '%d'
OR domain.domain IN (
SELECT target_domain FROM alias_domain
WHERE alias_domain = '%d'
)
)
)
)
)
Expand Down