From d3e73fb4359ee3d1a42034ea0aefe316e934aeb9 Mon Sep 17 00:00:00 2001 From: bybai Date: Wed, 11 Jul 2018 01:43:23 -0400 Subject: [PATCH 1/2] fix check for leading zeroes in ip address when running makehosts --- perl-xCAT/xCAT/NetworkUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/NetworkUtils.pm b/perl-xCAT/xCAT/NetworkUtils.pm index e3871e3f4..514e39f8a 100755 --- a/perl-xCAT/xCAT/NetworkUtils.pm +++ b/perl-xCAT/xCAT/NetworkUtils.pm @@ -2156,7 +2156,7 @@ sub isIpaddr return 0; } - if ($1 > 255 || $1 == 0 || $2 > 255 || $3 > 255 || $4 > 255) + if ($1 > 255 || $1 =~ /^0/ || $2 > 255 || $2 =~ /^0+(\d)/ || $3 > 255 || $3 =~ /^0+(\d)/ || $4 > 255 || $4 =~ /^0+(\d)/) { return 0; } From cc7ad619ccbc5ce03eba605f7b69457ebcc80a04 Mon Sep 17 00:00:00 2001 From: bybai Date: Wed, 11 Jul 2018 01:58:31 -0400 Subject: [PATCH 2/2] add new UT and polished --- perl-xCAT/xCAT/NetworkUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/NetworkUtils.pm b/perl-xCAT/xCAT/NetworkUtils.pm index 514e39f8a..7dba4a965 100755 --- a/perl-xCAT/xCAT/NetworkUtils.pm +++ b/perl-xCAT/xCAT/NetworkUtils.pm @@ -2156,7 +2156,7 @@ sub isIpaddr return 0; } - if ($1 > 255 || $1 =~ /^0/ || $2 > 255 || $2 =~ /^0+(\d)/ || $3 > 255 || $3 =~ /^0+(\d)/ || $4 > 255 || $4 =~ /^0+(\d)/) + if ($1 > 255 || $1 =~ /^0/ || $2 > 255 || $2 =~ /^0\d/ || $3 > 255 || $3 =~ /^0\d/ || $4 > 255 || $4 =~ /^0\d/) { return 0; }