From 2670f8a75b1b4867fe987971e8f5d9b7be66cd36 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 11 Jul 2008 08:51:22 +0000
Subject: [PATCH] Updated winstations. - Fixed existence check. - Fixed problem
 with rewritten uid.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11602 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../samba/admin/systems/samba/class_winGeneric.inc    | 11 ++++-------
 .../samba/admin/systems/samba/tabs_winstation.inc     |  3 ++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc
index edfbf3fc4..c210b96f6 100644
--- a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc
+++ b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc
@@ -49,6 +49,8 @@ class wingeneric extends plugin
   {
     plugin::plugin ($config, $dn, $parent);
     $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
+    $this->netConfigDNS->MACisMust = FALSE;
+
     /* Set base */
     if ($this->dn == "new"){
       $ui= get_userinfo();
@@ -199,14 +201,9 @@ class wingeneric extends plugin
     /* Call common method to give check the hook */
     $message= plugin::check();
     $message= array_merge($message, $this->netConfigDNS->check());
-    $this->dn= "cn=".$this->cn.",".get_ou('componentou').$this->base;
-    
-    /* Set new acl base */
-    if($this->dn == "new") {
-      $this->set_acl_base($this->base);
-    }
+    $this->dn= "cn=".$this->uid.",".get_ou('winstations').$this->base;
 
-    if(!$this->acl_is_createable() && $this->dn == "new"){
+    if(!$this->acl_is_createable()){
       $message[]= msgPool::permCreate();
     }
 
diff --git a/gosa-plugins/samba/admin/systems/samba/tabs_winstation.inc b/gosa-plugins/samba/admin/systems/samba/tabs_winstation.inc
index 3adcb2de6..d6089135f 100644
--- a/gosa-plugins/samba/admin/systems/samba/tabs_winstation.inc
+++ b/gosa-plugins/samba/admin/systems/samba/tabs_winstation.inc
@@ -28,7 +28,8 @@ class wintabs extends tabs
       $baseobject->cn .= "$";
     }
 
-    $this->dn= "uid=$baseobject->cn,".get_winstations_ou().$baseobject->base;
+    /* Save this system with uid and NOT cn */
+    $this->dn= "uid=$baseobject->uid,".get_winstations_ou().$baseobject->base;
     $baseobject->dn= $this->dn;
 
     foreach ($this->by_object as $key => $obj){
-- 
2.30.2