diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-06-18 19:24:42 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-06-18 19:24:42 +0000 |
| commit | 72bd8df5aa002c8982c026b077bab808881ae939 (patch) | |
| tree | c9910a4830f46613dfefec1442e59b00783a9040 /etc | |
| parent | 28506915d3945681f38bc89c0832d2bb093aa47a (diff) | |
| download | pfsense-72bd8df5aa002c8982c026b077bab808881ae939.zip pfsense-72bd8df5aa002c8982c026b077bab808881ae939.tar.gz | |
Remove some unneccessary calls to filter_configure() they just give recursivity!
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/vpn.inc | 16 | ||||
| -rwxr-xr-x | etc/rc.newipsecdns | 3 |
2 files changed, 4 insertions, 15 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(); ?> |
