diff options
-rw-r--r-- | etc/inc/vpn.inc | 16 | ||||
-rwxr-xr-x | etc/rc.newipsecdns | 3 | ||||
-rwxr-xr-x | usr/local/www/vpn_ipsec.php | 2 | ||||
-rwxr-xr-x | usr/local/www/vpn_pppoe.php | 3 | ||||
-rwxr-xr-x | usr/local/www/vpn_pptp.php | 4 |
5 files changed, 7 insertions, 21 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 612d454..a2dbe42 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -860,10 +860,7 @@ EOD; vpn_ipsec_failover_configure(); - if (!$g['booting']) { - /* reload the filter */ - filter_configure(); - } else + if ($g['booting']) echo "done\n"; } @@ -1114,11 +1111,6 @@ EOD; break; } - if (!$g['booting']) { - /* reload the filter */ - filter_configure(); - } - if ($g['booting']) echo "done\n"; @@ -1312,8 +1304,6 @@ EOD; break; } - filter_configure(); - if ($g['booting']) echo "done\n"; @@ -1494,8 +1484,6 @@ EOD; break; } - filter_configure(); - if ($g['booting']) echo "done\n"; @@ -1673,4 +1661,4 @@ function reload_tunnel_spd_policy($phase1, $phase2, $old_phase1, $old_phase2) { return true; } -?>
\ No newline at end of file +?> diff --git a/etc/rc.newipsecdns b/etc/rc.newipsecdns index 4979505..42675e3 100755 --- a/etc/rc.newipsecdns +++ b/etc/rc.newipsecdns @@ -31,7 +31,6 @@ */ /* parse the configuration and include all functions used below */ - require_once("config.inc"); require_once("functions.inc"); /* make sure to wait until the boot scripts have finished */ @@ -48,4 +47,6 @@ vpn_ipsec_refresh_policies(); vpn_ipsec_configure(); + + filter_configure(); ?> diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index 8eb81ce..870f048 100755 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -91,8 +91,8 @@ if ($_GET['act'] == "delph1") unset($a_phase1[$_GET['p1index']]); vpn_ipsec_refresh_policies(); vpn_ipsec_configure(); - filter_configure(); write_config(); + filter_configure(); header("Location: vpn_ipsec.php"); exit; } diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php index 592ba07..62037e2 100755 --- a/usr/local/www/vpn_pppoe.php +++ b/usr/local/www/vpn_pppoe.php @@ -118,7 +118,6 @@ if ($_POST) { } } unset($config['pppoe']); - write_config(); } if (!$input_errors) { @@ -172,7 +171,7 @@ if ($_POST) { write_config(); $retval = 0; - $retval = vpn_setup(); + $retval = vpn_pppoe_configure(); $savemsg = get_std_save_message($retval); } } diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php index 7f9f80a..b2f7e59 100755 --- a/usr/local/www/vpn_pptp.php +++ b/usr/local/www/vpn_pptp.php @@ -127,8 +127,6 @@ if ($_POST) { } } unset($config['pptpd']['mode']); - - write_config(); } if (!$input_errors) { @@ -188,7 +186,7 @@ if ($_POST) { write_config(); $retval = 0; - $retval = vpn_setup(); + $retval = vpn_pptpd_configure(); $savemsg = get_std_save_message($retval); filter_configure(); |