summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-04-01 14:11:33 -0400
committerjim-p <jimp@pfsense.org>2011-04-01 14:11:33 -0400
commit4936ff53df99f9c3f7de42980b581d21c1838404 (patch)
tree1aef2811d38e0ec811ccd3df401301bd801ec617 /etc
parent681b43b0790694b737dc91573a233a8aa468b681 (diff)
downloadpfsense-4936ff53df99f9c3f7de42980b581d21c1838404.zip
pfsense-4936ff53df99f9c3f7de42980b581d21c1838404.tar.gz
Switch back to dev_mode so existing configs aren't broken by the other changes.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/openvpn.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 8d71fd2..df531c7 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -295,11 +295,11 @@ function openvpn_reconfigure($mode, $settings) {
$vpnid = $settings['vpnid'];
$mode_id = $mode.$vpnid;
- if (isset($settings['device_mode']))
- $tunname = "{$settings['device_mode']}{$vpnid}";
+ if (isset($settings['dev_mode']))
+ $tunname = "{$settings['dev_mode']}{$vpnid}";
else { /* defaults to tun */
$tunname = "tun{$vpnid}";
- $settings['device_mode'] = "tun";
+ $settings['dev_mode'] = "tun";
}
if ($mode == "server")
@@ -323,7 +323,7 @@ function openvpn_reconfigure($mode, $settings) {
$pfile = $g['varrun_path'] . "/openvpn_{$mode_id}.pid";
$proto = ($settings['protocol'] == 'UDP' ? 'udp' : "tcp-{$mode}");
- $device_mode = $settings['device_mode'];
+ $dev_mode = $settings['dev_mode'];
$cipher = $settings['crypto'];
$interface = $settings['interface'];
@@ -341,7 +341,7 @@ function openvpn_reconfigure($mode, $settings) {
}
$conf = "dev {$devname}\n";
- $conf .= "dev-type {$settings['device_mode']}\n";
+ $conf .= "dev-type {$settings['dev_mode']}\n";
$conf .= "dev-node /dev/{$tunname}\n";
$conf .= "writepid {$pfile}\n";
$conf .= "#user nobody\n";
OpenPOWER on IntegriCloud