mirror/postfixadmin
0
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2024-09-19 19:22:14 +02:00
Code

Update functions.inc.php

Browse Source 
$conf['encrypt'] = 'dovecot:CRAM-MD5'

never success !

function _pacrypt_dovecot() will be never used

See my propose to run with dovecot:CRYPT-METHOD
This commit is contained in:
Thomas GALLIOU 2023-02-20 19:44:13 +01:00 committed by GitHub
parent 0344e729d0
commit e53b5e8a58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions.inc.php
View File

@ -1295,7 +1295,7 @@ function pacrypt($pw, $pw_db = "")
if (!empty($pw_db) && preg_match('/^{([0-9a-z-\.]+)}/i', $pw_db, $matches)) {
$method_in_hash = $matches[1];
if ('COURIER:' . strtoupper($method_in_hash) == $mechanism) {
if ( 'DOVECOT:' . strtoupper($method_in_hash) == $mechanism || 'COURIER:' . strtoupper($method_in_hash) == $mechanism) {
// don't try and be clever.
} elseif ($mechanism != $method_in_hash) {
error_log("PostfixAdmin: configured to use $mechanism, but asked to crypt password using {$method_in_hash}; are you migrating algorithm/mechanism or is something wrong?");
@ -1328,7 +1328,7 @@ function pacrypt($pw, $pw_db = "")
}
if (preg_match('/^DOVECOT:(.*)$/i', $mechanism, $matches)) {
$mechanism = strtoupper($matches[1]);
return _pacrypt_dovecot($pw, $pw_db);
}
if (empty($pw_db)) {