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, 0 insertions, 6 deletions

diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php
index 3e92bad..4508a02 100755
--- a/usr/local/www/services_captiveportal_mac_edit.php
+++ b/usr/local/www/services_captiveportal_mac_edit.php
@@ -130,12 +130,6 @@ if ($_POST) {
 		$ruleno = captiveportal_get_ipfw_passthru_ruleno($oldmac);
 		if ($ruleno) {
 			captiveportal_free_ipfw_ruleno($ruleno);
-			$rules = sprintf("%s %s\n", gettext("delete"), $ruleno);
-			$rules .= gettext("delete") . " " . ++$ruleno . "\n";
-			$rules .= captiveportal_passthrumac_configure_entry($mac);
-			file_put_contents("{$g['tmp_path']}/tmpmacedit{$id}", $rules);
-			mwexec("/sbin/ipfw -q {$g['tmp_path']}/tmpmacedit{$id}");
-			@unlink("{$g['tmp_path']}/tmpmacedit{$id}");
 			$rules = "delete {$ruleno}\n";
 			$rules .= "delete " . ++$ruleno . "\n";
 		}