Author: arkurth
Date: Fri Jun 23 19:13:15 2017
New Revision: 1799694
URL: http://svn.apache.org/viewvc?rev=1799694&view=rev
Log:
VCL-867
Fixed minor problem causing uninitialized concatenation warnings in vcld.log in
Windows.pm::ad_search when checking a previously loaded, domain-joined image.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm?rev=1799694&r1=1799693&r2=1799694&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm Fri Jun 23 19:13:15
2017
@@ -14275,7 +14275,8 @@ sub ad_search {
my $domain_dns_name;
my $domain_username;
my $domain_password;
- if (defined($arguments->{domain_dns_name}) &&
$arguments->{domain_dns_name} ne $self->data->get_image_domain_dns_name()) {
+ my $image_domain_dns_name = $self->data->get_image_domain_dns_name(0)
|| '';
+ if (defined($arguments->{domain_dns_name}) &&
$arguments->{domain_dns_name} ne $image_domain_dns_name) {
$domain_dns_name = $arguments->{domain_dns_name};
($domain_username, $domain_password) =
$self->data->get_domain_credentials($domain_dns_name);
if (!defined($domain_username) || !defined($domain_password)) {
