diff options
author | Renato Botelho <renato@netgate.com> | 2015-11-10 14:42:33 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-11-10 14:42:33 -0200 |
commit | 1d85e9635fd9d1bd1cd8dd84ffb722677732567e (patch) | |
tree | 0a3e585a5a41d0a14a80144f725b57859f781245 /src | |
parent | f34b7665264fd4e3e05c11fe87fbd68174030624 (diff) | |
download | pfsense-1d85e9635fd9d1bd1cd8dd84ffb722677732567e.zip pfsense-1d85e9635fd9d1bd1cd8dd84ffb722677732567e.tar.gz |
Fix calls to ipsec_enabled() added in 179ab6b364
Diffstat (limited to 'src')
-rw-r--r-- | src/etc/inc/easyrule.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/filter.inc | 3 | ||||
-rw-r--r-- | src/usr/local/www/diag_logs_filter.php | 1 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_1to1_edit.php | 1 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_edit.php | 1 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_npt_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_out_edit.php | 1 | ||||
-rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 1 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/traffic_graphs.widget.php | 1 |
9 files changed, 12 insertions, 0 deletions
diff --git a/src/etc/inc/easyrule.inc b/src/etc/inc/easyrule.inc index 3c53e92..199e7d0 100644 --- a/src/etc/inc/easyrule.inc +++ b/src/etc/inc/easyrule.inc @@ -36,6 +36,7 @@ $blockaliasname = 'EasyRuleBlockHosts'; $protocols_with_ports = array('tcp', 'udp'); require_once("functions.inc"); require_once("util.inc"); +require_once("ipsec.inc"); require_once("config.inc"); function easyrule_find_rule_interface($int) { diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index 36ab337..e33c08f 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -1171,6 +1171,9 @@ function filter_generate_optcfg_array() { } } /* add ipsec interfaces */ + if (!function_exists('ipsec_enabled')) { + require_once("ipsec.inc"); + } if (ipsec_enabled()) { $oic = array(); $oic['if'] = 'enc0'; diff --git a/src/usr/local/www/diag_logs_filter.php b/src/usr/local/www/diag_logs_filter.php index bd8d876..3d27226 100644 --- a/src/usr/local/www/diag_logs_filter.php +++ b/src/usr/local/www/diag_logs_filter.php @@ -69,6 +69,7 @@ ##|-PRIV require("guiconfig.inc"); +require_once("ipsec.inc"); require_once("filter_log.inc"); # --- AJAX RESOLVE --- diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index d1e2cb3..87bf7b6 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -69,6 +69,7 @@ require("guiconfig.inc"); require_once("interfaces.inc"); require_once("filter.inc"); +require_once("ipsec.inc"); require("shaper.inc"); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_1to1.php'); diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index bda89d6..d693086 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -68,6 +68,7 @@ require("guiconfig.inc"); require_once("itemid.inc"); +require_once("ipsec.inc"); require_once("filter.inc"); require("shaper.inc"); diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php index f29806d..7fca814 100644 --- a/src/usr/local/www/firewall_nat_npt_edit.php +++ b/src/usr/local/www/firewall_nat_npt_edit.php @@ -64,6 +64,8 @@ ##|*MATCH=firewall_nat_npt_edit.php* ##|-PRIV +require_once("ipsec.inc"); + function natnptcmp($a, $b) { return ipcmp($a['external'], $b['external']); } diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index 7f3ee12..a91fddd 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -67,6 +67,7 @@ ##|-PRIV require("guiconfig.inc"); +require_once("ipsec.inc"); require_once("filter.inc"); require("shaper.inc"); diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 2cb3271..431a3fe 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -67,6 +67,7 @@ ##|-PRIV require("guiconfig.inc"); +require_once("ipsec.inc"); require_once("filter.inc"); require("shaper.inc"); diff --git a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php index d9997be..1976800 100644 --- a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php +++ b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php @@ -63,6 +63,7 @@ $nocsrf = true; require_once("guiconfig.inc"); require_once("pfsense-utils.inc"); +require_once("ipsec.inc"); require_once("functions.inc"); $first_time = false; |