diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-26 15:03:35 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-26 15:03:35 -0400 |
| commit | 84296ca3f75378ae027cd2030d41cc41d68fc901 (patch) | |
| tree | abf2baed03f2058c98983da840f0e35f1a71351b /etc/inc/openvpn.inc | |
| parent | 034e4e83d787863991c230d549d63e60242c6d90 (diff) | |
| parent | 0da02ef5d99de2c04846934b0cd7504e9e880eec (diff) | |
| download | pfsense-84296ca3f75378ae027cd2030d41cc41d68fc901.zip pfsense-84296ca3f75378ae027cd2030d41cc41d68fc901.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 00f15ae..28040ee 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -161,7 +161,7 @@ function openvpn_port_next($prot) { function openvpn_get_cipherlist() { $ciphers = array(); - $cipher_out = shell_exec('openvpn --show-ciphers | grep "default key" | awk \'{print $1, "(" $2 "-" $3 ")";}\''); + $cipher_out = shell_exec('/usr/local/sbin/openvpn --show-ciphers | /usr/bin/grep "default key" | /usr/bin/awk \'{print $1, "(" $2 "-" $3 ")";}\''); $cipher_lines = explode("\n", trim($cipher_out)); sort($cipher_lines); foreach ($cipher_lines as $line) { @@ -627,7 +627,7 @@ function openvpn_restart($mode, $settings) { /* start the new process */ $fpath = $g['varetc_path']."/openvpn/{$mode_id}.conf"; - mwexec_bg("nohup openvpn --config {$fpath}"); + mwexec_bg("/usr/local/sbin/openvpn --config {$fpath}"); if (!$g['booting']) send_event("filter reload"); |
