Merge pull request #1632 from infernix/ifalias-null

Properly reference ifalias_null config flag
This commit is contained in:
Daniel Preussker
2015-08-07 09:27:31 +00:00
2 changed files with 3 additions and 1 deletions
+1
View File
@@ -44,6 +44,7 @@ Contributors to LibreNMS:
- Mikhail Bratchikov <mbratchikov@odin.com> (pepyaka)
- Aaron Daniels <aaron@daniels.id.au> (adaniels21487)
- David M. Syzdek <david@syzdek.net> (syzdek)
- Gerben Meijer <gerben@daybyday.nl> (infernix)
[1]: http://observium.org/ "Observium web site"
+2 -1
View File
@@ -352,8 +352,9 @@ foreach ($ports as $port) {
}
}//end foreach
if (($port['update']['ifAlias'] == '' || $port['update']['ifAlias'] == NULL) && $config['os'][$os]['ifalias_null'] == 1) {
if (($port['update']['ifAlias'] == '' || $port['update']['ifAlias'] == NULL) && $config['os'][$device['os']]['ifalias_null'] == 1) {
$port['update']['ifAlias'] = $port['ifDescr'];
$this_port['ifAlias'] = $port['ifDescr'];
d_echo('Using ifDescr due to ifAlias being NULL');
}