From 67d623cd21f691f5455e6833ae580f183618b1ad Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sat, 17 Dec 2011 11:42:42 +0100 Subject: [PATCH] Fixed user_queries for dovecot-quote, fixes #979 @5m Signed-off-by: Florian Aders (EleRas) --- .../debian_lenny/dovecot/etc_dovecot_dovecot-sql.conf | 2 +- .../debian_squeeze/dovecot/etc_dovecot_dovecot-sql.conf | 2 +- .../ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot-sql.conf index b39429cb..c6f896aa 100644 --- a/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot-sql.conf +++ b/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot-sql.conf @@ -2,4 +2,4 @@ driver = mysql connect = host= dbname= user= password= default_pass_scheme = CRYPT password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp') -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE (username = '%u' OR email = '%u') +user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') diff --git a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot-sql.conf index b39429cb..c6f896aa 100644 --- a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot-sql.conf +++ b/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot-sql.conf @@ -2,4 +2,4 @@ driver = mysql connect = host= dbname= user= password= default_pass_scheme = CRYPT password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp') -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE (username = '%u' OR email = '%u') +user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') diff --git a/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf index b39429cb..c6f896aa 100644 --- a/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf +++ b/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf @@ -2,4 +2,4 @@ driver = mysql connect = host= dbname= user= password= default_pass_scheme = CRYPT password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp') -user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE (username = '%u' OR email = '%u') +user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u')