Updated ogroup entry selection

[gosa.git] / gosa-core / plugins / admin / ogroups / objectSelect / selectObject-filter.xml

diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
index 7e5ecf9591ef4e3ee0811492520e70ed2e569875..69e2ced02d84542fab0e2e06ec38c5fb6f72eab6 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
+++ b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
@@ -10,11 +10,24 @@
   <search>
     <query>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(| $DEPARTMENT $USER $GROUP $SERVER $WORKSTATION $TERMINAL $PRINTER $PHONE ) $NAME)</filter>
+      <filter>(&amp;(| $USER $GROUP $SERVER $WORKSTATION $TERMINAL $PRINTER $PHONE) $NAME)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
       <attribute>sn</attribute>
+      <attribute>ou</attribute>
+      <attribute>uid</attribute>
+      <attribute>givenName</attribute>
+      <attribute>description</attribute>
+    </query>
+    <query>
+      <backend>LDAPDepartmentBlacklist</backend>
+      <filter>(&amp;(| $DEPARTMENT)  $NAME)</filter>
+      <attribute>dn</attribute>
+      <attribute>objectClass</attribute>
+      <attribute>cn</attribute>
+      <attribute>sn</attribute>
+      <attribute>ou</attribute>
       <attribute>uid</attribute>
       <attribute>givenName</attribute>
       <attribute>description</attribute>
@@ -29,12 +42,16 @@
     <maxlength>60</maxlength>
     <default></default>
     <unset></unset>
-    <set>(|(cn=*$*)(sn=*$*)(givenName=*$*))</set>
+    <set>(|(cn=*$*)(sn=*$*)(givenName=*$*)(ou=*$*)(dc=*$*)(c=*$*)(l=*$*))</set>
     <alphabet>true</alphabet>
     <autocomplete>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(|(objectClass=gosaDepartment)(objectClass=gosaAccount)(objectClass=posixGroup)(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal)(objectClass=gotoPrinter)(objectClass=goFonHardware))(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
+      <filter>(&amp;(|(objectClass=gosaDepartment)(objectClass=gosaAccount)(objectClass=posixGroup)(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal)(objectClass=gotoPrinter)(objectClass=goFonHardware))(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)(ou=*$NAME*)(dc=*$NAME*)(c=*$NAME*)(l=*$NAME*)))</filter>
       <attribute>cn</attribute>
+      <attribute>l</attribute>
+      <attribute>o</attribute>
+      <attribute>dc</attribute>
+      <attribute>c</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>