From 75a17210f7c8e08bee384cde994ea07d5321e217 Mon Sep 17 00:00:00 2001
From: kris <kris@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 6 May 2010 23:00:09 +0000
Subject: [PATCH] remove unneeded OS_SCAN_DEFAULT #define (multi-gen support is
 long gone)

---
 nmap.cc | 8 ++++----
 nmap.h  | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/nmap.cc b/nmap.cc
index 227f18a53..c5b958603 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -1021,7 +1021,7 @@ int nmap_main(int argc, char *argv[]) {
       o.script = 1;
 #endif
       if (o.isr00t) {
-        o.osscan = OS_SCAN_DEFAULT;
+        o.osscan++;
         o.traceroute = true;
       }
       break;
@@ -1131,7 +1131,7 @@ int nmap_main(int argc, char *argv[]) {
     case 'n': o.noresolve++; break;
     case 'O':
       if (!optarg || *optarg == '2')
-        o.osscan = OS_SCAN_DEFAULT;
+        o.osscan++;
       else if (*optarg == '1')
         fatal("First-generation OS detection (-O1) is no longer supported. Use -O instead.");
       else
@@ -1373,7 +1373,7 @@ int nmap_main(int argc, char *argv[]) {
   if (pre_host_timeout != -1) o.host_timeout = pre_host_timeout;
 
 
-  if (o.osscan == OS_SCAN_DEFAULT)
+  if (o.osscan)
     o.reference_FPs = parse_fingerprint_reference_file("nmap-os-db");
 
   validate_scan_lists(ports,o);
@@ -1923,7 +1923,7 @@ int nmap_main(int argc, char *argv[]) {
       }
     }
 
-    if (o.osscan == OS_SCAN_DEFAULT)
+    if (o.osscan)
       os_scan2(Targets);
 
     if (o.traceroute)
diff --git a/nmap.h b/nmap.h
index fc14e7050..da293bfd6 100644
--- a/nmap.h
+++ b/nmap.h
@@ -366,9 +366,6 @@ void *realloc();
 /* For nonroot. */
 #define DEFAULT_PING_CONNECT_PORT_SPEC "80,443"
 
-/* OS scan */
-#define OS_SCAN_DEFAULT 9
-
 /* How many syn packets do we send to TCP sequence a host? */
 #define NUM_SEQ_SAMPLES 6