From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 11 Oct 2007 11:17:50 +0000 (+0000)
Subject: Only check for duplicated ip & mac if dns or dhcp is activated
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=52b8268a57e68d78c3e2f46230e8f263c7dc445d;p=gosa.git

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 f6d8b1d55..f770805ca 100644
--- 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.");