Only check for duplicated ip & mac if dns or dhcp is activated

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

diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index f6d8b1d556d69c1ff5979b43bd2ea7b5e095087f..f770805caf331b7442ca609f576200f84cfb9a21 100644 (file)
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -444,12 +444,12 @@ class termDNS extends plugin
     }
     
     /* Check if mac and ip are already used */
-    if(!empty($this->ipHostNumber) && 
+    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) && 
+    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.");