|
Check-in Number:
|
5095 | |
| Date: |
2005-Jun-15 20:34:04 (local)
2005-Jun-15 18:34:04 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
Fix MAC address determination under Solaris by using the result of
ioctl(...,SIOCGARP,...) only if arp_flags had ATF_COM set. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/uuid/ChangeLog 1.73 -> 1.74
--- ChangeLog 2005/05/16 09:59:39 1.73
+++ ChangeLog 2005/06/15 18:34:04 1.74
@@ -13,6 +13,10 @@
Changes between 1.2.0 and 1.2.1 (23-Jan-2005 to xx-Mar-2005)
+ o Fix MAC address determination under Solaris by using the result of
+ ioctl(...,SIOCGARP,...) only if arp_flags had ATF_COM set.
+ [Ralf S. Engelschall]
+
o Upgrade to GNU libtool 1.5.16.
[Ralf S. Engelschall]
|
|
ossp-pkg/uuid/uuid_mac.c 1.7 -> 1.8
--- uuid_mac.c 2005/03/29 19:01:41 1.7
+++ uuid_mac.c 2005/06/15 18:34:04 1.8
@@ -166,9 +166,11 @@
close(s);
return FALSE;
}
+ close(s);
+ if (!(ar.arp_flags & ATF_COM))
+ return FALSE;
for (i = 0; i < MAC_LEN; i++)
data_ptr[i] = (unsigned char)(ar.arp_ha.sa_data[i] & 0xff);
- close(s);
return TRUE;
}
#endif
|
|
