Backports from trunk

[gosa.git] / gosa-plugins / samba / admin / systems / samba / class_winGeneric.inc

diff --git a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc
index e53f284bc70d4424c535dc7bcf6fe8d5e9857455..56943662cd4b9cdf341355be1f571b2c4280b606 100644 (file)
--- a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc
+++ b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc
@@ -42,7 +42,7 @@ class wingeneric extends plugin
                             "shadowInactive","uid","cn","sn","givenName","homeDirectory","sambaSID",
                             "sambaPrimaryGroupSID","displayName", "sambaPwdMustChange",
                             "sambaNTPassword","sambaPwdLastSet","sambaAcctFlags");
-  var $objectclasses= array("posixAccount","person","organizationalPerson","inetOrgPerson","gosaAccount","shadowAccount","sambaSamAccount","top");
+  var $objectclasses= array("posixAccount","person","organizationalPerson","inetOrgPerson","shadowAccount","sambaSamAccount","top");
 
   var $view_logged = FALSE;
 
@@ -54,6 +54,14 @@ class wingeneric extends plugin
     $this->netConfigDNS->MACisMust = FALSE;
     $this->netConfigDNS->IPisMust = FALSE;
 
+    // The combination of the used objectClasses may differ, remember the initial ones.
+    if(isset($this->attrs['objectClass'])){
+        $this->objectclasses = array();
+        for($i=0; $i < $this->attrs['objectClass']['count'] ;  $i++ ){
+            $this->objectclasses[] = $this->attrs['objectClass'][$i];
+        }
+    }
+
     /* Set base */
     if ($this->dn == "new"){
       $ui = get_userinfo();