From ea30faa00eca371a15653a6e2f8ad4ac8301e822 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Wed, 23 Nov 2011 08:38:42 +0000
Subject: - Save Samba password hashes in capital letters (#1488197)

git-svn-id: https://svn.roundcube.net/trunk@5467 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 plugins/password/drivers/ldap.php        | 1 +
 plugins/password/drivers/ldap_simple.php | 1 +
 plugins/password/package.xml             | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

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 2b3743cca..45688e118 100644
--- a/plugins/password/package.xml
+++ b/plugins/password/package.xml
@@ -15,7 +15,7 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2011-10-06</date>
+	<date>2011-11-23</date>
 	<version>
 		<release>2.4</release>
 		<api>1.6</api>
@@ -27,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="/">
-- 
cgit v1.2.3