Bug#656816: opu: package cacti/0.8.7b-2.1+lenny5

[Luk Claes <luk@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: opu

Hi

Version 0.8.7b-2.1+lenny4 interface statistics does not work anymore after the previous security fix. Below oneliner fixes this.

Cheers

Luk

diff -u cacti-0.8.7b/debian/changelog cacti-0.8.7b/debian/changelog
--- cacti-0.8.7b/debian/changelog
+++ cacti-0.8.7b/debian/changelog
@@ -1,3 +1,10 @@
+cacti (0.8.7b-2.1+lenny5) oldstable; urgency=low
+
+  * lib/snmp.php: Add $max_oids parameter to snmp_walk
+    Closes: #656613
+
+ -- Luk Claes <luk@debian.org>  Sat, 21 Jan 2012 23:41:35 +0100
+
 cacti (0.8.7b-2.1+lenny4) lenny-security; urgency=high
 
   [ Paul Gevers ]
diff -u cacti-0.8.7b/debian/patches/CVE-2010-1645.patch cacti-0.8.7b/debian/patches/CVE-2010-1645.patch
--- cacti-0.8.7b/debian/patches/CVE-2010-1645.patch
+++ cacti-0.8.7b/debian/patches/CVE-2010-1645.patch
@@ -149,7 +149,16 @@
 +			exec(escapeshellcmd(read_config_option("path_snmpgetnext")) . " -O fntev $snmp_auth -v $version -t $timeout -r $retries " . escapeshellarg($hostname) . ":$port " . escapeshellarg($oid), $snmp_value);
  		}
  	}
- 
+
+@@ -222,7 +239,7 @@ 
+ 	return $snmp_value;
+ }
+
+-function cacti_snmp_walk($hostname, $community, $oid, $version, $username, $password, $auth_proto, $priv_pass, $priv_proto, $context, $port = 161, $timeout = 500, $retries = 0, $environ = SNMP_POLLER) {
++function cacti_snmp_walk($hostname, $community, $oid, $version, $username, $password, $auth_proto, $priv_pass, $priv_proto, $context, $port = 161, $timeout = 500, $retries = 0, $environ = SNMP_POLLER, $max_oids = 50) {
+ 	global $config;
+
+ 	$snmp_auth	= '';
 @@ -235,6 +252,17 @@
  		if ($retries == "") $retries = 3;
  	}