mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'issue-386-v3' of git://github.com/BarbarossaTM/librenms

Browse Source 
Conflicts:
	sql-schema/099.sql
This commit is contained in:
f0o
2016-02-07 15:23:52 +00:00
parent 0dc9219e56 6ef1cf9e43
commit 4d0d78c48c
7 changed files with 70 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/common.php
View File

@@ -1249,7 +1249,7 @@ function get_port_id ($ports_mapped, $port, $port_association_mode) {
*/
$maps = $ports_mapped['maps'];
if (in_array ($port_association_mode, array ('ifIndex', 'ifName', 'ifDescr'))) {
if (in_array ($port_association_mode, array ('ifIndex', 'ifName', 'ifDescr', 'ifAlias'))) {
$port_id = $maps[$port_association_mode][$port[$port_association_mode]];
}