Merge remote branch 'mainline/master' into 4_load_balancer_and_services

Conflicts:
	usr/local/www/services_captiveportal_ip_edit.php
	usr/local/www/services_captiveportal_mac_edit.php
	usr/local/www/services_dhcp_edit.php
	usr/local/www/services_rfc2136.php
	usr/local/www/services_snmp.php

1 files changed, 7 insertions, 3 deletions

diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index f3685b2..c3889c0 100755
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -252,6 +252,13 @@ if ($_POST) {
 			}
 		}
 
+		$noip = false;
+		foreach ($a_maps as $map)
+			if (empty($map['ipaddr']))
+				$noip = true;
+		if ($_POST['staticarp'] && $noip)
+			$input_errors[] = "Cannot enable static ARP when you have static map entries without IP addresses. Ensure all static maps have IP addresses and try again.";
+
 		if (!$input_errors) {
 			/* make sure the range lies within the current subnet */
 			$subnet_start = ip2ulong(long2ip32(ip2long($ifcfgip) & gen_subnet_mask_long($ifcfgsn)));
@@ -330,9 +337,6 @@ if ($_POST) {
 
 		write_config();
 
-		/* static arp configuration */
-		interfaces_staticarp_configure($if);
-
 		$retval = 0;
 		$retvaldhcp = 0;
 		$retvaldns = 0;