diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-12-18 16:13:00 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-12-18 16:13:16 -0200 |
| commit | bd1a6267712ff791f39edd0d70ec2a3528cd813d (patch) | |
| tree | 5b41be99ea392ae3f6844c61a5c226f7f1b69473 /etc/inc/openvpn.inc | |
| parent | c23f4d8f9341b661baf3f0000f8af0d7741a7476 (diff) | |
| download | pfsense-bd1a6267712ff791f39edd0d70ec2a3528cd813d.zip pfsense-bd1a6267712ff791f39edd0d70ec2a3528cd813d.tar.gz | |
Simplify logic using a proper function as spotted by Ermal
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index f400e2b..c45256a 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -446,14 +446,11 @@ function openvpn_reconfigure($mode, $settings) { /* add the device to the openvpn group */ mwexec("/sbin/ifconfig " . escapeshellarg($devname) . " group openvpn"); - foreach ($config['interfaces'] as $ifname => $ifdata) { - if ($ifdata['if'] == $devname) { - $grouptmp = link_interface_to_group($ifname); - if (!empty($grouptmp)) - array_walk($grouptmp, 'interface_group_add_member'); - break; - } - } + $ifname = convert_real_interface_to_friendly_interface_name($devname); + $grouptmp = link_interface_to_group($ifname); + if (!empty($grouptmp)) + array_walk($grouptmp, 'interface_group_add_member'); + unset($grouptmp, $ifname); } $pfile = $g['varrun_path'] . "/openvpn_{$mode_id}.pid"; |
