Fixed sambaAccount filter settings. #closes 920

-Winstations are visible again

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

diff --git a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
index 945e845a561181a158d2d315db660436a7ebd57d..603dd1319a4c125907dc3ada674656eb5979a999 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
+++ b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
@@ -37,7 +37,7 @@ class filterSYSTEMS {
 
         // Detect SAMBA machines
       }elseif(in_array('sambaSamAccount', $entry['objectClass']) && preg_match("/\$$/", $entry['cn'][0])){
-        $entries[$key]['objectClass'][] = 'FAKE_OC_winstation';
+        $entries[$key]['objectClass'][] = 'sambaSamAccount';
 
         // Detect Workstation & templates
       }elseif(in_array('gotoWorkstation', $entry['objectClass'])){

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index 0238d71f77405139f3f51643ef2ba2f03469e89c..e0fe964cac8b9159ec8ce2b33ae78c133c9e8df3 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -1304,7 +1304,7 @@ class systemManagement extends management
             "aclClass"    => "phoneGeneric",
             "aclCategory" => "phone"),
 
-        "FAKE_OC_winstation" => array(
+        "sambaSamAccount" => array(
             "ou"          => get_winstations_ou(),
             "plugClass"   => "wingeneric",
             "sendEvents"  => TRUE,

diff --git a/gosa-plugins/systems/admin/systems/system-filter.tpl b/gosa-plugins/systems/admin/systems/system-filter.tpl
index 32ada150056e62939179bda3622a950c60e1da28..c6d80b9d5ea35bade32eee1c8509c0b02319a482 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-filter.tpl
+++ b/gosa-plugins/systems/admin/systems/system-filter.tpl
@@ -22,7 +22,7 @@
   {if $USE_goFonHardware}
   {$PHONE}&nbsp;{t}Show phones{/t}<br>
   {/if}
-  {if $USE_FAKE_OC_winstation}
+  {if $USE_sambaSamAccount}
   {$WINSTATION}&nbsp;{t}Show windows based workstations{/t}<br>
   {/if}
   {if $USE_ieee802Device}

diff --git a/gosa-plugins/systems/admin/systems/system-filter.xml b/gosa-plugins/systems/admin/systems/system-filter.xml
index 4a452ccef7b10c859da0c69e0fac338095a3edc2..8b8bb099b5c6d7301ab40e4251cf1c371bb8da78 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-filter.xml
+++ b/gosa-plugins/systems/admin/systems/system-filter.xml
@@ -14,6 +14,7 @@
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
+      <attribute>uid</attribute>
       <attribute>description</attribute>
       <attribute>gotoMode</attribute>
       <attribute>FAIstate</attribute>
@@ -31,12 +32,13 @@
     <maxlength>60</maxlength>
     <default></default>
     <unset></unset>
-    <set>(cn=*$*)</set>
+    <set>(|(cn=*$*)(uid=*$*))</set>
     <alphabet>false</alphabet>
     <autocomplete>
       <backend>SYSTEMS</backend>
-      <filter>(cn=*$NAME*)</filter>
+      <filter>(|(cn=*$NAME*)(uid=*$NAME*))</filter>
       <attribute>cn</attribute>
+      <attribute>uid</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
@@ -55,6 +57,7 @@
       <backend>SYSTEMS</backend>
       <filter>(gotoLastUser=*USER*)</filter>
       <attribute>cn</attribute>
+      <attribute>uid</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
@@ -105,7 +108,7 @@
     <tag>WINSTATION</tag>
     <default>true</default>
     <unset></unset>
-    <set>(&amp;(objectClass=sambaSamAccount)(cn=*\$))</set>
+    <set>(&amp;(objectClass=sambaSamAccount)(uid=*\$))</set>
   </element>
 
   <element>

diff --git a/gosa-plugins/systems/admin/systems/system-list.xml b/gosa-plugins/systems/admin/systems/system-list.xml
index ae16c7a2b5c6a70f150167b138749a509a43053e..a65df630bb1a443d5bd052e8fe598a3c2508a126 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-list.xml
+++ b/gosa-plugins/systems/admin/systems/system-list.xml
@@ -93,7 +93,7 @@
 
     <objectType>
       <label>Winstation</label>
-      <objectClass>FAKE_OC_winstation</objectClass>
+      <objectClass>sambaSamAccount</objectClass>
       <category>winworkstation</category>
       <class>wingeneric</class>
       <image>plugins/systems/images/select_winstation.png</image>