summaryrefslogtreecommitdiffstats
path: root/etc/inc/system.inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-11-10 20:32:05 +0100
committerErmal <eri@pfsense.org>2014-11-10 20:32:05 +0100
commitc46f9695ec7baf6dcfcc5a488fe0dd5dd6f4a00f (patch)
tree0e97934121c0822cc108d4b2defd1cdcb0c0ebc2 /etc/inc/system.inc
parentd3c36b1d8dfce0461bb00177b0db6eae3ff5c2b1 (diff)
downloadpfsense-c46f9695ec7baf6dcfcc5a488fe0dd5dd6f4a00f.zip
pfsense-c46f9695ec7baf6dcfcc5a488fe0dd5dd6f4a00f.tar.gz
Actually make default sysctls reside on globals.inc and use those by default this allows to trim down the config.xml sysctl and also fixes #3666 by setting set source interface on reply of icmp
Diffstat (limited to 'etc/inc/system.inc')
-rw-r--r--etc/inc/system.inc11
1 files changed, 2 insertions, 9 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index ee3e6e3..273b5a2 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -73,19 +73,12 @@ function get_default_sysctl_value($id) {
}
function activate_sysctls() {
- global $config, $g;
+ global $config, $g, $sysctls;
if ($g['platform'] == 'jail')
return;
- $sysctls = array(
- "net.enc.out.ipsec_bpf_mask" => "0x0001",
- "net.enc.out.ipsec_filter_mask" => "0x0001",
- "net.enc.in.ipsec_bpf_mask" => "0x0002",
- "net.enc.in.ipsec_filter_mask" => "0x0002"
- );
-
- if(is_array($config['sysctl'])) {
+ if (is_array($config['sysctl'])) {
foreach($config['sysctl']['item'] as $tunable) {
if($tunable['value'] == "default")
$value = get_default_sysctl_value($tunable['tunable']);
OpenPOWER on IntegriCloud