tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-06-17 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions.php: fixed in the function "get_snmpwalk" the
	lost global $config var.
	
	Fixes: #2295




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8335 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-06-17 06:57:25 +00:00
parent ad7c4c8760
commit cd25df8283
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-06-17 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php: fixed in the function "get_snmpwalk" the
lost global $config var.
Fixes: #2295
2013-06-14 Miguel de Dios <miguel.dedios@artica.es> 2013-06-14 Miguel de Dios <miguel.dedios@artica.es>
* extensions/plugin_registration.php: fixed the url of module * extensions/plugin_registration.php: fixed the url of module

6
pandora_console/include/functions.php
View File

@ -1271,10 +1271,12 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '', $snmp3_au
$snmp3_security_level = '', $snmp3_auth_method = '', $snmp3_auth_pass = '', $snmp3_security_level = '', $snmp3_auth_method = '', $snmp3_auth_pass = '',
$snmp3_privacy_method = '', $snmp3_privacy_pass = '', $quick_print = 0, $base_oid = "", $snmp_port = '') { $snmp3_privacy_method = '', $snmp3_privacy_pass = '', $quick_print = 0, $base_oid = "", $snmp_port = '') {
global $config;
// Note: quick_print is ignored // Note: quick_print is ignored
// Fix for snmp port // Fix for snmp port
if (!empty($snmp_port)){ if (!empty($snmp_port)) {
$ip_target = $ip_target.':'.$snmp_port; $ip_target = $ip_target.':'.$snmp_port;
} }
@ -1283,7 +1285,7 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '', $snmp3_au
$base_oid = escapeshellarg ($base_oid); $base_oid = escapeshellarg ($base_oid);
} }
if ($config['snmpwalk'] == '') { if (empty($config['snmpwalk'])) {
switch (PHP_OS) { switch (PHP_OS) {
case "FreeBSD": case "FreeBSD":
$snmpwalk_bin = '/usr/local/bin/snmpwalk'; $snmpwalk_bin = '/usr/local/bin/snmpwalk';