From 4627331339e74954c9079f6529b1a184b258a2d3 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sat, 19 Sep 2020 19:15:01 +0200 Subject: [PATCH] [Dovecot] Fix sieve with new protocol toggling implementation, fixes #3769 --- data/Dockerfiles/dovecot/docker-entrypoint.sh | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/Dockerfiles/dovecot/docker-entrypoint.sh b/data/Dockerfiles/dovecot/docker-entrypoint.sh index d9a07bc2..0b8d7dd6 100755 --- a/data/Dockerfiles/dovecot/docker-entrypoint.sh +++ b/data/Dockerfiles/dovecot/docker-entrypoint.sh @@ -142,7 +142,7 @@ cat < /etc/dovecot/sql/dovecot-dict-sql-passdb.conf driver = mysql connect = "host=/var/run/mysqld/mysqld.sock dbname=${DBNAME} user=${DBUSER} password=${DBPASS}" default_pass_scheme = SSHA256 -password_query = SELECT password FROM mailbox WHERE active = '1' AND username = '%u' AND domain IN (SELECT domain FROM domain WHERE domain='%d' AND active='1') AND JSON_EXTRACT(attributes, '$.force_pw_update') NOT LIKE '%%1%%' AND JSON_UNQUOTE(JSON_VALUE(attributes, '$.%s_access')) = '1' +password_query = SELECT password FROM mailbox WHERE active = '1' AND username = '%u' AND domain IN (SELECT domain FROM domain WHERE domain='%d' AND active='1') AND JSON_UNQUOTE(JSON_VALUE(attributes, '$.force_pw_update')) != '1' AND (JSON_UNQUOTE(JSON_VALUE(attributes, '$.%s_access')) = '1' OR ('%s' != 'imap' AND '%s' != 'pop3')) EOF cat < /etc/dovecot/lua/app-passdb.lua diff --git a/docker-compose.yml b/docker-compose.yml index ed1071dd..a544c684 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -192,7 +192,7 @@ services: - sogo dovecot-mailcow: - image: mailcow/dovecot:1.131 + image: mailcow/dovecot:1.132 depends_on: - mysql-mailcow dns: