| author | Srinivasa Sarva <srinivasa.sarva@oracle.com> |
| Wed, 23 Mar 2011 12:42:35 -0700 | |
| changeset 146 | 8e22ba234817 |
| permissions | -rw-r--r-- |
|
146
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
1 |
--- nmap-5.21/libdnet-stripped/src/intf.c 2009-08-06 17:11:57.000000000 -0700 |
|
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
2 |
+++ nmap-5.21/libdnet-stripped/src/intf.c 2010-03-09 20:32:28.207885025 -0800 |
|
8e22ba234817
7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
3 |
@@ -323,7 +323,7 @@ |
|
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) |