- important upstream security fixes

[packages/cacti.git] / poller_output_remainder.patch

diff --git a/poller_output_remainder.patch b/poller_output_remainder.patch
new file mode 100644 (file)
index 0000000..5edcf15
--- /dev/null
+++ b/poller_output_remainder.patch
@@ -0,0 +1,46 @@
+diff -ruBbd cacti-0.8.6i/lib/poller.php cacti-0.8.6i-patched/lib/poller.php
+--- cacti-0.8.6i/lib/poller.php        2006-10-08 23:06:01.000000000 -0400
++++ cacti-0.8.6i-patched/lib/poller.php        2006-11-21 23:41:02.000000000 -0500
+@@ -213,7 +213,7 @@
+ /* process_poller_output - grabs data from the 'poller_output' table and feeds the *completed*
+      results to RRDTool for processing
+    @arg $rrdtool_pipe - the array of pipes containing the file descriptor for rrdtool */
+-function process_poller_output($rrdtool_pipe) {
++function process_poller_output($rrdtool_pipe, $remainder = FALSE) {
+       global $config;
+ 
+       include_once($config["library_path"] . "/rrd.php");
+@@ -221,6 +221,12 @@
+       /* let's count the number of rrd files we processed */
+       $rrds_processed = 0;
+ 
++      if ($remainder) {
++              $limit = "";
++      }else{
++              $limit = "LIMIT 10000";
++      }
++
+       /* create/update the rrd files */
+       $results = db_fetch_assoc("select
+               poller_output.output,
+@@ -231,7 +237,7 @@
+               poller_item.rrd_num
+               from (poller_output,poller_item)
+               where (poller_output.local_data_id=poller_item.local_data_id and poller_output.rrd_name=poller_item.rrd_name)
+-              limit 10000");
++              $limit");
+ 
+       if (sizeof($results) > 0) {
+               /* create an array keyed off of each .rrd file */
+diff -ruBbd cacti-0.8.6i/poller.php cacti-0.8.6i-patched/poller.php
+--- cacti-0.8.6i/poller.php    2006-10-08 23:06:01.000000000 -0400
++++ cacti-0.8.6i-patched/poller.php    2006-11-12 11:49:05.000000000 -0500
+@@ -166,7 +166,7 @@
+               $polling_items = db_fetch_assoc("select poller_id,end_time from poller_time where poller_id = 0");
+ 
+               if (sizeof($polling_items) == $process_file_number) {
+-                      $rrds_processed = $rrds_processed + process_poller_output($rrdtool_pipe);
++                      $rrds_processed = $rrds_processed + process_poller_output($rrdtool_pipe, TRUE);
+ 
+                       /* take time and log performance data */
+                       list($micro,$seconds) = split(" ", microtime());