From 409e32bd70f8472db2e0b31aca52d6ed93e9c75a Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Tue, 8 Nov 2016 02:32:01 -0500
Subject: [PATCH] modified depending on comments

---
 perl-xCAT/xCAT/MacMap.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/perl-xCAT/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm
index aab0e63ab..e857cf9f5 100644
--- a/perl-xCAT/xCAT/MacMap.pm
+++ b/perl-xCAT/xCAT/MacMap.pm
@@ -343,11 +343,9 @@ sub dump_mac_info {
             }
             elsif (defined($self->{macinfo}->{$switch}->{ErrorStr})) {
                 $ret{$switch}->{ErrorStr} = $self->{macinfo}->{$switch}->{ErrorStr};
-                if ($ret{$switch}->{ErrorStr} =~ /Unknown user name/) {
-                    $ret{$switch}->{ErrorStr} = "Unknown snmp user name";
-                }
+
                 # To show the error message that the username/password related error is for SNMP only
-                if ($ret{$switch}->{ErrorStr} =~ /username|password/i) {
+                if ($ret{$switch}->{ErrorStr} =~ /user\s*name|password/i) {
                     $ret{$switch}->{ErrorStr} .= " through SNMP";
                 }
             } else {