nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2099 from f0o/issue-2098

Browse Source 
Fix bug involving multiple ifAlias overrides on the same device
This commit is contained in:
Neil Lathwood
2015-10-10 14:54:02 +01:00
parent 3cabd03cb5 495b4b24fa
commit ff0b6f290b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/forms/update-ifalias.inc.php
+2 -2
View File
@@ -30,10 +30,10 @@ if (!empty($ifName) && is_numeric($port_id)) {
if (dbUpdate(array('ifAlias'=>$descr), 'ports', '`port_id`=?', array($port_id)) > 0) {
$device = device_by_id_cache($device_id);
if ($descr === 'repoll') {
del_dev_attrib($device, 'ifName');
del_dev_attrib($device, 'ifName:'.$ifName);
}
else {
set_dev_attrib($device, 'ifName', $ifName);
set_dev_attrib($device, 'ifName:'.$ifName, 1);
}
$status = 'ok';
}
includes/polling/ports.inc.php
+1 -1
View File
@@ -318,7 +318,7 @@ foreach ($ports as $port) {
foreach ($data_oids as $oid) {
if ($oid == 'ifAlias') {
if (get_dev_attrib($device, 'ifName', $port['ifName'])) {
if (get_dev_attrib($device, 'ifName:'.$port['ifName'], 1)) {
$this_port['ifAlias'] = $port['ifAlias'];
}
}