VCL-1069
Added check to make sure the optional $message argument is defined before attempting to print it in Windows.pm::get_current_computer_time. It was generating an uninitialized concatenation warning in vcld.log if called without the optional argument.
In Version_6.pm::activate, added $message argument to call to Windows.pm::get_current_computer_time.
diff --git a/managementnode/lib/VCL/Module/OS/Windows.pm b/managementnode/lib/VCL/Module/OS/Windows.pm
index d8ef0ca..3de1ad3 100644
--- a/managementnode/lib/VCL/Module/OS/Windows.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows.pm
@@ -9072,7 +9072,7 @@
my ($current_time) = grep(/\d:/, @$output);
if ($current_time) {
- notify($ERRORS{'OK'}, 0, "retrieved current time on $computer_name: $current_time ($message)");
+ notify($ERRORS{'OK'}, 0, "retrieved current time on $computer_name: $current_time" . (defined($message) ? " ($message)" : ''));
return $current_time;
}
else {
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
index 1162b7c..90b9991 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
@@ -257,7 +257,7 @@
else {
# Display the computer's current time in vcld.log to help diagnose the problem
# Activation fails if the client's time is incorrect
- $self->get_current_computer_time();
+ $self->get_current_computer_time('after activation failed');
notify($ERRORS{'CRITICAL'}, 0, "failed to activate Windows using MAK or KMS methods");
return;
