diff options
| author | Jim P <jim@pingle.org> | 2012-09-22 18:46:43 -0700 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2012-09-22 18:46:43 -0700 |
| commit | 5dc66dffab931aaa9303ad76ec245cd7e9dd6c17 (patch) | |
| tree | 81fcf03ebeec9420dc15915ba402081c3486d62a /etc | |
| parent | ea68f6cc92fb6167c084d6786984bdf35caef132 (diff) | |
| parent | d41bb44745966a668f55d14e9bb53ebd22c4d91e (diff) | |
| download | pfsense-5dc66dffab931aaa9303ad76ec245cd7e9dd6c17.zip pfsense-5dc66dffab931aaa9303ad76ec245cd7e9dd6c17.tar.gz | |
Merge pull request #225 from PiBa-NL/master
Virtual IP Edit consistent options, "Sockets listening" page, openVPN allow change mode
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/openvpn.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index bddb5c8..8416264 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -710,7 +710,12 @@ function openvpn_delete($mode, & $settings) { $vpnid = $settings['vpnid']; $mode_id = $mode.$vpnid; - $tunname = "tun{$vpnid}"; + if (isset($settings['dev_mode'])) + $tunname = "{$settings['dev_mode']}{$vpnid}"; + else { /* defaults to tun */ + $tunname = "tun{$vpnid}"; + } + if ($mode == "server") $devname = "ovpns{$vpnid}"; else |
