clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 10:58:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Re-order snmp mib dirs to load mibs correctly #5405 (#5415)

Browse Source 
* fix: Re-order snmp mib dirs to load mibs correctly #5405

* Remove unneeded code
This commit is contained in:
Neil Lathwood 2017-01-13 05:46:09 +00:00 committed by Tony Murray
parent 78cdca0222
commit 7215059fd0
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
includes/snmp.inc.php
View File

@ -85,28 +85,22 @@ function get_mib_dir($device)
function mibdir($mibdir = null, $device = array())
{
global $config;
// FIXME: prepend + to allow system mibs?
$extra_dir = implode(':', get_mib_dir($device));
if (!empty($extra_dir)) {
$extra_dir .= ':';
$extra_dir = ":".$extra_dir;
}
if (is_null($mibdir)) {
return " -M $extra_dir${config['mib_dir']}";
return " -M ${config['mib_dir']}$extra_dir";
}
if (empty($mibdir)) {
// use system mibs
return '';
}
if (str_contains($mibdir, '/')) {
// pass through mib dir (for legace compatability
return " -M $extra_dir$mibdir";
} else {
// automatically set up includes
return " -M $extra_dir${config['mib_dir']}/$mibdir:${config['mib_dir']}";
}
return " -M ${config['mib_dir']}$extra_dir:${config['mib_dir']}/$mibdir";
}//end mibdir()
/**