Bug#696446: nmap: Errors out at startup if running as root and there is a network interface in monitor mode

[Hilko Bengen]

I have just uploaded 6.00-0.3 to DELAYED/5. If/when it hits unstable,
I'll ask the release team for a freeze exception.

The patch I applied is attached below.

Cheers,
-Hilko


diff --git a/libdnet-stripped/include/dnet/arp.h b/libdnet-stripped/include/dnet/arp.h
index bfb4a64..2f3d0bf 100644
--- a/libdnet-stripped/include/dnet/arp.h
+++ b/libdnet-stripped/include/dnet/arp.h
@@ -39,6 +39,8 @@ struct arp_hdr {
 #define ARP_HRD_ETH 	0x0001	/* ethernet hardware */
 #define ARP_HRD_IEEE802	0x0006	/* IEEE 802 hardware */
 
+#define ARP_HRD_IEEE80211_RADIOTAP 0x0323  /* IEEE 802.11 + radiotap header */
+
 /*
  * Protocol address format
  */
	Modified   libdnet-stripped/src/addr.c
diff --git a/libdnet-stripped/src/addr.c b/libdnet-stripped/src/addr.c
index 7a71345..392d44f 100644
--- a/libdnet-stripped/src/addr.c
+++ b/libdnet-stripped/src/addr.c
@@ -318,6 +318,7 @@ addr_ston(const struct sockaddr *sa, struct addr *a)
 #endif
 	case AF_UNSPEC:
 	case ARP_HRD_ETH:	/* XXX- Linux arp(7) */
+	case ARP_HRD_IEEE80211_RADIOTAP: /* IEEE 802.11 + radiotap header */
 		a->addr_type = ADDR_TYPE_ETH;
 		a->addr_bits = ETH_ADDR_BITS;
 		memcpy(&a->addr_eth, sa->sa_data, ETH_ADDR_LEN);