diff --git a/includes/polling/os/nrg.inc.php b/includes/polling/os/nrg.inc.php index fdb861830c..2c2f07181d 100644 --- a/includes/polling/os/nrg.inc.php +++ b/includes/polling/os/nrg.inc.php @@ -3,7 +3,7 @@ // SNMPv2-MIB::sysDescr.0 = STRING: NRG MP C4500 1.60 / NRG Network Printer C model / NRG Network Scanner C model / NRG Network Facsimile C model // SNMPv2-MIB::sysDescr.0 = STRING: NRG SP C410DN 1.01 / NRG Network Printer C model // SNMPv2-MIB::sysDescr.0 = STRING: NRG MP 171 1.01 / NRG Network Printer C model / NRG Network Scanner C model / NRG Network Facsimile C model -$descr = trim(snmp_get($device, '.1.3.6.1.2.1.1.1.0', '-OQv', '', ''), '" '); +$descr = trim($poll_device['sysDescr'], '" '); $ninfo = trim(substr($descr, 0, strpos($descr, '/'))); diff --git a/includes/polling/os/ruckuswireless.inc.php b/includes/polling/os/ruckuswireless.inc.php index 013fe2aa1f..2e42788826 100644 --- a/includes/polling/os/ruckuswireless.inc.php +++ b/includes/polling/os/ruckuswireless.inc.php @@ -15,7 +15,7 @@ * the source code distribution for details. */ -$productmib = trim(snmp_get($device, '.1.3.6.1.2.1.1.2.0', '-Oqv'), '" '); +$productmib = trim($poll_device['sysObjectId'], '" '); $ruckusmodels = array( "$productmib.5.0", diff --git a/includes/polling/os/samsungprinter.inc.php b/includes/polling/os/samsungprinter.inc.php index c844953ed9..9faa5a4d26 100644 --- a/includes/polling/os/samsungprinter.inc.php +++ b/includes/polling/os/samsungprinter.inc.php @@ -4,7 +4,7 @@ $hardware = trim(snmp_get($device, '1.3.6.1.4.1.236.11.5.11.53.31.1.4.0', '-OQv' // mgnt::mib-2.43.5.1.1.17.1 = STRING: "QUV960066FJ124" $serial = trim(snmp_get($device, '1.3.6.1.2.1.43.5.1.1.17.1', '-OQv', '', ''), '" '); // mgnt::mib-2.1.1 = STRING: "Samsung CLX-3170 Series;V1.00.01.64 Sep-27-2010;Engine 1.77.81;NIC V4.01.20(CLX-3170) 02-05-2010;S/N JFJIUTM748HJGK983" -$osin = trim(snmp_get($device, '1.3.6.1.2.1.1.1', '-OQv', '', ''), '" '); +$osin = trim($poll_device['sysDescr'], '" '); //$osin = "Samsung CLX-3170 Series;V1.00.01.64 Sep-27-2010;Engine 1.77.81;NIC V4.01.20(CLX-3170) 02-05-2010;S/N JFJIUTM748HJGK983"; $osar = preg_split('/;S\/N [A-Z0-9]+/', $osin, -1); $os = array_shift($osar);