From 96c71cbf911a6b904f35bf346f17919c0b887d1e Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 1 Jun 2011 10:09:52 +0000
Subject: [PATCH] fix?

git-svn-id: http://www.observium.org/svn/observer/trunk@2384 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/polling/cisco-mac-accounting.inc.php | 3 ++-
 scripts/mysql_stats.php                       | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/includes/polling/cisco-mac-accounting.inc.php b/includes/polling/cisco-mac-accounting.inc.php
index 5a3d5a5b5..cf1c590c5 100755
--- a/includes/polling/cisco-mac-accounting.inc.php
+++ b/includes/polling/cisco-mac-accounting.inc.php
@@ -62,7 +62,8 @@ foreach ($acc_rows as $acc)
     }
 
     if ($debug) { echo("\n" . $acc['hostname']." ".$acc['ifDescr'] . "  $mac -> $b_in:$b_out:$p_in:$p_out "); }
-    $rrdfile = $host_rrd . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd");
+
+    $rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd")
 
     if (!is_file($rrdfile))
     {
diff --git a/scripts/mysql_stats.php b/scripts/mysql_stats.php
index 3e2662eed..47cd4580d 100755
--- a/scripts/mysql_stats.php
+++ b/scripts/mysql_stats.php
@@ -40,8 +40,8 @@ if (!array_key_exists('SCRIPT_FILENAME', $_SERVER)
 # here, you can define them in another file named the same as this file, with a
 # .cnf extension.
 # ============================================================================
-$mysql_user = 'cactiuser';
-$mysql_pass = 'cactiuser';
+$mysql_user = 'user';
+$mysql_pass = 'password';
 $mysql_port = 3306;
 $mysql_ssl  = FALSE;   # Whether to use SSL to connect to MySQL.