X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fusers%2Fuser-filter.xml;h=546d47652c4d04a8753bcc2495766e3ca0add99c;hb=22309e0d434aaa14851dbb616938d5f68635bbc0;hp=5d090417d0362e7e92af6d5c632bd086ccb13bfa;hpb=7e7abc90f7f4bf14c3553da9d854aa055bcaae5e;p=gosa.git

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index 5d090417d..546d47652 100644
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -2,36 +2,24 @@
 
 <filterdef>
   <definition>
+    <category>users</category>
     <initial>true</initial>
     <default>default</default>
     <scope>auto</scope>
-    <category>users</category>
+    <attribute>dn</attribute>
+    <attribute>objectClass</attribute>
+    <attribute>givenName</attribute>
+    <attribute>sn</attribute>
+    <attribute>uid</attribute>
+    <attribute>userPassword</attribute>
   </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>
-      <attribute>objectClass</attribute>
-      <attribute>givenName</attribute>
-      <attribute>sn</attribute>
-      <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>
@@ -44,15 +32,8 @@
     <tag>template</tag>
     <label>Show templates</label>
     <query>
-      <storage>userRDN</storage>
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=gosaUserTemplate)(|(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>mail</attribute>
@@ -67,12 +48,6 @@
     <query>
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=gosaAccount)(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>
@@ -87,12 +62,6 @@
     <query>
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=gosaAccount)(objectClass=sambaSamAccount)(|(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>
@@ -107,12 +76,6 @@
     <query>
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=gosaAccount)(objectClass=gosaMailAccount)(|(cn=$)(sn=$)(uid=$)(mail=$)))</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>givenName</attribute>
-      <attribute>sn</attribute>
-      <attribute>uid</attribute>
-      <attribute>userPassword</attribute>
     </query>
     <autocomplete>
       <attribute>mail</attribute>