From d3824e3a2ad71aa01a0e0895199cdefa798337bd Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 26 May 2010 10:05:52 -0400
Subject: [PATCH] Fixed: FS#1183 - remove server_id part from conditional stamenet in postfix and courier / dovecot queries.

---
 install/tpl/mysql-virtual_domains.cf.master            |    2 +-
 install/tpl/mysql-virtual_forwardings.cf.master        |    2 +-
 install/tpl/mysql-virtual_mailboxes.cf.master          |    2 +-
 install/tpl/mysql-virtual_sender.cf.master             |    2 +-
 install/tpl/mysql-virtual_transports.cf.master         |    2 +-
 install/tpl/mysql-virtual_recipient.cf.master          |    2 +-
 install/tpl/mysql-virtual_relayrecipientmaps.cf.master |    2 +-
 install/tpl/mysql-virtual_email2email.cf.master        |    2 +-
 install/tpl/mysql-virtual_relaydomains.cf.master       |    2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/install/tpl/mysql-virtual_domains.cf.master b/install/tpl/mysql-virtual_domains.cf.master
index 5b71142..729c677 100644
--- a/install/tpl/mysql-virtual_domains.cf.master
+++ b/install/tpl/mysql-virtual_domains.cf.master
@@ -4,5 +4,5 @@
 table = mail_domain
 select_field = domain
 where_field = domain
-additional_conditions = and active = 'y' and server_id = {server_id}
+additional_conditions = and active = 'y'
 hosts = {mysql_server_ip}
\ No newline at end of file
diff --git a/install/tpl/mysql-virtual_email2email.cf.master b/install/tpl/mysql-virtual_email2email.cf.master
index e18ef24..1e19591 100644
--- a/install/tpl/mysql-virtual_email2email.cf.master
+++ b/install/tpl/mysql-virtual_email2email.cf.master
@@ -4,5 +4,5 @@
 table = mail_user
 select_field = email
 where_field = email
-additional_conditions = and postfix = 'y' and server_id = {server_id}
+additional_conditions = and postfix = 'y'
 hosts = {mysql_server_ip}
\ No newline at end of file
diff --git a/install/tpl/mysql-virtual_forwardings.cf.master b/install/tpl/mysql-virtual_forwardings.cf.master
index b3f3325..01281e3 100644
--- a/install/tpl/mysql-virtual_forwardings.cf.master
+++ b/install/tpl/mysql-virtual_forwardings.cf.master
@@ -4,5 +4,5 @@
 table = mail_forwarding
 select_field = destination
 where_field = source
-additional_conditions = and active = 'y' and server_id = {server_id}
+additional_conditions = and active = 'y'
 hosts = {mysql_server_ip}
\ No newline at end of file
diff --git a/install/tpl/mysql-virtual_mailboxes.cf.master b/install/tpl/mysql-virtual_mailboxes.cf.master
index d013c34..570f069 100644
--- a/install/tpl/mysql-virtual_mailboxes.cf.master
+++ b/install/tpl/mysql-virtual_mailboxes.cf.master
@@ -4,5 +4,5 @@
 table = mail_user
 select_field = CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/')
 where_field = email
-additional_conditions = and postfix = 'y' and server_id = {server_id}
+additional_conditions = and postfix = 'y'
 hosts = {mysql_server_ip}
\ No newline at end of file
diff --git a/install/tpl/mysql-virtual_recipient.cf.master b/install/tpl/mysql-virtual_recipient.cf.master
index 49024f3..254cfe5 100644
--- a/install/tpl/mysql-virtual_recipient.cf.master
+++ b/install/tpl/mysql-virtual_recipient.cf.master
@@ -4,5 +4,5 @@
 table        = mail_access
 select_field = access
 where_field  = source
-additional_conditions = and type = 'recipient' and active = 'y' and server_id = {server_id}
+additional_conditions = and type = 'recipient' and active = 'y'
 hosts = {mysql_server_ip}
\ No newline at end of file
diff --git a/install/tpl/mysql-virtual_relaydomains.cf.master b/install/tpl/mysql-virtual_relaydomains.cf.master
index fb7bec1..0856467 100644
--- a/install/tpl/mysql-virtual_relaydomains.cf.master
+++ b/install/tpl/mysql-virtual_relaydomains.cf.master
@@ -4,5 +4,5 @@
 table = mail_transport
 select_field = domain
 where_field = domain
-additional_conditions = and active = 'y' and server_id = {server_id}
+additional_conditions = and active = 'y'
 hosts = {mysql_server_ip}
\ No newline at end of file
diff --git a/install/tpl/mysql-virtual_relayrecipientmaps.cf.master b/install/tpl/mysql-virtual_relayrecipientmaps.cf.master
index a6304fe..4822f3b 100644
--- a/install/tpl/mysql-virtual_relayrecipientmaps.cf.master
+++ b/install/tpl/mysql-virtual_relayrecipientmaps.cf.master
@@ -4,5 +4,5 @@
 table = mail_relay_recipient
 select_field = access
 where_field = source
-additional_conditions = and active = 'y' and server_id = {server_id}
+additional_conditions = and active = 'y'
 hosts = {mysql_server_ip}
\ No newline at end of file
diff --git a/install/tpl/mysql-virtual_sender.cf.master b/install/tpl/mysql-virtual_sender.cf.master
index 0ef634a..7531451 100644
--- a/install/tpl/mysql-virtual_sender.cf.master
+++ b/install/tpl/mysql-virtual_sender.cf.master
@@ -4,5 +4,5 @@
 table        = mail_access
 select_field = access
 where_field  = source
-additional_conditions = and type = 'sender' and active = 'y' and server_id = {server_id}
+additional_conditions = and type = 'sender' and active = 'y'
 hosts = {mysql_server_ip}
\ No newline at end of file
diff --git a/install/tpl/mysql-virtual_transports.cf.master b/install/tpl/mysql-virtual_transports.cf.master
index 048a7a8..0040d1d 100644
--- a/install/tpl/mysql-virtual_transports.cf.master
+++ b/install/tpl/mysql-virtual_transports.cf.master
@@ -4,5 +4,5 @@
 table = mail_transport
 select_field = transport
 where_field = domain
-additional_conditions = and active = 'y' and server_id = {server_id}
+additional_conditions = and active = 'y'
 hosts = {mysql_server_ip}
\ No newline at end of file

--
Gitblit v1.9.1