From 3d0b0cdbdd2317babdb8302199a4514f7ca9217c Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Mon, 31 Oct 2011 10:09:31 +0100 Subject: [PATCH] Revert "fixing mysql-virtual_sender_permissions.cf regarding postfix-policy in Froxlor, fixes #879" This reverts commit f49ac9e19306d645a9e7bfd25aa3afa02cac7ad3. --- .../etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../usr_local_etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../postfix/etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- .../etc_postfix_mysql-virtual_sender_permissions.cf | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts = diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf index 7026cb55..410be470 100644 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf +++ b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf @@ -1,5 +1,5 @@ user = password = dbname = -query = select distinct username from mail_users where postfix = 'Y' and email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); +query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s')); hosts =