Simplify logic using a proper function as spotted by Ermal

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";