summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-08-01 00:32:55 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-08-01 00:32:55 +0000
commit036f7009a3b19b79d68f937442f0fc199ad53cc0 (patch)
tree0a25c4fcf1d3933191f9eae3d7014ebf5d64a801 /etc
parentf666442a8f40733fe5c612c5ccc6794f2637440b (diff)
downloadpfsense-036f7009a3b19b79d68f937442f0fc199ad53cc0.zip
pfsense-036f7009a3b19b79d68f937442f0fc199ad53cc0.tar.gz
Fix a XXX
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/filter.inc10
-rw-r--r--etc/inc/pfsense-utils.inc1
-rwxr-xr-xetc/rc.newwanip2
3 files changed, 1 insertions, 12 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 77052a3..26f410d 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -38,12 +38,6 @@ require_once("functions.inc");
require_once("pkg-utils.inc");
require_once("notices.inc");
-function filter_resync() {
- global $config, $g;
-
- mwexec("/sbin/pfctl -y"); /* XXX */
-}
-
function filter_pflog_start() {
global $config, $g;
@@ -1859,9 +1853,6 @@ EOD;
# PPTPd rules
anchor "pptp"
-#pass quick proto gre from any to $pptpdtarget keep state label "allow gre pptpd"
-#pass quick proto tcp from any to $pptpdtarget port = 1723 keep state label "allow pptpd $pptpdtarget"
-# XXX: fix me!
pass quick proto gre from any to any keep state label "allow gre pptpd"
pass quick proto tcp from any to any port = 1723 keep state label "allow pptpd $pptpdtarget"
@@ -2286,7 +2277,6 @@ function return_vpn_subnet($adr) {
return $padr . "/" . $pmask;
}
- /* XXX: do not return wan, lan, etc */
if(strstr($adr['network'], "wan") or strstr($adr['network'], "lan") or strstr($adr['network'], "opt"))
return convert_ip_to_network_format($config['interfaces'][$adr['network']]['ipaddr'],
$config['interfaces'][$adr['network']]['subnet']);
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index f5ae170..d7158ce 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -430,7 +430,6 @@ function get_carp_interface_status($carpinterface) {
if(stristr($int, $carpinterface) == true)
$found_interface=1;
}
- /* XXX: Should never reach this */
return;
}
diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index 89fda6e..74ee119 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -53,7 +53,7 @@
system_start_ftp_helpers();
/* resync ipfilter */
- filter_resync();
+ filter_configure_sync();
/* reconfigure IPsec tunnels */
vpn_ipsec_configure(true);
OpenPOWER on IntegriCloud