From ebbe6374fc9c308daf729d2ad1b2f8007ed771ce Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 17 Feb 2014 05:34:43 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
install/tpl/mysql-virtual_forwardings.cf.master | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/install/tpl/mysql-virtual_forwardings.cf.master b/install/tpl/mysql-virtual_forwardings.cf.master
index b3f3325..cf1debb 100644
--- a/install/tpl/mysql-virtual_forwardings.cf.master
+++ b/install/tpl/mysql-virtual_forwardings.cf.master
@@ -4,5 +4,6 @@
table = mail_forwarding
select_field = destination
where_field = source
-additional_conditions = and active = 'y' and server_id = {server_id}
+additional_conditions = and type != 'aliasdomain' and active = 'y' and server_id = {server_id}
+# additional_conditions = and active = 'y' and server_id = {server_id}
hosts = {mysql_server_ip}
\ No newline at end of file
--
Gitblit v1.9.1