Added devices

[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 d1e73ab147dd48cab8ed9bda2f95fed4ef117b1f..bb9f5942c48f5552b9a41ff1122fad44ea9858c2 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-filter.xml
+++ b/gosa-plugins/systems/admin/systems/system-filter.xml
@@ -9,12 +9,14 @@
 
   <search>
     <query>
-      <backend>LDAP</backend>
-      <filter>(&amp;(|$SERVER(objectClass=goServer))$NAME)</filter>
+      <backend>SYSTEMS</backend>
+      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL $PRINTER $COMPONENT $WINSTATION $INCOMING)$NAME)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
       <attribute>description</attribute>
+      <attribute>gotoMode</attribute>
+      <attribute>macAddress</attribute>
     </query>
     <scope>auto</scope>
   </search>
@@ -32,7 +34,7 @@
     <tag>WORKSTATION</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(objectClass=gotoWorkstation)</set>
   </element>
 
   <element>
@@ -40,7 +42,7 @@
     <tag>TERMINAL</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(objectClass=gotoTerminal)</set>
   </element>
 
   <element>
@@ -48,7 +50,7 @@
     <tag>PRINTER</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(objectClass=gotoPrinter)</set>
   </element>
 
   <element>
@@ -56,7 +58,7 @@
     <tag>PHONE</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(objectClass=goFonHardware)</set>
   </element>
 
   <element>
@@ -64,7 +66,7 @@
     <tag>WINSTATION</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(&amp;(objectClass=sambaSamAccount)(cn=*\$))</set>
   </element>
 
   <element>
@@ -72,7 +74,7 @@
     <tag>COMPONENT</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(objectClass=ieee802Device)</set>
   </element>
 
   <element>
@@ -80,7 +82,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>
 
 
@@ -102,7 +104,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>