Commit db34dc01 authored by Till Brehm's avatar Till Brehm

Merge branch 'patch-3' into 'stable-3.1'

Fix Catchall Greylisting

See merge request !647
parents 34d2f1bc d192b1cf
user = {mysql_server_ispconfig_user} user = {mysql_server_ispconfig_user}
password = {mysql_server_ispconfig_password} password = {mysql_server_ispconfig_password}
dbname = {mysql_server_database} dbname = {mysql_server_database}
query = SELECT 'greylisting' FROM (SELECT greylisting, source AS email FROM mail_forwarding WHERE server_id = {server_id} UNION SELECT greylisting, email FROM mail_user WHERE server_id = {server_id}) addresses WHERE addresses.email='%s' AND addresses.greylisting='y' query = SELECT 'greylisting' FROM (SELECT greylisting, source AS email FROM mail_forwarding WHERE server_id = {server_id} UNION SELECT greylisting, email FROM mail_user WHERE server_id = {server_id}) addresses WHERE addresses.email='%s' AND addresses.greylisting='y' UNION SELECT 'greylisting' FROM `mail_forwarding` f CROSS JOIN `mail_user` u ON u.email = f.destination WHERE f.type = 'catchall' AND u.greylisting = 'y' AND u.server_id = {server_id} AND f.source = '@%s'
hosts = {mysql_server_ip} hosts = {mysql_server_ip}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment