- validate if used mail-service (imap, pop3) is allowed for user, fixes #475
This commit is contained in:
@@ -11,3 +11,4 @@ MYSQL_LOGIN_FIELD username
|
|||||||
MYSQL_HOME_FIELD homedir
|
MYSQL_HOME_FIELD homedir
|
||||||
MYSQL_MAILDIR_FIELD maildir
|
MYSQL_MAILDIR_FIELD maildir
|
||||||
MYSQL_QUOTA_FIELD (quota*1024*1024)
|
MYSQL_QUOTA_FIELD (quota*1024*1024)
|
||||||
|
MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
driver = mysql
|
driver = mysql
|
||||||
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
|
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
|
||||||
default_pass_scheme = CRYPT
|
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'
|
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'))
|
||||||
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('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3'))
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
driver = mysql
|
driver = mysql
|
||||||
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
|
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
|
||||||
default_pass_scheme = CRYPT
|
default_pass_scheme = CRYPT
|
||||||
password_query = SELECT username AS user, password_enc AS password FROM mail_users WHERE username = '%u'
|
password_query = SELECT username AS user, password_enc AS password FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3'))
|
||||||
user_query = SELECT CONCAT(homedir,maildir) AS home, concat('maildir:',homedir,maildir) AS mail, uid, gid FROM mail_users where username = '%u'
|
user_query = SELECT CONCAT(homedir,maildir) AS home, concat('maildir:',homedir,maildir) AS mail, uid, gid FROM mail_users where (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3'))
|
||||||
|
|||||||
@@ -11,3 +11,4 @@ MYSQL_LOGIN_FIELD username
|
|||||||
MYSQL_HOME_FIELD "<VIRTUAL_MAILBOX_BASE>"
|
MYSQL_HOME_FIELD "<VIRTUAL_MAILBOX_BASE>"
|
||||||
MYSQL_MAILDIR_FIELD maildir
|
MYSQL_MAILDIR_FIELD maildir
|
||||||
MYSQL_QUOTA_FIELD (quota*1024*1024)
|
MYSQL_QUOTA_FIELD (quota*1024*1024)
|
||||||
|
MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
driver = mysql
|
driver = mysql
|
||||||
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
|
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
|
||||||
default_pass_scheme = CRYPT
|
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('*:storage=', quota,'M') AS userdb_quota_rule FROM mail_users WHERE username = '%u' OR email = '%u'"
|
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('*:storage=', quota,'M') AS userdb_quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3'))"
|
||||||
user_query = "SELECT CONCAT(homedir, maildir) AS home, uid, gid, CONCAT('*:storage=', quota,'M') AS quota_rule FROM mail_users WHERE username = '%u' OR email = '%u'"
|
user_query = "SELECT CONCAT(homedir, maildir) AS home, uid, gid, CONCAT('*:storage=', quota,'M') AS quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3'))"
|
||||||
|
|||||||
@@ -10,3 +10,5 @@ MYSQL_GID_FIELD gid
|
|||||||
MYSQL_LOGIN_FIELD username
|
MYSQL_LOGIN_FIELD username
|
||||||
MYSQL_HOME_FIELD homedir
|
MYSQL_HOME_FIELD homedir
|
||||||
MYSQL_MAILDIR_FIELD maildir
|
MYSQL_MAILDIR_FIELD maildir
|
||||||
|
MYSQL_QUOTA_FIELD (quota*1024*1024)
|
||||||
|
MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
|
||||||
|
|||||||
@@ -11,3 +11,4 @@ MYSQL_LOGIN_FIELD username
|
|||||||
MYSQL_HOME_FIELD homedir
|
MYSQL_HOME_FIELD homedir
|
||||||
MYSQL_MAILDIR_FIELD maildir
|
MYSQL_MAILDIR_FIELD maildir
|
||||||
MYSQL_QUOTA_FIELD (quota*1024*1024)
|
MYSQL_QUOTA_FIELD (quota*1024*1024)
|
||||||
|
MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
driver = mysql
|
driver = mysql
|
||||||
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
|
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
|
||||||
default_pass_scheme = CRYPT
|
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'
|
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'))
|
||||||
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('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3'))
|
||||||
|
|||||||
@@ -11,3 +11,4 @@ MYSQL_LOGIN_FIELD username
|
|||||||
MYSQL_HOME_FIELD homedir
|
MYSQL_HOME_FIELD homedir
|
||||||
MYSQL_MAILDIR_FIELD maildir
|
MYSQL_MAILDIR_FIELD maildir
|
||||||
MYSQL_QUOTA_FIELD (quota*1024*1024)
|
MYSQL_QUOTA_FIELD (quota*1024*1024)
|
||||||
|
MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
driver = mysql
|
driver = mysql
|
||||||
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
|
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
|
||||||
default_pass_scheme = CRYPT
|
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'
|
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'))
|
||||||
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'
|
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') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3'))
|
||||||
|
|||||||
Reference in New Issue
Block a user