From 1de9e32d90ab597d32f6c685db5398049b36da3b Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 29 May 2012 11:25:25 +0000
Subject: [PATCH] fix mac accounting

git-svn-id: http://www.observium.org/svn/observer/trunk@3249 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/os/ios.inc.php             | 1 +
 includes/polling/cisco-mac-accounting.inc.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/discovery/os/ios.inc.php b/includes/discovery/os/ios.inc.php
index f807adfa86..58674c6954 100755
--- a/includes/discovery/os/ios.inc.php
+++ b/includes/discovery/os/ios.inc.php
@@ -5,6 +5,7 @@ if (empty($os))
   if (strstr($sysDescr, "Cisco Internetwork Operating System Software")) { $os = "ios"; }
   else if (strstr($sysDescr, "IOS (tm)")) { $os = "ios"; }
   else if (strstr($sysDescr, "Cisco IOS Software")) { $os = "ios"; }
+  else if (strstr($sysDescr, "Global Site Selector")) { $os = "ios"; }
 
   if (strstr($sysDescr, "IOS-XE")) { $os = "iosxe"; }
   if (strstr($sysDescr, "IOS XR")) { $os = "iosxr"; }
diff --git a/includes/polling/cisco-mac-accounting.inc.php b/includes/polling/cisco-mac-accounting.inc.php
index 87a1e34540..d93794fa9a 100755
--- a/includes/polling/cisco-mac-accounting.inc.php
+++ b/includes/polling/cisco-mac-accounting.inc.php
@@ -77,7 +77,7 @@ if ($device['os_group'] == "cisco")
 
       // FIXME - use memcached to make sure these values don't go backwards?
       $rrdupdate = array($b_in, $b_out, $p_in, $p_out);
-      $ret = rrdtool_update("$rrdfile", $rrdupdate);
+      rrdtool_update($rrdfile, $rrdupdate);
 
       if ($acc['update'])
       { // Do Updates