diff options
| author | jim-p <jimp@pfsense.org> | 2011-07-07 16:03:07 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-07-07 16:03:07 -0400 |
| commit | 13b9dba9aae25edf62d6cd58c7446329b0dd913c (patch) | |
| tree | 8a1adb65afec7415b520a533fe20a33e3a1d371c /usr/local | |
| parent | 590b8a38f58838dd4c79c29a229e42cd2aed12fe (diff) | |
| parent | 10f5d53cbf453ff8440e5de5cb09cce72deb2bc3 (diff) | |
| download | pfsense-13b9dba9aae25edf62d6cd58c7446329b0dd913c.zip pfsense-13b9dba9aae25edf62d6cd58c7446329b0dd913c.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'usr/local')
| -rwxr-xr-x | usr/local/sbin/ppp-linkdown | 5 | ||||
| -rwxr-xr-x | usr/local/www/firewall_aliases_edit.php | 2 | ||||
| -rw-r--r-- | usr/local/www/wizards/setup_wizard.xml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/usr/local/sbin/ppp-linkdown b/usr/local/sbin/ppp-linkdown index 1170d2f..a20d966 100755 --- a/usr/local/sbin/ppp-linkdown +++ b/usr/local/sbin/ppp-linkdown @@ -6,7 +6,10 @@ fi if [ -f "/tmp/${interface}_defaultgw" ]; then route delete default $4 fi -# /sbin/pfctl -b $3 -b $4 +/sbin/pfctl -k 0.0.0.0/0 -k $3 +/sbin/pfctl -k $3 +pfctl -K $3 +/sbin/pfctl -b 0.0.0.0/32 -b $4 # delete the node just in case mpd cannot do that /usr/sbin/ngctl shutdown $1: if [ -f "/var/etc/nameserver_$1" ]; then diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 916e408..3d44694 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -254,7 +254,7 @@ if ($_POST) { if (!alias_same_type($_POST["address{$x}"], $_POST['type'])) // But alias type network can include alias type urltable. Feature#1603. if (!($_POST['type'] == 'network' && - get_alias_type($_POST["address{$x}"]) == 'urltable')) + alias_get_type($_POST["address{$x}"]) == 'urltable')) $wrongaliases .= " " . $_POST["address{$x}"]; } else if ($_POST['type'] == "port") { if (!is_port($_POST["address{$x}"])) diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index 401be3e..08870e1 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -590,6 +590,8 @@ } unset($config['wizardtemp']); write_config(); + interface_reconfigure("wan"); + interface_reconfigure("lan"); reload_all(); mwexec_bg("/etc/rc.update_bogons.sh now"); ]]> |
