From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 11 Oct 2007 11:46:56 +0000 (+0000)
Subject: Reverted changes
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=730b8ed01dd1dd27d7c941ce534401dc8780c36b;p=gosa.git

Reverted changes


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

diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index f770805ca..b92661132 100644
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -13,10 +13,6 @@ class termDNS extends plugin
 
   var $ipHostNumber   = "";    // IP address 
   var $macAddress     = "";    // Mac address 
-
-  var $orig_ipHostNumber   = "";    // IP address 
-  var $orig_macAddress     = "";    // Mac address 
-
   var $cn             = "";    // CN of currently edited device 
   var $OrigCn         = "";    // Initial cn
   var $IPisMust       = false;
@@ -35,7 +31,6 @@ class termDNS extends plugin
   var $initial_dhcpHostEntry    = array();
   var $initial_dhcp_is_Account  = FALSE;
 
-  var $used_ip_mac              = array();  
 
   /* DNS attributes  
    */
@@ -149,24 +144,6 @@ class termDNS extends plugin
       }
    
     }
-
-    /* Create a list of used mac and ip addresses */
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cd($this->config->current['BASE']);
-    $ldap->search("(|(macAddress=*)(ipHostNumber=*))",array("macAddress","ipHostNumber"));
-    while($attrs = $ldap->fetch()){
-      if(isset($attrs['ipHostNumber'][0])){
-        $this->used_ip_mac["ip:".$attrs['ipHostNumber'][0]] = "ip:".$attrs['ipHostNumber'][0];
-      }
-      if(isset($attrs['macAddress'][0])){
-        $this->used_ip_mac["mac:".$attrs['macAddress'][0]] = "mac:".$attrs['macAddress'][0];
-      }
-    } 
-
-    /* Save initial ip and mac values, to be able 
-        check if the used values are already in use */ 
-    $this->orig_ipHostNumber   = $this->ipHostNumber;  
-    $this->orig_macAddress     = $this->macAddress;
  
     /* Store initally account settings 
      */
@@ -442,18 +419,6 @@ class termDNS extends plugin
     if($this->dhcpEnabled && $this->dhcp_is_Account && $this->dhcpParentNode != "" && count($this->dhcpHostEntry) == 0){
       $message[] =_("You have not configured your dhcp settings yet.");
     }
-    
-    /* Check if mac and ip are already used */
-    if(!empty($this->ipHostNumber) && $this->DNS_is_account && 
-        $this->ipHostNumber != $this->orig_ipHostNumber && 
-        in_array("ip:".$this->ipHostNumber,$this->used_ip_mac)){
-      $message[] =_("The specified IP address is already in use.");
-    }
-    if(!empty($this->macAddress) && $this->dhcp_is_Account && 
-        $this->macAddress != $this->orig_macAddress && 
-        in_array("mac:".$this->macAddress,$this->used_ip_mac)){
-      $message[] =_("The specified MAC address is already in use.");
-    }
 
     /* Check if ip must be given
      */