diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-08-09 11:43:47 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-08-09 11:43:47 +0000 |
| commit | 7d38670e386d0de3cf3245e06a269f32d6ad1593 (patch) | |
| tree | 8ca199fd5fbdde4ab7c4b85c392ffae7e09c2979 | |
| parent | 6130f70fa7c582481bf0dce8b429aaacfc1e21ff (diff) | |
- Fixed Samba password hashing in 'ldap' driver
git-svn-id: https://svn.roundcube.net/trunk@5035 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | plugins/password/drivers/ldap.php | 4 | ||||
| -rw-r--r-- | plugins/password/package.xml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php index a18f349d7..3ea30a69c 100644 --- a/plugins/password/drivers/ldap.php +++ b/plugins/password/drivers/ldap.php @@ -200,7 +200,7 @@ function substitute_vars($str) * */ -function hashPassword( $passwordClear, $encodageType ) +function hashPassword( $passwordClear, $encodageType ) { $encodageType = strtolower( $encodageType ); switch( $encodageType ) { @@ -271,7 +271,7 @@ function hashPassword( $passwordClear, $encodageType ) case 'samba': if (function_exists('hash')) { - $cryptedPassword = hash('md4', rcube_charset_convert($password_clear, RCMAIL_CHARSET, 'UTF-16LE')); + $cryptedPassword = hash('md4', rcube_charset_convert($passwordClear, RCMAIL_CHARSET, 'UTF-16LE')); } else { /* Your PHP install does not have the hash() function */ return false; diff --git a/plugins/password/package.xml b/plugins/password/package.xml index e740e08d4..28f82a43d 100644 --- a/plugins/password/package.xml +++ b/plugins/password/package.xml @@ -28,6 +28,7 @@ <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license> <notes> - When old and new passwords are the same, do nothing, return success (#1487823) +- Fixed Samba password hashing in 'ldap' driver </notes> <contents> <dir baseinstalldir="/" name="/"> |