summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorsmos <seth.mos@dds.nl>2012-09-12 18:23:51 +0200
committersmos <seth.mos@dds.nl>2012-09-12 18:23:51 +0200
commitc832f6bf7cd9bdba9e20df52289f1b0a1173a12d (patch)
tree281241f5d930b528a3975cde70e45ecafb090f21 /etc
parented6df99ca0dfd1aeac7a41f3d3a0e3513b0aeca6 (diff)
downloadpfsense-c832f6bf7cd9bdba9e20df52289f1b0a1173a12d.zip
pfsense-c832f6bf7cd9bdba9e20df52289f1b0a1173a12d.tar.gz
Remove the filter configure call as this could otherwise lead to a recursive filter configure.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/gwlb.inc6
-rwxr-xr-xetc/rc.newipsecdns2
2 files changed, 3 insertions, 5 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc
index 9023451..db27797 100644
--- a/etc/inc/gwlb.inc
+++ b/etc/inc/gwlb.inc
@@ -91,8 +91,8 @@ rrd interval 60s;
## These parameters can be overridden in a specific alarm configuration
alarm default {
- command on "/usr/local/sbin/pfSctl -c 'service reload dyndnsall' -c 'service reload ipsecdns' -c 'filter reload' -c 'service reload openvpn'"
- command off "/usr/local/sbin/pfSctl -c 'service reload dyndnsall' -c 'service reload ipsecdns' -c 'filter reload' -c 'service reload openvpn'"
+ command on "/usr/local/sbin/pfSctl -c 'service reload dyndnsall' -c 'service reload ipsecdns' -c 'service reload openvpn' -c 'filter reload' "
+ command off "/usr/local/sbin/pfSctl -c 'service reload dyndnsall' -c 'service reload ipsecdns' -c 'service reload openvpn' -c 'filter reload' "
combine 10s
}
@@ -976,4 +976,4 @@ function validate_address_family($ipaddr, $gwname) {
}
-?> \ No newline at end of file
+?>
diff --git a/etc/rc.newipsecdns b/etc/rc.newipsecdns
index ba46568..db1d237 100755
--- a/etc/rc.newipsecdns
+++ b/etc/rc.newipsecdns
@@ -56,7 +56,5 @@
vpn_ipsec_configure();
- filter_configure();
-
unlock($ipseclck);
?>
OpenPOWER on IntegriCloud