diff options
| author | alecpl <alec@alec.pl> | 2011-11-24 07:53:00 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-11-24 07:53:00 +0000 |
| commit | 3ad2b1b4b0ac0fc7a6c7a5adaad9a0616b890daf (patch) | |
| tree | b4f9d8054a99ad4e20f22a0f7068036673187657 /plugins/password | |
| parent | c994e0e7cd9f593eb21ff80c7c1ddbeaf2a1b12a (diff) | |
- Applied fixes from trunk up to r5479
Diffstat (limited to 'plugins/password')
| -rw-r--r-- | plugins/password/drivers/ldap.php | 1 | ||||
| -rw-r--r-- | plugins/password/drivers/ldap_simple.php | 1 | ||||
| -rw-r--r-- | plugins/password/package.xml | 12 |
3 files changed, 11 insertions, 3 deletions
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php index 3ea30a69c..e6450e5e1 100644 --- a/plugins/password/drivers/ldap.php +++ b/plugins/password/drivers/ldap.php @@ -272,6 +272,7 @@ function hashPassword( $passwordClear, $encodageType ) case 'samba': if (function_exists('hash')) { $cryptedPassword = hash('md4', rcube_charset_convert($passwordClear, RCMAIL_CHARSET, 'UTF-16LE')); + $cryptedPassword = strtoupper($cryptedPassword); } else { /* Your PHP install does not have the hash() function */ return false; diff --git a/plugins/password/drivers/ldap_simple.php b/plugins/password/drivers/ldap_simple.php index 482b7e56f..2f51b7547 100644 --- a/plugins/password/drivers/ldap_simple.php +++ b/plugins/password/drivers/ldap_simple.php @@ -238,6 +238,7 @@ function ldap_simple_hash_password($password_clear, $encodage_type) case 'samba': if (function_exists('hash')) { $crypted_password = hash('md4', rcube_charset_convert($password_clear, RCMAIL_CHARSET, 'UTF-16LE')); + $crypted_password = strtoupper($crypted_password); } 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 d3f4bea9b..45688e118 100644 --- a/plugins/password/package.xml +++ b/plugins/password/package.xml @@ -15,10 +15,9 @@ <email>alec@alec.pl</email> <active>yes</active> </lead> - <date></date> - <time></time> + <date>2011-11-23</date> <version> - <release></release> + <release>2.4</release> <api>1.6</api> </version> <stability> @@ -28,6 +27,7 @@ <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license> <notes> - Added option to use punycode or unicode for domain names (#1488103) +- Save Samba password hashes in capital letters (#1488197) </notes> <contents> <dir baseinstalldir="/" name="/"> @@ -51,21 +51,27 @@ <file name="localization/de_CH.inc" role="data"></file> <file name="localization/de_DE.inc" role="data"></file> <file name="localization/en_US.inc" role="data"></file> + <file name="localization/es_AR.inc" role="data"></file> <file name="localization/es_ES.inc" role="data"></file> <file name="localization/et_EE.inc" role="data"></file> <file name="localization/fi_FI.inc" role="data"></file> <file name="localization/fr_FR.inc" role="data"></file> <file name="localization/gl_ES.inc" role="data"></file> + <file name="localization/hr_HR.inc" role="data"></file> <file name="localization/hu_HU.inc" role="data"></file> <file name="localization/it_IT.inc" role="data"></file> + <file name="localization/ja_JA.inc" role="data"></file> <file name="localization/lt_LT.inc" role="data"></file> <file name="localization/lv_LV.inc" role="data"></file> <file name="localization/nl_NL.inc" role="data"></file> <file name="localization/pl_PL.inc" role="data"></file> <file name="localization/pt_BR.inc" role="data"></file> <file name="localization/pt_PT.inc" role="data"></file> + <file name="localization/ru_RU.inc" role="data"></file> + <file name="localization/sk_SK.inc" role="data"></file> <file name="localization/sl_SI.inc" role="data"></file> <file name="localization/sv_SE.inc" role="data"></file> + <file name="localization/tr_TR.inc" role="data"></file> <file name="localization/zh_TW.inc" role="data"></file> <file name="drivers/chgsaslpasswd.c" role="data"></file> |