From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 12 Mar 2010 15:40:30 +0000 (+0000)
Subject: Reverted user filter
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5e625bc339c55a7cefb657bbd713033f129a39ae;p=gosa.git

Reverted user filter


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16499 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index 5d090417d..a0af47afd 100644
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -2,17 +2,16 @@
 
 <filterdef>
   <definition>
+    <category>users</category>
     <initial>true</initial>
     <default>default</default>
     <scope>auto</scope>
-    <category>users</category>
   </definition>
 
   <search>
     <tag>default</tag>
     <label>Default filter</label>
     <query>
-      <storage>userRDN</storage>
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=gosaAccount)(|(cn=$)(sn=$)(uid=$)))</filter>
       <attribute>dn</attribute>
@@ -22,17 +21,6 @@
       <attribute>uid</attribute>
       <attribute>userPassword</attribute>
     </query>
-    <query>
-      <storage>userRDN</storage>
-      <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=posixAccount)(|(cn=$)(sn=$)(uid=$)))</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>givenName</attribute>
-      <attribute>sn</attribute>
-      <attribute>uid</attribute>
-      <attribute>userPassword</attribute>
-    </query>
     <autocomplete>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
@@ -44,9 +32,8 @@
     <tag>template</tag>
     <label>Show templates</label>
     <query>
-      <storage>userRDN</storage>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gosaUserTemplate)(|(cn=$)(sn=$)(uid=$)))</filter>
+      <filter>(&amp;(objectClass=gosaUserTemplate)((cn=$)(sn=$)(uid=$)))</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>givenName</attribute>