From b1aae536a62666a29c8cf27ec2ef8e19b5398833 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 11 Aug 2009 23:52:37 +0000
Subject: [PATCH] bugfix to mac accounting

git-svn-id: http://www.observium.org/svn/observer/trunk@452 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/cisco-mac-accounting.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/includes/discovery/cisco-mac-accounting.php b/includes/discovery/cisco-mac-accounting.php
index 9f3b6814d..7585976cb 100755
--- a/includes/discovery/cisco-mac-accounting.php
+++ b/includes/discovery/cisco-mac-accounting.php
@@ -2,9 +2,7 @@
 
   unset ($mac_table);
 
-  echo("ipnettomedia\n");
-  $ipNetToMedia_data = shell_exec($config['snmpbulkwalk'] . " -m IP-MIB -Oq -".$device['snmpver']." -c ".$config['community']." ".$device['hostname']." ipNetToMediaPhysAddress");
-  echo("##".$config['snmpbulkwalk'] . " -m IP-MIB -Oq -".$device['snmpver']." -c ".$config['community']." ".$device['hostname']." ipNetToMediaPhysAddress##\n");
+  $ipNetToMedia_data = shell_exec($config['snmpbulkwalk'] . " -m IP-MIB -Oq -".$device['snmpver']." -c ".$device['community']." ".$device['hostname']." ipNetToMediaPhysAddress");
   $ipNetToMedia_data = str_replace("ipNetToMediaPhysAddress.", "", trim($ipNetToMedia_data));
   $ipNetToMedia_data = str_replace("IP-MIB::", "", trim($ipNetToMedia_data));
   echo("$ipNetToMedia_data\n");
@@ -41,9 +39,7 @@
     }
   }
 
-  echo("cisco-ip-stat-mib\n");
-  $datas = shell_exec($config['snmpbulkwalk'] . " -m CISCO-IP-STAT-MIB -Oqn -".$device['snmpver']." -c ".$config['community']." ".$device['hostname']." cipMacSwitchedBytes");
-  $datas = trim($datas);
+  $datas = shell_exec($config['snmpbulkwalk'] . " -m CISCO-IP-STAT-MIB -Oqn -".$device['snmpver']." -c ".$device['community']." ".$device['hostname']." cipMacSwitchedBytes");
   echo("$datas\n");
   echo("done\n");
   foreach(explode("\n", $datas) as $data) {