Author: arkurth
Date: Tue Jun 16 14:36:22 2009
New Revision: 785233
URL: http://svn.apache.org/viewvc?rev=785233&view=rev
Log:
VCL-23
Fixed bug in get_network_configuration() if an adapter is using
autoconfiguration. It now checks for "Autoconfiguration IP Address" in ipconfig
output.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows_mod.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows_mod.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows_mod.pm?rev=785233&r1=785232&r2=785233&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows_mod.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows_mod.pm Tue Jun
16 14:36:22 2009
@@ -4455,11 +4455,14 @@
# Normalize the setting format, make it lowercase,
convert dashes and spaces to underscores
$setting = lc($setting);
- $setting =~ s/[ -]/_/;
+ $setting =~ s/[ -]/_/g;
# Windows 6.x includes a version indicator in IP
address lines such as IPv4, remove this
$setting =~ s/ip(v\d)?_address/ip_address/;
+ # Autoconfiguration ip address will be displayed as
"Autoconfiguration IP Address. . . : 169.x.x.x"
+ $setting =~ s/autoconfiguration_ip/ip/;
+
# Remove the trailing s from dns_servers
$setting =~ s/dns_servers/dns_server/;
