Commits

Zhang Huangbin committed cc8b94d

Sync password patch for roundcubemail-0.9.1.

Comments (0)

Files changed (1)

iRedMail/patches/roundcubemail/password_driver_pgsql.patch

---- plugins/password/drivers/sql.php	2012-08-07 00:18:12.000000000 +0800
-+++ sql.php	2012-08-08 18:39:04.000000000 +0800
-@@ -55,7 +55,8 @@
-     	        $salt .= $seedchars[rand(0, 63)];
+--- plugins/password/drivers/sql.php	2013-05-17 02:06:30.000000000 +0800
++++ plugins/password/drivers/sql.php	2013-06-13 21:41:41.000000000 +0800
+@@ -80,7 +80,8 @@
+                 $salt .= $seedchars[rand(0, 63)];
              }
  
--            $sql = str_replace('%c',  $db->quote(crypt($passwd, CRYPT_MD5 ? '$1$'.$salt.'$' : $salt)), $sql);
-+            //$sql = str_replace('%c',  $db->quote(crypt($passwd, CRYPT_MD5 ? '$1$'.$salt.'$' : $salt)), $sql);
-+            $sql = str_replace('%c', str_replace("'", "\'", $db->quote(crypt($passwd, CRYPT_MD5 ? '$1$'.$salt.'$' : $salt))), $sql);
+-            $sql = str_replace('%c',  $db->quote(crypt($passwd, $salt_hashindicator ? $salt_hashindicator .$salt.'$' : $salt)), $sql);
++            //$sql = str_replace('%c',  $db->quote(crypt($passwd, $salt_hashindicator ? $salt_hashindicator .$salt.'$' : $salt)), $sql);
++            $sql = str_replace('%c', str_replace("'", "\'", $db->quote(crypt($passwd, $salt_hashindicator ? $salt_hashindicator .$salt.'$' : $salt))), $sql);
          }
  
          // dovecotpw
-@@ -152,7 +153,8 @@
+@@ -177,7 +178,8 @@
          // at least we should always have the local part
          $sql = str_replace('%l', $db->quote($local_part, 'text'), $sql);
          $sql = str_replace('%d', $db->quote($domain_part, 'text'), $sql);