Merge pull request #708 from Coeur2Boeuf/patch-1

Update functions.inc.php for dovecot:CRYPT-METHOD
postfixadmin · Feb 20, 2023 · 18b3638 · 18b3638
2 parents 0344e72 + e53b5e8
commit 18b3638
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/functions.inc.php b/functions.inc.php
@@ -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)) {