summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2008-02-09 04:21:12 +0000
committerScott Ullrich <sullrich@pfsense.org>2008-02-09 04:21:12 +0000
commit5bf11e3605670af5400c697d7de46b6045de22f1 (patch)
tree8cc4427e7e90a40ed3f8292ce15d394b404c940d
parent79f376201b12e566a2b9004d794a886726878868 (diff)
downloadpfsense-5bf11e3605670af5400c697d7de46b6045de22f1.zip
pfsense-5bf11e3605670af5400c697d7de46b6045de22f1.tar.gz
When deleting the LAN interface, automatically unset the following
configuration areas: * Interfaces -> LAN * DHCPD -> LAN * Traffic Shaper * EZ Shaper settings * Firewall -> NAT NOTE: when adding back an interface if LAN does not exist, it is added back before OPTX so that these constaints can be upheld.
-rwxr-xr-xetc/rc.initial.setlanip4
-rwxr-xr-xusr/local/www/interfaces_assign.php2
2 files changed, 5 insertions, 1 deletions
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index 04f823c..88e56b6 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -168,7 +168,11 @@
}
if(!$config['interfaces']['lan'])
+ unset($config['interfaces']['lan']);
unset($config['dhcpd']['lan']);
+ unset($config['shaper']);
+ unset($config['ezshaper']);
+ unset($config['nat']);
}
write_config(gettext("{$interface} IP configuration from console menu"));
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 7f988d5..678248c 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -146,7 +146,7 @@ if ($_GET['act'] == "del") {
unset($config['dhcpd']['lan']);
unset($config['shaper']);
unset($config['ezshaper']);
- unset($config['filter']['nat']);
+ unset($config['nat']);
}
write_config();
OpenPOWER on IntegriCloud