Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-28 d1923498c73ceef785748b5464e05d8fe383e5ea

1
2
3
4
5
user = {mysql_server_ispconfig_user}
password = {mysql_server_ispconfig_password}
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'
hosts = {mysql_server_ip}