From b751f8f20f2964462779bda125e02d79d9b5afe4 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 19 Sep 2016 08:21:36 +0200 Subject: [PATCH] Move password_dovecotpw_with_method close to other dovecot related options --- plugins/password/config.inc.php.dist | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist index 9e186f2f5..5e213f602 100644 --- a/plugins/password/config.inc.php.dist +++ b/plugins/password/config.inc.php.dist @@ -56,6 +56,10 @@ $config['password_dovecotpw'] = '/usr/local/sbin/dovecotpw'; // for dovecot-1.x // Used for password_algorithm = 'dovecot'. $config['password_dovecotpw_method'] = 'CRAM-MD5'; +// Enables use of password with method prefix, e.g. {MD5}$1$LUiMYWqx$fEkg/ggr/L6Mb2X7be4i1/ +// when using password_algorithm=dovecot +$config['password_dovecotpw_with_method'] = false; + // Iteration count parameter for Blowfish-based hashing algo. // It must be between 4 and 31. Default: 12. // Be aware, the higher the value, the longer it takes to generate the password hashes. @@ -114,10 +118,6 @@ $config['password_crypt_hash'] = 'md5'; // Enable this option to use punycoded names $config['password_idn_ascii'] = false; -// Enables use of password with crypt method prefix in %D, e.g. {MD5}$1$LUiMYWqx$fEkg/ggr/L6Mb2X7be4i1/ -// when using the %D macro (deprecated, use %P) -$config['password_dovecotpw_with_method'] = false; - // Using a password hash for %n and %q variables (deprecated, use %P). // Determine which hashing algorithm should be used to generate // the hashed new and current password for using them within the