From ef58bfd707270cd1922d3b1d813fd77869b28047 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Sat, 19 Jan 2008 16:45:29 +0000
Subject: [PATCH] Add a check to ignore and log malformed switch table entries

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@300 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT-2.0/xCAT/MacMap.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/perl-xCAT-2.0/xCAT/MacMap.pm b/perl-xCAT-2.0/xCAT/MacMap.pm
index 6103cf2e3..f5eab1449 100755
--- a/perl-xCAT-2.0/xCAT/MacMap.pm
+++ b/perl-xCAT-2.0/xCAT/MacMap.pm
@@ -122,8 +122,12 @@ sub refresh_table {
   #Build hash of switch port names per switch
   $self->{switches} = {};
   foreach $entry (@entries) {
-    $self->{switches}->{$entry->{switch}}->{$entry->{port}}=$entry->{node};
-  }
+    if (defined($entry->{switch}) and $entry->{switch} ne "" and defined($entry->{port}) and $entry->{port} ne "") {
+    	$self->{switches}->{$entry->{switch}}->{$entry->{port}}=$entry->{node};
+    } else {
+        syslog("local4|err","xCAT Table error:".$entry->{node}."Has missing or invalid switch.switch and/or switch.port fields");
+    }
+  } 
   my $children = 0;
   my $inputs = new IO::Select;
   $SIG{CHLD}= sub { while(waitpid(-1,WNOHANG) > 0) { $children-- } };