From 0adf13db0b5b3c5bea36f4236a7d7bd77c552e87 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Wed, 14 Nov 2012 07:40:44 -0500 Subject: [PATCH] Changed login = '%u' to (login = '%u' OR email = '%u') in password query of dovecot-sql.conf.master file. --- install/tpl/opensuse_dovecot-sql.conf.master | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/install/tpl/opensuse_dovecot-sql.conf.master b/install/tpl/opensuse_dovecot-sql.conf.master index 26615fe..de652c4 100644 --- a/install/tpl/opensuse_dovecot-sql.conf.master +++ b/install/tpl/opensuse_dovecot-sql.conf.master @@ -133,7 +133,7 @@ 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' # The iterate_query is required for the doveadm command only and works only on dovecot 2 servers. -- Gitblit v1.9.1