From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 8 Apr 2009 18:22:10 +0000 (+0200)
Subject: Fix password handling.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7218b2a602d57e4b7e0b24aef44097b681b6662c;p=horde.git

Fix password handling.
---

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php
index 08b4448d6..75af6b912 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php
@@ -209,12 +209,12 @@ class Horde_Kolab_Server_Test extends Horde_Kolab_Server_Kolab
             $this->bound = true;
 
             try {
-                $data = $this->read($dn, array('userPassword'));
+                $data = $this->read($dn, array(Horde_Kolab_Server_Object_Person::ATTRIBUTE_USERPASSWORD));
             } catch (Horde_Kolab_Server_Exception $e) {
                 $this->bound = false;
                 throw $e;
             }
-            if (!isset($data['userPassword'])) {
+            if (!isset($data[Horde_Kolab_Server_Object_Person::ATTRIBUTE_USERPASSWORD])) {
                 $this->bound = false;
                 throw new Horde_Kolab_Server_Exception('User has no password entry!');
             }
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
index 36bad3ff5..84daef094 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
@@ -276,8 +276,9 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase
         global $conf;
 
         /** Prepare a Kolab test server */
-        $conf['kolab']['server']['driver']           = $type;
-        $conf['kolab']['server']['params']['basedn'] = 'dc=example,dc=org';
+        $conf['kolab']['server']['driver']             = $type;
+        $conf['kolab']['server']['params']['basedn']   = 'dc=example,dc=org';
+        $conf['kolab']['server']['params']['hashtype'] = 'plain';
 
         if ($type == 'file') {
             $conf['kolab']['server']['params']['file'] = Horde::getTempFile('fileTest');