Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/nmap/patches/libdnet-stripped.src.intf.c.patch
author pkidd <patrick.kidd@oracle.com>
Thu, 12 Nov 2015 10:20:41 -0800
branchs11u3-sru
changeset 5084 0f1eda768528
parent 2501 f20006f42637
permissions -rw-r--r--
build metadata for S11.3SRU3.2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2501
f20006f42637 15953796 Upgrade nmap to 6.25
Stefan Teleman <stefan.teleman@oracle.com>
parents: 605
diff changeset 
     1
 
--- nmap-6.25/libdnet-stripped/src/intf.c.orig	2012-12-06 13:43:47.010382941 -0800
f20006f42637 15953796 Upgrade nmap to 6.25
Stefan Teleman <stefan.teleman@oracle.com>
parents: 605
diff changeset 
     2
 
+++ nmap-6.25/libdnet-stripped/src/intf.c	2012-12-06 13:43:55.634656979 -0800
f20006f42637 15953796 Upgrade nmap to 6.25
Stefan Teleman <stefan.teleman@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)
upstream/oracle/userland-gate