equal
deleted
inserted
replaced
1 --- nmap-5.21/tcpip.cc 2010-01-14 19:55:23.000000000 -0800 |
|
2 +++ nmap-5.21/tcpip.cc 2010-03-09 20:30:38.315876272 -0800 |
|
3 @@ -3124,7 +3124,7 @@ |
|
4 devs[count].device_type = devt_ethernet; |
|
5 |
|
6 /* If the device type is ethernet, get the MAC address. */ |
|
7 -#ifdef SIOCGIFHWADDR |
|
8 +#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__)) |
|
9 memcpy(&tmpifr.ifr_addr, sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin))); |
|
10 rc = ioctl(sd, SIOCGIFHWADDR, &tmpifr); |
|
11 if (rc < 0 && errno != EADDRNOTAVAIL) |
|