From 526dbbd68e79e0c88d8210e0dc84b42a875e78b2 Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Thu, 8 Sep 2011 08:29:51 +0200
Subject: [PATCH] fixing mysql-virtual_alias_maps.cf and
 mysql-virtual_mailbox_domains.cf regarding postfix-policy in Froxlor, refs
 #879

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 .../postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf   | 4 ++--
 .../etc_postfix_mysql-virtual_mailbox_domains.cf              | 2 +-
 .../postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf   | 2 +-
 .../etc_postfix_mysql-virtual_mailbox_domains.cf              | 2 +-
 .../postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf   | 4 ++--
 .../etc_postfix_mysql-virtual_mailbox_domains.cf              | 2 +-
 .../postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf   | 4 ++--
 .../etc_postfix_mysql-virtual_mailbox_domains.cf              | 2 +-
 .../postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf | 2 +-
 .../usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf    | 2 +-
 .../postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf   | 4 ++--
 .../etc_postfix_mysql-virtual_mailbox_domains.cf              | 2 +-
 .../postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf   | 4 ++--
 .../etc_postfix_mysql-virtual_mailbox_domains.cf              | 2 +-
 .../postfix/etc_postfix_mysql-virtual_alias_maps.cf           | 4 ++--
 .../postfix/etc_postfix_mysql-virtual_mailbox_domains.cf      | 2 +-
 .../postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf   | 4 ++--
 .../etc_postfix_mysql-virtual_mailbox_domains.cf              | 2 +-
 .../postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf   | 4 ++--
 .../etc_postfix_mysql-virtual_mailbox_domains.cf              | 2 +-
 .../postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf   | 4 ++--
 .../etc_postfix_mysql-virtual_mailbox_domains.cf              | 2 +-
 .../postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf   | 4 ++--
 .../etc_postfix_mysql-virtual_mailbox_domains.cf              | 2 +-
 24 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..3c841900 100644
--- a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..53e9564c 100644
--- a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..3c841900 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..3c841900 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..53e9564c 100644
--- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..3c841900 100644
--- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..3c841900 100644
--- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..3c841900 100644
--- a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..3c841900 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..e67300a8 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
+additional_conditions = and TRIM(destination) > '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..3c841900 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
index a9e71f83..3c841900 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
+additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
index 4484bee2..88678917 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1'
+additional_conditions = and isemaildomain = '1' and deactivated = '0'
 hosts = <SQL_HOST>