From 333d7800479078ecb00535e1f198ffc6b67f3154 Mon Sep 17 00:00:00 2001
From: Steven Mondji-Lerider <squidly@nnx.com>
Date: Fri, 31 Jan 2014 07:35:29 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20#1568=20Gestion=20des=20catchall=20d?=
 =?UTF-8?q?=C3=A9fectueuse.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitattributes                                   |  1 +
 etc/alternc/templates/alternc/postfix/postfix.cf |  2 +-
 etc/alternc/templates/postfix/mymail2mail.cf     | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 etc/alternc/templates/postfix/mymail2mail.cf

diff --git a/.gitattributes b/.gitattributes
index 87a4c065..d924bfbf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -532,6 +532,7 @@ etc/alternc/templates/postfix/master.cf -text
 etc/alternc/templates/postfix/myalias.cf -text
 etc/alternc/templates/postfix/mydomain.cf -text
 etc/alternc/templates/postfix/mygid.cf -text
+etc/alternc/templates/postfix/mymail2mail.cf -text
 etc/alternc/templates/postfix/myquota.cf -text
 etc/alternc/templates/postfix/myrelay-domain.cf -text
 etc/alternc/templates/postfix/myrelay.cf -text
diff --git a/etc/alternc/templates/alternc/postfix/postfix.cf b/etc/alternc/templates/alternc/postfix/postfix.cf
index 8283253d..dd669413 100644
--- a/etc/alternc/templates/alternc/postfix/postfix.cf
+++ b/etc/alternc/templates/alternc/postfix/postfix.cf
@@ -32,7 +32,7 @@ smtpd_sasl_auth_enable=yes
 #Virtual Maping
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
-virtual_alias_maps = proxy:mysql:/etc/postfix/myalias.cf
+virtual_alias_maps = proxy:mysql:/etc/postfix/myalias.cf,proxy:mysql:/etc/postfix/mymail2mail.cf
 virtual_alias_domains = 
 virtual_mailbox_domains = proxy:mysql:/etc/postfix/mydomain.cf
 virtual_mailbox_maps = proxy:mysql:/etc/postfix/myvirtual.cf
diff --git a/etc/alternc/templates/postfix/mymail2mail.cf b/etc/alternc/templates/postfix/mymail2mail.cf
new file mode 100644
index 00000000..03819a1e
--- /dev/null
+++ b/etc/alternc/templates/postfix/mymail2mail.cf
@@ -0,0 +1,13 @@
+# AUTO GENERATED FILE
+# Modify template in /etc/alternc/templates/
+# and launch alternc.install if you want 
+# to modify this file.
+#
+
+user = %%db_mail_user%%
+password = %%db_mail_pwd%%
+hosts =%%dbhost%%
+dbname = %%dbname%%
+query = concat(`address`.`address`,'@',`domaines`.`domaine`) AS `mail` from address,domaines where `address`.`enabled` = 1 and `address`.`domain_id` = domaines.id and concat(`address`.`address`,'@',`domaines`.`domaine`) = '%s';
+ 
+