2 commits - lib/Auth lib/kolab_api_controller.php

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sat Sep 1 16:08:06 CEST 2012


 lib/Auth/LDAP.php            |    5 -----
 lib/kolab_api_controller.php |    2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 8b2f9ba045684406ec3238fd1cd8688350607452
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sat Sep 1 16:06:48 2012 +0200

    Authentication postdata is trace-level information

diff --git a/lib/kolab_api_controller.php b/lib/kolab_api_controller.php
index c2688a3..9e7c628 100644
--- a/lib/kolab_api_controller.php
+++ b/lib/kolab_api_controller.php
@@ -270,7 +270,7 @@ class kolab_api_controller
      */
     private function authenticate($request, $postdata)
     {
-        Log::debug("Authenticating with postdata: " . json_encode($postdata));
+        Log::trace("Authenticating with postdata: " . json_encode($postdata));
 
         $valid = false;
 


commit eb465e58996e8a25981b7d56564bfe43e31ab302
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sat Sep 1 16:05:16 2012 +0200

    Revert "Always fully qualify the username passed on to Net_LDAP3::login()"
    
    This reverts commit f7b522de0d7cfc761ca27adc94f4a265fc45fa8d.
    
    Appending the domain name space is not appropriate for logging in with DNs

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index 3120efa..df4f960 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -110,11 +110,6 @@ class LDAP extends Net_LDAP3 {
             return false;
         }
 
-        // We'll want to pass on a qualified username to Net_LDAP3::login()
-        if (!strpos($username, '@')) {
-            $username = $username . '@' . $this->domain;
-        }
-
         $result = $this->login($username, $password);
 
         if (!$result) {





More information about the commits mailing list