From cce9d63279d9078dd0292dd015be497600ac5f32 Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Tue, 25 Feb 2014 09:16:36 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
install/tpl/debian6_dovecot-sql.conf.master | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/install/tpl/debian6_dovecot-sql.conf.master b/install/tpl/debian6_dovecot-sql.conf.master
index b04abde..86eb4df 100644
--- a/install/tpl/debian6_dovecot-sql.conf.master
+++ b/install/tpl/debian6_dovecot-sql.conf.master
@@ -13,20 +13,9 @@
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password}
default_pass_scheme = CRYPT
-password_query = SELECT password FROM mail_user \
- WHERE login = '%u' AND disable%Ls = 'n'
+password_query = SELECT password FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND `disable%Ls` = 'n'
-# Old user query quota part
-# CONCAT('*:storage=', quota , 'B') AS quota_rule
-# Old user query with email instead of login
-# WHERE email = '%u' AND disable%Ls = 'n'
-
-user_query = SELECT email as user, \
- maildir as home, \
- CONCAT('maildir:', maildir, '/Maildir') as mail, \
- uid, \
- gid, \
- CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, \
- CONCAT(maildir, '/.sieve') as sieve \
- FROM mail_user \
- WHERE email = '%u' AND disable%Ls = 'n'
+# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
+# Do not enable it on Dovecot 1.x servers
+# iterate_query = SELECT email as user FROM mail_user
--
Gitblit v1.9.1