diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-11-09 09:58:01 -0200 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-11-09 09:58:01 -0200 |
| commit | 129841508a5659a2c428213e0b231f9132fbfc4a (patch) | |
| tree | 46df5e97d21156240be09ae6a5727e3fbcece9de /etc/inc/vpn.inc | |
| parent | 4816e5caa29b542c57659de8eff53ba51e355b24 (diff) | |
| parent | 5d27a3dc148ed4ad8228605b2547e1115d66f86b (diff) | |
| download | pfsense-129841508a5659a2c428213e0b231f9132fbfc4a.zip pfsense-129841508a5659a2c428213e0b231f9132fbfc4a.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/pkg-utils.inc
etc/inc/system.inc
Diffstat (limited to 'etc/inc/vpn.inc')
| -rw-r--r-- | etc/inc/vpn.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 4bc4003..031c723 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -113,7 +113,7 @@ function vpn_ipsec_configure($ipchg = false) mwexec("/usr/local/sbin/setkey -FP"); /* disallow IPSEC, it is off */ -// exec("/sbin/sysctl net.inet.ip.ipsec_in_use=0"); + exec("/sbin/sysctl net.inet.ip.ipsec_in_use=0"); return true; } else { @@ -877,7 +877,7 @@ EOD; sleep("0.1"); mwexec("/usr/local/sbin/setkey -F", false); sleep("0.1"); -// exec("/sbin/sysctl net.inet.ip.ipsec_in_use=1"); + exec("/sbin/sysctl net.inet.ip.ipsec_in_use=1"); /* start racoon */ mwexec("/usr/local/sbin/racoon -f {$g['varetc_path']}/racoon.conf", false); sleep("0.1"); |
