diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 621994aa79..b0314fe518 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -111,8 +111,8 @@ function vpn_ipsec_configure($ipchg = false) { //echo "Enabling [VIA Padlock] ..."; //mwexec("/sbin/kldload padlock"); //mwexec("/sbin/sysctl net.inet.ipsec.crypto_support=1"); - //mwexec("/sbin/setkey -F"); - //mwexec("/sbin/setkey -FP"); + //mwexec("/usr/local/sbin/setkey -F"); + //mwexec("/usr/local/sbin/setkey -FP"); //echo " done.\n"; } } @@ -151,8 +151,8 @@ function vpn_ipsec_configure($ipchg = false) { sigkillbypid("{$g['varrun_path']}/racoon.pid", "KILL"); /* flush SPD and SAD */ - mwexec("/sbin/setkey -FP"); - mwexec("/sbin/setkey -F"); + mwexec("/usr/local/sbin/setkey -FP"); + mwexec("/usr/local/sbin/setkey -F"); return true; } @@ -597,10 +597,10 @@ EOD; /* We are already online, reload */ mwexec("/usr/bin/killall -HUP racoon"); /* flush SPD entries */ - mwexec("/sbin/setkey -FP"); - mwexec("/sbin/setkey -F"); + mwexec("/usr/local/sbin/setkey -FP"); + mwexec("/usr/local/sbin/setkey -F"); /* load SPD */ - mwexec("/sbin/setkey -f {$g['varetc_path']}/spd.conf"); + mwexec("/usr/local/sbin/setkey -f {$g['varetc_path']}/spd.conf"); sleep(1); /* We are already online, reload */ mwexec("/usr/bin/killall -HUP racoon"); @@ -610,10 +610,10 @@ EOD; /* start racoon */ mwexec("/usr/local/sbin/racoon -f {$g['varetc_path']}/racoon.conf"); /* flush SA + SPD entries */ - mwexec("/sbin/setkey -FP"); - mwexec("/sbin/setkey -F"); + mwexec("/usr/local/sbin/setkey -FP"); + mwexec("/usr/local/sbin/setkey -F"); /* load SPD */ - mwexec("/sbin/setkey -f {$g['varetc_path']}/spd.conf"); + mwexec("/usr/local/sbin/setkey -f {$g['varetc_path']}/spd.conf"); sleep(1); /* We are already online, reload */ mwexec("/usr/bin/killall -HUP racoon"); diff --git a/usr/local/www/status.php b/usr/local/www/status.php index fb11279b24..015440bf70 100755 --- a/usr/local/www/status.php +++ b/usr/local/www/status.php @@ -135,8 +135,8 @@ defCmdT("ez-ipupdate.cache","cat /conf/ez-ipupdate.cache"); defCmdT("df","/bin/df"); defCmdT("racoon.conf","cat /var/etc/racoon.conf"); -defCmdT("SPD","/sbin/setkey -DP"); -defCmdT("SAD","/sbin/setkey -D"); +defCmdT("SPD","/usr/local/sbin/setkey -DP"); +defCmdT("SAD","/usr/local/sbin/setkey -D"); defCmdT("last 200 system log entries","/usr/sbin/clog /var/log/system.log 2>&1 | tail -n 200"); defCmdT("last 50 filter log entries","/usr/sbin/clog /var/log/filter.log 2>&1 | tail -n 50");