author | Rich Burridge <rich.burridge@oracle.com> |
Thu, 20 Dec 2012 09:40:43 -0800 | |
changeset 1091 | ce8b381f34b6 |
parent 605 | 8dca74ad1a27 |
permissions | -rw-r--r-- |
1091
ce8b381f34b6
PSARC 2012/376 nmap 6.25
Rich Burridge <rich.burridge@oracle.com>
parents:
605
diff
changeset
|
1 |
--- nmap-6.25/libdnet-stripped/src/intf.c.orig 2012-12-06 13:43:47.010382941 -0800 |
ce8b381f34b6
PSARC 2012/376 nmap 6.25
Rich Burridge <rich.burridge@oracle.com>
parents:
605
diff
changeset
|
2 |
+++ nmap-6.25/libdnet-stripped/src/intf.c 2012-12-06 13:43:55.634656979 -0800 |
ce8b381f34b6
PSARC 2012/376 nmap 6.25
Rich Burridge <rich.burridge@oracle.com>
parents:
605
diff
changeset
|
3 |
@@ -339,7 +339,7 @@ |
146
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
4 |
/* Set link-level address. */ |
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
5 |
if (entry->intf_link_addr.addr_type == ADDR_TYPE_ETH && |
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
6 |
addr_cmp(&entry->intf_link_addr, &orig->intf_link_addr) != 0) { |
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
7 |
-#if defined(SIOCSIFHWADDR) |
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
8 |
+#if defined(SIOCSIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun)) |
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
9 |
if (addr_ntos(&entry->intf_link_addr, &ifr.ifr_hwaddr) < 0) |
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
10 |
return (-1); |
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
11 |
if (ioctl(intf->fd, SIOCSIFHWADDR, &ifr) < 0) |