From 62823cb37912addbb47475c82ecfcd60c73a2e1e Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 3 Dec 2007 23:44:02 +0000
Subject: [PATCH] Back out r6322, which added a debugging message to libdnet.
 The bug which necessitated the message will be fixed in a pending commit.

---
 libdnet-stripped/NMAP_MODIFICATIONS | 34 -----------------------------
 libdnet-stripped/src/intf-win32.c   |  7 +-----
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/libdnet-stripped/NMAP_MODIFICATIONS b/libdnet-stripped/NMAP_MODIFICATIONS
index 02ea35a93..029eda907 100644
--- a/libdnet-stripped/NMAP_MODIFICATIONS
+++ b/libdnet-stripped/NMAP_MODIFICATIONS
@@ -390,37 +390,3 @@ Index: src/intf-win32.c
  
  	for (i = 0; i < intf->ifcombo[ifrow->dwType].cnt; i++) {
  		if (intf->ifcombo[ifrow->dwType].idx[i] == ifrow->dwIndex)
-
-o Show a warning whenever a Windows interface type is unrecognized.
-Index: src/intf-win32.c
-===================================================================
---- src/intf-win32.c	(revision 6321)
-+++ src/intf-win32.c	(working copy)
-@@ -23,6 +23,8 @@
- #include <stdlib.h>
- #include <string.h>
- 
-+#include "err.h"
-+
- #include "pcap.h"
- 
- struct ifcombo {
-@@ -42,7 +44,7 @@
- static char *
- _ifcombo_name(int type)
- {
--	char *name = "net";	/* XXX */
-+	char *name;
- 	
- 	if (type == MIB_IF_TYPE_ETHERNET) {
- 		name = "eth";
-@@ -56,6 +58,9 @@
- 		name = "lo";
- 	} else if (type == MIB_IF_TYPE_SLIP) {
- 		name = "sl";
-+	} else {
-+		name = "net";
-+		warnx("_ifcombo_name: Mapping unknown interface type %d to \"%s\".\n", type, name);
- 	}
- 	return (name);
- }
diff --git a/libdnet-stripped/src/intf-win32.c b/libdnet-stripped/src/intf-win32.c
index 184a636f9..367b5ccfc 100644
--- a/libdnet-stripped/src/intf-win32.c
+++ b/libdnet-stripped/src/intf-win32.c
@@ -23,8 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "err.h"
-
 #include "pcap.h"
 
 struct ifcombo {
@@ -44,7 +42,7 @@ struct intf_handle {
 static char *
 _ifcombo_name(int type)
 {
-	char *name;
+	char *name = "net";	/* XXX */
 	
 	if (type == MIB_IF_TYPE_ETHERNET) {
 		name = "eth";
@@ -58,9 +56,6 @@ _ifcombo_name(int type)
 		name = "lo";
 	} else if (type == MIB_IF_TYPE_SLIP) {
 		name = "sl";
-	} else {
-		name = "net";
-		warnx("_ifcombo_name: Mapping unknown interface type %d to \"%s\".\n", type, name);
 	}
 	return (name);
 }