1
0
mirror of synced 2026-04-27 04:46:28 +00:00

Dereference pointers before hashing them to generate a MAC address. (Closes: #547265)

This commit is contained in:
Axel Beckert
2010-03-10 23:37:21 +01:00
parent ead13f17b3
commit 74195e43f1
2 changed files with 10 additions and 1 deletions

View File

@@ -1903,7 +1903,14 @@ sub generateMACAddress
my $hash = '';
foreach my $key (qw/ hostname ip dhcp dist /)
{
$hash .= $CONFIG{ $key } if ( $CONFIG{ $key } );
if ( $CONFIG{ $key } ) {
if (ref($CONFIG{ $key }) eq 'ARRAY') {
$hash .= join(',',@{$CONFIG{ $key }});
} elsif (ref($CONFIG{ $key }) eq 'HASH') {
$hash .= join(',',values %{$CONFIG{ $key }});
} else {
$hash .= $CONFIG{ $key };
}
}
#

2
debian/changelog vendored
View File

@@ -14,6 +14,8 @@ xen-tools (4.2~rc1-1) UNRELEASED; urgency=low
* Don't delete configuration file if it already exists when
xen-create-image is run. (Closes: #520177)
* Don't write the FQDN into /etc/hostname (Closes: #492583)
* Dereference pointers before hashing them to generate a MAC
address. (Closes: #547265)
* Fix typo in /usr/lib/xen-tools/*.d/75-fixup-securetty (Closes:
#503339)
* Downgrade reiserfsprogs, xfsprogs and rinse to Suggests. (Closes: