From bba26da49fec0b1df33189d80eb948777b64f345 Mon Sep 17 00:00:00 2001 From: fyodor Date: Sun, 2 Jul 2006 21:34:29 +0000 Subject: [PATCH] incl nmap-os-db in windows binary distros, fix max-retries, some spellchecking --- CHANGELOG | 9 +++++++++ Makefile.in | 2 +- docs/nmap.1 | 2 +- docs/nmap.usage.txt | 6 ++++-- idle_scan.cc | 2 +- mswin32/Makefile | 2 +- mswin32/nsis/Nmap.nsi | 2 ++ nmap-services | 2 ++ nmap.cc | 2 +- nmap_winconfig.h | 2 +- targets.cc | 4 ++-- 11 files changed, 25 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0659ba893..5a312bb67 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,13 @@ # Nmap Changelog ($Id$); -*-text-*- +Nmap 4.20ALPHA4 + +o Updated the Windows binary distributions (self-installer and .zip) + to include the new 2nd generation OS detection DB (nmap-os-db). + Thanks to Sina Bahram for reporting the problem. + +o Fixed the --max-retries option, which wasn't being honored. Thanks + to Jon Passki (jon.passki(a)hursk.com) for the patch. + Nmap 4.20ALPHA3 o Added back Win32 support thanks to a patch by kx diff --git a/Makefile.in b/Makefile.in index 585b4be43..77c2f8fa8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -export NMAP_VERSION = 4.20ALPHA3 +export NMAP_VERSION = 4.20ALPHA4 NMAP_NAME= Nmap NMAP_URL= http://www.insecure.org/nmap/ NMAP_PLATFORM=@host@ diff --git a/docs/nmap.1 b/docs/nmap.1 index 6b525887b..dc3a02e09 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "NMAP" "1" "06/24/2006" "" "Nmap Reference Guide" +.TH "NMAP" "1" "06/29/2006" "" "Nmap Reference Guide" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index 891396823..e29e6ba70 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -1,4 +1,4 @@ -Nmap 4.20ALPHA2 ( http://www.insecure.org/nmap/ ) +Nmap 4.20ALPHA3 ( http://www.insecure.org/nmap/ ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc. @@ -35,7 +35,9 @@ SERVICE/VERSION DETECTION: --version-all: Try every single probe (intensity 9) --version-trace: Show detailed version scan activity (for debugging) OS DETECTION: - -O: Enable OS detection + -O: Enable OS detection (try 2nd generation, then 1st if that fails) + -O1: Only use the old (1st generation) OS detection system + -O2: Only use the new OS detection system (no fallback) --osscan-limit: Limit OS detection to promising targets --osscan-guess: Guess OS more aggressively TIMING AND PERFORMANCE: diff --git a/idle_scan.cc b/idle_scan.cc index 1b7b7a326..23bbfbc33 100644 --- a/idle_scan.cc +++ b/idle_scan.cc @@ -378,7 +378,7 @@ static void initialize_idleproxy(struct idle_proxy_info *proxy, char *proxyName, proxy->ethptr = &proxy->eth; } else { if ((proxy->rawsd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0 ) - pfatal("socket trobles in %s", __FUNCTION__); + pfatal("socket troubles in %s", __FUNCTION__); unblock_socket(proxy->rawsd); broadcast_socket(proxy->rawsd); #ifndef WIN32 diff --git a/mswin32/Makefile b/mswin32/Makefile index fe8f56821..358b5660b 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -9,7 +9,7 @@ winbuild: $(MAKENSIS) winpcap/winpcap-nmap.nsi rm -rf nmap-$(NMAP_VERSION) mkdir nmap-$(NMAP_VERSION) - cd Release && cp ../../CHANGELOG ../../COPYING nmap-mac-prefixes nmap-os-fingerprints nmap-protocols nmap-rpc nmap-service-probes nmap-services nmap.exe nmap.xsl ../nmap_performance.reg ../../README-WIN32 ../nmap-$(NMAP_VERSION)/ + cd Release && cp ../../CHANGELOG ../../COPYING nmap-mac-prefixes nmap-os-fingerprints nmap-os-db nmap-protocols nmap-rpc nmap-service-probes nmap-services nmap.exe nmap.xsl ../nmap_performance.reg ../../README-WIN32 ../nmap-$(NMAP_VERSION)/ zip -r nmap-$(NMAP_VERSION)-win32.zip nmap-$(NMAP_VERSION) cp winpcap/winpcap-nmap-*.exe nmap-$(NMAP_VERSION) cp nsis/AddToPath.nsh nsis/Nmap.nsi nmap-$(NMAP_VERSION) diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi index af8e0d614..6bbd2c081 100644 --- a/mswin32/nsis/Nmap.nsi +++ b/mswin32/nsis/Nmap.nsi @@ -55,6 +55,7 @@ Section "Nmap Core Files" SecCore File COPYING File nmap-mac-prefixes File nmap-os-fingerprints + File nmap-os-db File nmap-protocols File nmap-rpc File nmap-service-probes @@ -117,6 +118,7 @@ Section "Uninstall" Delete "$INSTDIR\COPYING" Delete "$INSTDIR\nmap-mac-prefixes" Delete "$INSTDIR\nmap-os-fingerprints" + Delete "$INSTDIR\nmap-os-db" Delete "$INSTDIR\nmap-protocols" Delete "$INSTDIR\nmap-rpc" Delete "$INSTDIR\nmap-service-probes" diff --git a/nmap-services b/nmap-services index 7d12e1221..70df001b6 100644 --- a/nmap-services +++ b/nmap-services @@ -2163,6 +2163,8 @@ VeritasNetbackup 13721/tcp # bpdbm server VeritasNetbackup 13722/tcp # bpjava-msvc client VeritasNetbackup 13782/tcp # bpcd client VeritasNetbackup 13783/tcp # vopied client +bo2k 14141/tcp # Back Orifice 2K BoPeep mouse/keyboard input +bo2k 15151/tcp # Back Orifice 2K BoPeep video output swgps 15126/tcp # Nortel Java S/WGPS Global Payment Solutions for US credit card authorizations overnet 16444/tcp # Overnet file sharing overnet 16444/udp # Overnet file sharing diff --git a/nmap.cc b/nmap.cc index 4672b93be..46bf3a5bb 100644 --- a/nmap.cc +++ b/nmap.cc @@ -688,7 +688,7 @@ int nmap_main(int argc, char *argv[]) { if (l < 0) fatal("--max-scan-delay cannot be negative."); pre_max_scan_delay = l; } else if (optcmp(long_options[option_index].name, "max-retries") == 0) { - int pre_max_retries = atoi(optarg); + pre_max_retries = atoi(optarg); if (pre_max_retries < 0) fatal("max-retransmissions must be positive"); } else if (optcmp(long_options[option_index].name, "randomize-hosts") == 0 diff --git a/nmap_winconfig.h b/nmap_winconfig.h index 51e4403f1..b5b448bae 100644 --- a/nmap_winconfig.h +++ b/nmap_winconfig.h @@ -106,7 +106,7 @@ /* Without this, Windows will give us all sorts of crap about using functions like strcpy() even if they are done safely */ #define _CRT_SECURE_NO_DEPRECATE 1 -#define NMAP_VERSION "4.20ALPHA3" +#define NMAP_VERSION "4.20ALPHA4" #define NMAP_NAME "Nmap" #define NMAP_URL "http://www.insecure.org/nmap" #define NMAP_PLATFORM "i686-pc-windows-windows" diff --git a/targets.cc b/targets.cc index d3dbd3651..8a285816f 100644 --- a/targets.cc +++ b/targets.cc @@ -1539,14 +1539,14 @@ static void massping(Target *hostbatch[], int num_hosts, rawsd = -1; rawpingsd = -1; } else { if ((rawsd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0 ) - pfatal("socket trobles in massping"); + pfatal("socket troubles in massping"); broadcast_socket(rawsd); #ifndef WIN32 sethdrinclude(rawsd); #endif if ((rawpingsd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0 ) - pfatal("socket trobles in massping"); + pfatal("socket troubles in massping"); broadcast_socket(rawpingsd); #ifndef WIN32 sethdrinclude(rawpingsd);