From d9d048d61d76638ca4cc105d79543b0a2b02ba36 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Thu, 20 Mar 2008 18:44:20 +0000 Subject: [PATCH] -Suppress warning on blank /etc/hosts lines -Fix expansion of sub-class-c networks (i.e. zone per node) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@858 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server-2.0/lib/xcat/plugins/bind.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server-2.0/lib/xcat/plugins/bind.pm b/xCAT-server-2.0/lib/xcat/plugins/bind.pm index 2a77815b3..6c919ebb3 100755 --- a/xCAT-server-2.0/lib/xcat/plugins/bind.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/bind.pm @@ -116,7 +116,7 @@ LINE: while(){ ($data,$comment) = split('#', $_, 2); ($addr, $names) = split(' ', $data, 2); if ($names =~ /^[ \t]*$/) { - $callback->({data=>["Bad line in hosts file ignored '$_'"]}); + #$callback->({data=>["Bad line in hosts file ignored '$_'"]}); next LINE; } @@ -142,7 +142,7 @@ LINE: while(){ # Check that the address is in the address list. $match = 'none'; foreach $netpat (@Netpatterns){ - $match = $netpat, last if ($addr =~ /^$netpat\./); + $match = $netpat, last if ($addr =~ /^$netpat\./ or $addr =~ /^$netpat$/); } next if ($match eq 'none');