2 commits - lib/Auth

[Jeroen van Meeuwen]

 lib/Auth/LDAP.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8be34e7cf5e15db84977b20f86a9e05c26bba4c0
Merge: 6d50401 df3b154
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Jun 21 12:23:31 2012 +0200

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap



commit 6d504016bd50540bd33ab382b2ba2a1b1947f6bb
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Jun 21 12:22:59 2012 +0200

    Exclude organizationalunit from the default resources_filter (#849)

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index af05c39..0cd9f1c 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -1563,7 +1563,7 @@ class LDAP
 
         $filter  = $conf->get('resource_filter');
         if (!$filter)
-            $filter = '(objectclass=*)';
+            $filter = '(&(objectclass=*)(!(objectclass=organizationalunit)))';
 
         if (empty($attributes) || !is_array($attributes)) {
             $attributes = array('*');