Merge pull request #7320 from peterwywong/ddns

Use xCAT::Utils:CheckVersion to compare BIND versions without using version.pm
xcat2 · Jan 31, 2023 · 4b221d5 · 4b221d5
2 parents 730cafb + 786d271
commit 4b221d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
@@ -2201,7 +2201,7 @@ sub CheckVersion
     my $index = 0;
     my $max_index = ($len_a > $len_b) ? $len_a : $len_b;
 
-    for ($index = 0 ; $index <= $max_index ; $index++)
+    for ($index = 0 ; $index < $max_index ; $index++)
     {
         my $val_a = ($len_a < $index) ? 0 : $a[$index];
         my $val_b = ($len_b < $index) ? 0 : $b[$index];

diff --git a/xCAT-server/lib/xcat/plugins/ddns.pm b/xCAT-server/lib/xcat/plugins/ddns.pm
@@ -14,7 +14,6 @@ use xCAT::SvrUtils;
 use Socket;
 use Fcntl qw/:flock/;
 use Data::Dumper;
-use version;
 
 # This is a rewrite of DNS management using nsupdate rather than
 #	direct zone mangling
@@ -1286,7 +1285,7 @@ sub update_namedconf {
             my $bind_version_cmd="/usr/sbin/named -v | cut -d' ' -f2 | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+'";
             my @bind_version =xCAT::Utils->runcmd($bind_version_cmd, 0);
             # Turn off DNSSEC if running with bind vers 9.16.6 or higher
-            if ((scalar @bind_version > 0) && (version->parse($bind_version[0]) >= version->parse(9.16.6))) {
+            if ((scalar @bind_version > 0) && (xCAT::Utils::CheckVersion($bind_version[0], "9.16.6") >= 0)) {
                 push @newnamed, "\tdnssec-enable no;\n";
                 push @newnamed, "\tdnssec-validation no;\n";
             }