From 7b4cee2d25e8ca56be75269e05009c1d4af147fd Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 20 Mar 2008 18:56:14 +0000
Subject: [PATCH] -Have makedns be more tolerant of different whitespace
 delimiters -Warn on invalid IPv4 addresses (think this may have caused
 tracker issue 1912698)

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@859 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server-2.0/lib/xcat/plugins/bind.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/xCAT-server-2.0/lib/xcat/plugins/bind.pm b/xCAT-server-2.0/lib/xcat/plugins/bind.pm
index 6c919ebb3..2347d9763 100755
--- a/xCAT-server-2.0/lib/xcat/plugins/bind.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/bind.pm
@@ -114,11 +114,17 @@ LINE: while(<HOSTS>){
     tr/A-Z/a-z/;	 # translate to lower case 
 
     ($data,$comment) = split('#', $_, 2);
-    ($addr, $names) = split(' ', $data, 2);
+    ($addr, $names) = split(/[ 	]+/, $data, 2);
     if ($names =~ /^[ \t]*$/) {
 	    #$callback->({data=>["Bad line in hosts file ignored '$_'"]});
 	    next LINE;
     }
+    $addr =~ s/^[    ]*//;
+    $addr =~ s/[    ]*$//;
+    if ($addr !~ /^\d+\.\d+\.\d+\.\d+$/) {
+       $callback->({data=>["Ignoring $addr (not a valid IPv4 address)"]});
+       next LINE;
+    }
 
     # Match -e args
     foreach $netpat (@elimpats){