Nmap 4.20ALPHA11

CHANGELOG

@@ -1,4 +1,15 @@
 # Nmap Changelog ($Id$); -*-text-*-
+4.20ALPHA11
+
+o Integrated all of your OS detection submissions, bringing the
+  database up to 149 fingerprints.  This is an increase of 28% from
+  ALPHA10.  Notable new new additions include FreeBSD 6.1, a bunch of
+  HP LaserJet printers, and HP-UX 11.11.  We also got a bunch of more
+  obscure submissions like Minix 3.1.2a and "Ember InSight Adapter for
+  programming EM2XX-family embedded devices".  I'm hoping that all the
+  obscure submissions mean that more of the mainstream systems are
+  being detected out of the box!  Please keep those submissions
+  (obscure or otherwise) coming!
 
 4.20ALPHA10
 

MACLookup.cc

@@ -181,6 +181,9 @@ static void mac_prefix_init() {
     ME->prefix = pfx;
     ME->vendor = cp_strdup(p);
 
+    if (MacTable.table_members > MacTable.table_capacity * 0.8)
+      error("WARNING:  nmap-mac-prefixes has grown to more than 80\% of our hash table size.  MacTable.table_capacity should be increased");
+
     // Now insert it into the table
     if (MacTable.table_members >= MacTable.table_capacity)
       fatal("No space for further MAC prefixes from nmap-mac-prefixes.  Increase MacTable.table_capacity");

Makefile.in

@@ -1,4 +1,4 @@
-export NMAP_VERSION = 4.20ALPHA10
+export NMAP_VERSION = 4.20ALPHA11
 NMAP_NAME= Nmap
 NMAP_URL= http://insecure.org
 NMAP_PLATFORM=@host@

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" "10/23/2006" "" "Nmap Reference Guide"
+.TH "NMAP" "1" "11/02/2006" "" "Nmap Reference Guide"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -91,7 +91,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 \fI\%http://insecure.org/nmap/data/nmap.usage.txt\fR. It helps people remember the most common options, but is no substitute for the in\-depth documentation in the rest of this manual. Some obscure options aren't even included here.
 .PP
 .nf
-Nmap 4.20ALPHA9 ( http://insecure.org )
+Nmap 4.20ALPHA10 ( http://insecure.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.

docs/nmap.usage.txt

@@ -1,4 +1,4 @@
-Nmap 4.20ALPHA10 ( http://insecure.org )
+Nmap 4.20ALPHA11 ( http://insecure.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.

main.cc

@@ -136,7 +136,6 @@ static BOOL OpenLibs(void) {
 
 /* global options */
 extern NmapOps o;  /* option structure */
-extern char **environ;
 
 int main(int argc, char *argv[]) {
   /* The "real" main is nmap_main().  This function hijacks control at the
@@ -390,7 +389,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	/* OK, I think we are finally ready for the big exec() */
-	ret = execve(nmappath, fakeargv, environ);
+	ret = execv(nmappath, fakeargv);
 	if (ret == -1) {
 	  pfatal("Could not exec %s", nmappath);
 	}

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.20ALPHA10"
+#define NMAP_VERSION "4.20ALPHA11"
 #define NMAP_NAME "Nmap"
 #define NMAP_URL "http://insecure.org"
 #define NMAP_PLATFORM "i686-pc-windows-windows"

nmapfe/nmapfe_sig.c

@@ -167,7 +167,6 @@ HANDLE pipes[2]; /* 0 == read; 1 == write */
 int pipes[2] = {-1,-1};
 #endif
 int verb = 0;
-extern char **environ;