From af5c3e578b2fee167e9b94d5c5db401628ab1e45 Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 21 Jun 2011 13:16:59 +0000
Subject: [PATCH] fix a mistake about the mac address formate in AIX system

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9874 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/lsslp.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
index 5579568e3..7d77da999 100644
--- a/xCAT-server/lib/xcat/plugins/lsslp.pm
+++ b/xCAT-server/lib/xcat/plugins/lsslp.pm
@@ -1942,7 +1942,7 @@ sub match_ip_mac
                     for (@mac_sections ) {
                         $_ = "0$_" if ( length($_) == 1) ;
                     }
-                    $mac = join ':', @mac_sections;
+                    $mac = join '', @mac_sections;
                 }
             } elsif ( $arpent =~ /^(\S+)+\s+\S+\s+(\S+)\s/ ) {
                 ($ip, $mac) = ($1,$2);
@@ -2412,7 +2412,8 @@ sub parse_responses {
         } else {
             $mac = undef;
         }
-        unless ( $mac =~ /\w+\:\w+\:\w+\:\w+\:\w+\:\w+/ ) { $mac = undef;}
+        # This is originally used to check the invalid mac address in AIX, but failed to do it.
+        #unless ( $mac =~ /\w+\:\w+\:\w+\:\w+\:\w+\:\w+/ ) { $mac = undef;}
         push @$data, $mac;
         trace ( $request, "    Then find the node's mac $mac.", 1);