github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare aliased domain with domain of alias rather then mailbox when the alias domain is different from the mailbox one

Browse Source
This commit is contained in:
Alexander Schlarb
2019-01-23 23:50:56 +01:00
parent 10457f4ffd
commit e676261ec0
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/postfix_maps.py
+9 -6
View File
@@ -119,10 +119,11 @@ class SenderLoginMap(object):
"INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id "
"INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
"INNER JOIN admin_alias al ON alr.alias_id=al.id "
"LEFT JOIN admin_domainalias adom ON adom.target_id=dom.id "
"LEFT JOIN admin_domainalias adoma ON adoma.target_id=al.domain_id "
"LEFT JOIN admin_domain adom ON adom.id=adoma.target_id "
"WHERE al.enabled=1 AND ("
" al.address='%s' OR ("
" adom.name='%d' AND al.address='%u'||'@'||dom.name"
" adoma.name='%d' AND al.address=concat('%u', '@', adom.name)"
")))"
)
postgres = (
@@ -137,10 +138,11 @@ class SenderLoginMap(object):
"INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id "
"INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
"INNER JOIN admin_alias al ON alr.alias_id=al.id "
"LEFT JOIN admin_domainalias adom ON adom.target_id=dom.id "
"LEFT JOIN admin_domainalias adoma ON adoma.target_id=al.domain_id "
"LEFT JOIN admin_domain adom ON adom.id=adoma.target_id "
"WHERE al.enabled AND ("
" al.address='%s' OR ("
" adom.name='%d' AND al.address='%u'||'@'||dom.name"
" adoma.name='%d' AND al.address='%u'||'@'||adom.name"
")))"
)
sqlite = (
@@ -155,9 +157,10 @@ class SenderLoginMap(object):
"INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id "
"INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
"INNER JOIN admin_alias al ON alr.alias_id=al.id "
"LEFT JOIN admin_domainalias adom ON adom.target_id=dom.id "
"LEFT JOIN admin_domainalias adoma ON adoma.target_id=al.domain_id "
"LEFT JOIN admin_domain adom ON adom.id=adoma.target_id "
"WHERE al.enabled=1 AND ("
" al.address='%s' OR ("
" adom.name='%d' AND al.address='%u'||'@'||dom.name"
" adoma.name='%d' AND al.address='%u'||'@'||adom.name"
"))"
)