From 92cd7f34b07e86062f2c024039e3309768b48ce6 Mon Sep 17 00:00:00 2001
From: Andy Wermke <andy@dev.next-step-software.com>
Date: Thu, 04 Apr 2013 10:10:23 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/roundcube/roundcubemail
---
plugins/password/drivers/ldap.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index def07a1..548d327 100644
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@@ -85,7 +85,7 @@
// Crypt new samba password
if ($smbpwattr && !($samba_pass = $this->hashPassword($passwd, 'samba'))) {
- return PASSWORD_CRYPT_ERROR;
+ return PASSWORD_CRYPT_ERROR;
}
// Writing new crypted password to LDAP
@@ -271,11 +271,11 @@
case 'samba':
if (function_exists('hash')) {
- $cryptedPassword = hash('md4', rcube_charset_convert($passwordClear, RCMAIL_CHARSET, 'UTF-16LE'));
+ $cryptedPassword = hash('md4', rcube_charset::convert($passwordClear, RCUBE_CHARSET, 'UTF-16LE'));
$cryptedPassword = strtoupper($cryptedPassword);
} else {
- /* Your PHP install does not have the hash() function */
- return false;
+ /* Your PHP install does not have the hash() function */
+ return false;
}
break;
--
Gitblit v1.9.1