Updated systemManagement

[gosa.git] / gosa-plugins / systems / admin / systems / system-filter.xml

diff --git a/gosa-plugins/systems/admin/systems/system-filter.xml b/gosa-plugins/systems/admin/systems/system-filter.xml
index ce97b913803e558a696af0337b9f0bce932f0591..cb511afdbd0f1a47a6b91924323299a050586517 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-filter.xml
+++ b/gosa-plugins/systems/admin/systems/system-filter.xml
@@ -9,12 +9,15 @@
 
   <search>
     <query>
-      <backend>LDAP</backend>
-      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL $PRINTER $COMPONENT )$NAME)</filter>
+      <backend>SYSTEMS</backend>
+      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL $PRINTER $COMPONENT $WINSTATION $INCOMING $OPSI)$NAME)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
       <attribute>description</attribute>
+      <attribute>gotoMode</attribute>
+      <attribute>FAIstate</attribute>
+      <attribute>macAddress</attribute>
     </query>
     <scope>auto</scope>
   </search>
@@ -64,7 +67,7 @@
     <tag>WINSTATION</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(&amp;(objectClass=sambaSamAccount)(cn=*\$))</set>
   </element>
 
   <element>
@@ -80,7 +83,7 @@
     <tag>INCOMING</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(&amp;(|(objectClass=goWorkstation)(objectClass=gotoTerminal)(objectClass=goHard))(ou:dn:=%systemIncomingRDN))</set>
   </element>
 
 
@@ -89,7 +92,7 @@
     <tag>OPSI</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(&amp;(objectClass=FAIclass)(FAIstate=__NETBOOT__))</set>
   </element>
 
   <element>
@@ -102,7 +105,7 @@
     <set>(cn=*$*)</set>
     <alphabet>false</alphabet>
     <autocomplete>
-      <backend>LDAP</backend>
+      <backend>SYSTEMS</backend>
       <filter>(&amp;(objectClass=organizationalRole)(cn=*$NAME*))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>