Fixing #5773 - Okpos is missing

Cacti · Jun 20, 2024 · 64e5a6f · 64e5a6f
1 parent 448b677
commit 64e5a6f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -102,7 +102,9 @@ Cacti CHANGELOG
 -feature#5717: Add Aruba Clearpass template
 
 1.2.28
--issue#5772: Login log message unification - add client IP adress 
+-issue#5768: Cacti does not properly escape Data Query indexes that include a space
+-issue#5772: Login log message unification - add client IP adress
+-issue#5773: Update rrd.php missing variable $okpos
 
 1.2.27
 -security#GHSA-37x7-mfjv-mm7m: Authentication Bypass when using using older password hashes

diff --git a/lib/rrd.php b/lib/rrd.php
@@ -456,8 +456,9 @@ function rrdtool_trim_output(&$output) {
 	 * string.  So, therefore, we have to prune that
 	 * output.
 	 */
-	 if ($config['cacti_server_os'] == 'win32') {
-		 $output = rtrim($output, "OK \n\r");
+	if ($config['cacti_server_os'] == 'win32') {
+		$output = rtrim($output, "OK \n\r");
+		$okpos  = strlen($output);
 	} else {
 		$okpos = strrpos($output, 'OK u:');