diff --git a/COPYING b/COPYING
index 7f3692b72..2ba04cbe4 100644
--- a/COPYING
+++ b/COPYING
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/FingerPrintResults.cc b/FingerPrintResults.cc
index 11bbed28c..8a0729159 100644
--- a/FingerPrintResults.cc
+++ b/FingerPrintResults.cc
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/FingerPrintResults.h b/FingerPrintResults.h
index c989e0d06..f30ab8d61 100644
--- a/FingerPrintResults.h
+++ b/FingerPrintResults.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/MACLookup.cc b/MACLookup.cc
index 993ee7fb0..9a2b6dcfa 100644
--- a/MACLookup.cc
+++ b/MACLookup.cc
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/MACLookup.h b/MACLookup.h
index 2cc1f567d..0beb1aa52 100644
--- a/MACLookup.h
+++ b/MACLookup.h
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/NmapOps.cc b/NmapOps.cc
index 45e1d11f7..df9fc5588 100644
--- a/NmapOps.cc
+++ b/NmapOps.cc
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/NmapOps.h b/NmapOps.h
index 2fe685256..9658756a5 100644
--- a/NmapOps.h
+++ b/NmapOps.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/NmapOutputTable.cc b/NmapOutputTable.cc
index d82e0381f..bbcf27bf0 100644
--- a/NmapOutputTable.cc
+++ b/NmapOutputTable.cc
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/NmapOutputTable.h b/NmapOutputTable.h
index 7f5c66bad..c5e4d411c 100644
--- a/NmapOutputTable.h
+++ b/NmapOutputTable.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/Target.cc b/Target.cc
index 2ef7bd2d3..871cb0e9d 100644
--- a/Target.cc
+++ b/Target.cc
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/Target.h b/Target.h
index 517c7de08..af539c540 100644
--- a/Target.h
+++ b/Target.h
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/TargetGroup.cc b/TargetGroup.cc
index 81d5e9a6e..0b2bb6b08 100644
--- a/TargetGroup.cc
+++ b/TargetGroup.cc
@@ -26,7 +26,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/TargetGroup.h b/TargetGroup.h
index 06279c533..d9c0a355e 100644
--- a/TargetGroup.h
+++ b/TargetGroup.h
@@ -26,7 +26,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/charpool.cc b/charpool.cc
index 32fdafa96..a740fdd49 100644
--- a/charpool.cc
+++ b/charpool.cc
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/charpool.h b/charpool.h
index c8e06983a..db365be7a 100644
--- a/charpool.h
+++ b/charpool.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/global_structures.h b/global_structures.h
index 805231e59..d99197636 100644
--- a/global_structures.h
+++ b/global_structures.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/idle_scan.cc b/idle_scan.cc
index e7a57abe6..b7f969abe 100644
--- a/idle_scan.cc
+++ b/idle_scan.cc
@@ -28,7 +28,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/idle_scan.h b/idle_scan.h
index 85358b715..b17629d01 100644
--- a/idle_scan.h
+++ b/idle_scan.h
@@ -28,7 +28,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/main.cc b/main.cc
index 058327012..36e91a257 100644
--- a/main.cc
+++ b/main.cc
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/mswin32/winclude.h b/mswin32/winclude.h
index 4a7208279..c31aa2d08 100644
--- a/mswin32/winclude.h
+++ b/mswin32/winclude.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc
index 25468a916..f8d5d380b 100644
--- a/mswin32/winfix.cc
+++ b/mswin32/winfix.cc
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap-header-template.cc b/nmap-header-template.cc
index 4d86873f0..c7f085cf8 100644
--- a/nmap-header-template.cc
+++ b/nmap-header-template.cc
@@ -23,7 +23,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap.cc b/nmap.cc
index 77f6d5eae..a46a2d813 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap.h b/nmap.h
index 556592c9c..82ba9384f 100644
--- a/nmap.h
+++ b/nmap.h
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_amigaos.h b/nmap_amigaos.h
index c1348386c..f16c817ce 100644
--- a/nmap_amigaos.h
+++ b/nmap_amigaos.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_config.h.in b/nmap_config.h.in
index 277fc5e13..9fe4d2fea 100644
--- a/nmap_config.h.in
+++ b/nmap_config.h.in
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_dns.cc b/nmap_dns.cc
index b0a29da99..ce7b4af6b 100644
--- a/nmap_dns.cc
+++ b/nmap_dns.cc
@@ -23,7 +23,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_dns.h b/nmap_dns.h
index c715e81d6..bb1b072fc 100644
--- a/nmap_dns.h
+++ b/nmap_dns.h
@@ -22,7 +22,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_error.cc b/nmap_error.cc
index aa3f14a34..9870ba737 100644
--- a/nmap_error.cc
+++ b/nmap_error.cc
@@ -23,7 +23,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_error.h b/nmap_error.h
index e314547b8..42e857520 100644
--- a/nmap_error.h
+++ b/nmap_error.h
@@ -23,7 +23,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_rpc.cc b/nmap_rpc.cc
index b5ec66076..4d0fafa67 100644
--- a/nmap_rpc.cc
+++ b/nmap_rpc.cc
@@ -26,7 +26,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_rpc.h b/nmap_rpc.h
index b5d9b1449..36fb1ad90 100644
--- a/nmap_rpc.h
+++ b/nmap_rpc.h
@@ -26,7 +26,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_tty.cc b/nmap_tty.cc
index 08289eeb4..5d2f24d57 100644
--- a/nmap_tty.cc
+++ b/nmap_tty.cc
@@ -23,7 +23,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_tty.h b/nmap_tty.h
index 39ee77b0b..aec7303f8 100644
--- a/nmap_tty.h
+++ b/nmap_tty.h
@@ -23,7 +23,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/nmap_winconfig.h b/nmap_winconfig.h
index bee084c01..02e7c37ed 100644
--- a/nmap_winconfig.h
+++ b/nmap_winconfig.h
@@ -26,7 +26,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/osscan.cc b/osscan.cc
index 1c3613880..89c598cdc 100644
--- a/osscan.cc
+++ b/osscan.cc
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/osscan.h b/osscan.h
index 20977e55d..3ef968ba6 100644
--- a/osscan.h
+++ b/osscan.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/osscan2.cc b/osscan2.cc
index 826667f2c..59da0e980 100644
--- a/osscan2.cc
+++ b/osscan2.cc
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/osscan2.h b/osscan2.h
index 2ca6fa179..0fd531d75 100644
--- a/osscan2.h
+++ b/osscan2.h
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/output.cc b/output.cc
index a1c8a6f31..449fabfad 100644
--- a/output.cc
+++ b/output.cc
@@ -28,7 +28,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/output.h b/output.h
index 6eb65c41e..363122b28 100644
--- a/output.h
+++ b/output.h
@@ -28,7 +28,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/portlist.cc b/portlist.cc
index 84f9b1fb9..1be4efcc6 100644
--- a/portlist.cc
+++ b/portlist.cc
@@ -23,7 +23,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/portlist.h b/portlist.h
index 715410b26..46468927c 100644
--- a/portlist.h
+++ b/portlist.h
@@ -23,7 +23,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/portreasons.cc b/portreasons.cc
index 0f83d0a56..df492f976 100644
--- a/portreasons.cc
+++ b/portreasons.cc
@@ -22,7 +22,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/portreasons.h b/portreasons.h
index f2bbfa541..3bc3935b8 100644
--- a/portreasons.h
+++ b/portreasons.h
@@ -22,7 +22,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/protocols.cc b/protocols.cc
index a6490a78c..37806d52c 100644
--- a/protocols.cc
+++ b/protocols.cc
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/protocols.h b/protocols.h
index cfe114f96..b75f740e3 100644
--- a/protocols.h
+++ b/protocols.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/scan_engine.cc b/scan_engine.cc
index 1705e48d9..7fce89432 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/scan_engine.h b/scan_engine.h
index 65f6de3c7..7aab626fe 100644
--- a/scan_engine.h
+++ b/scan_engine.h
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/scripts/SMTPcommands.nse b/scripts/SMTPcommands.nse
index 2d1f0d3cb..d013cc672 100644
--- a/scripts/SMTPcommands.nse
+++ b/scripts/SMTPcommands.nse
@@ -2,7 +2,10 @@
 -- Version History
 -- 1.0.0.0 - 2007-06-12
 -- 1.1.0.0 - 2007-10-12
--- 	added HELP command in addition to EHLO
+-- + added HELP command in addition to EHLO
+-- 1.2.0.0 - 2008-05-19
+-- + made output single line, comma-delimited, instead of
+--   CR LF delimited on multi-lines
 
 -- Cribbed heavily from Thomas Buchanan's SQL version detection
 -- script and from Arturo 'Buanzo' Busleiman's SMTP open relay
@@ -12,7 +15,7 @@ id = "SMTP"
 description = "Attempts to use EHLO and HELP to gather the Extended commands an SMTP server supports."
 author = "Jason DePriest <jrdepriest@gmail.com>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-categories = {"discovery", "intrusive"}
+categories = {"discovery", "safe"}
 
 require "shortport"
 
@@ -22,66 +25,63 @@ action = function(host, port)
 
 	local socket = nmap.new_socket()
 	socket:set_timeout(5000)
-
+	
 	local result1
 	local result2
 	local result
 	local commands
 	local mailservername
 	local status = true
-
+	local table1
+	local nocr_regex
+	
 	local catch = function()
 		socket:close()
 	end
-
+	
 	local try = nmap.new_try(catch)
-
+	
 	try(socket:connect(host.ip, port.number, port.protocol))
 	result = try(socket:receive_lines(1))
-
+	
 	-- ASCII for "EHLO example.org\n"
-        -- for some reason it wouldn't reply unless I did it like this
-        local query = "\069\072\076\079\032\101\120\097"
-        query = query .. "\109\112\108\101\046\111\114\103"
-        query = query .. "\013\010"
-        try(socket:send(query))
-        result1 = try(socket:receive_lines(1))
-
-        if not string.match(result1, "^250") then
-                socket:close()
--- TODO: use print_debug instead
-                return "EHLO with errors or timeout.  Enable --script-trace to see what is happening."
-        end
-
-	-- EHLO returns a multiline result - I would like to pull out the line feeds and replace them with
-	-- something nicer like commas.  But when I do that, it messes up the first two lines as well, which
-	-- probably should be on their own lines.  I have not mastered the regexes for NSE yet, so maybe some day.
-
-	-- get rid of the line that says the commnad completed successfully
-        result1 = string.gsub(result1, "\050\053\048\032\079\075\013\010", "") -- 250 OK (needed to have the \r\n in there)
-	-- get rid of the 250- at the beginning of each line in the response
-        result1 = string.gsub(result1, "250%-", "") -- 250-
-        result1 = "Responded to EHLO command\n" .. result1
-
-	-- ASCII for "HELP\n"
 	-- for some reason it wouldn't reply unless I did it like this
-	local query = "\072\069\076\080\013\010"
+	local query = "EHLO example.org\r\n"
+	try(socket:send(query))
+	result1 = try(socket:receive_lines(1))
+	
+	if not string.match(result1, "^250") then
+		socket:close()
+		-- TODO: use print_debug instead
+		return "EHLO with errors or timeout.  Enable --script-trace to see what is happening."
+	end
+	
+	result1 = string.gsub(result1, "250 OK\r\n", "") -- 250 OK (needed to have the \r\n in there)
+	-- get rid of the 250- at the beginning of each line in the response
+	result1 = string.gsub(result1, "250%-", "") -- 250-
+	result1 = string.gsub(result1,"[\r\n]+$", "") -- no final CR LF
+	result1 = string.gsub(result1, "\r\n", ", ") -- CR LF to comma
+	result1 = "EHLO reply: " .. result1 .. "\n"
+	
+	local query = "HELP\r\n"
 	try(socket:send(query))
 	result2 = try(socket:receive_lines(1))
-
+	
 	if not string.match(result2, "^214") then
 		socket:close()
--- TODO: use print_debug instead
+		-- TODO: use print_debug instead
 		return "HELP with errors or timeout.  Enable --script-trace to see what is happening."
 	end
-
+	
 	-- get rid of the 214 at the beginning of the lines in the response
 	result2 = string.gsub(result2, "214%-", "") -- 214-
 	result2 = string.gsub(result2, "214 ", "") -- 214
-	result2 = "Responded to HELP command\n" .. result2
-
+	result2 = string.gsub(result1,"[\r\n]+$", "") -- no final CR LF
+	result2 = string.gsub(result1, "\r\n", ", ") -- CR LF to comma
+	result2 = "HELP reply: " .. result2 .. "\n"
+	
 	result = result1 .. result2
-
+	
 	return result
-
-end
+	
+end
\ No newline at end of file
diff --git a/service_scan.cc b/service_scan.cc
index 047b333ee..fe1a32195 100644
--- a/service_scan.cc
+++ b/service_scan.cc
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/service_scan.h b/service_scan.h
index d61779ae9..648b60f30 100644
--- a/service_scan.h
+++ b/service_scan.h
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/services.cc b/services.cc
index 9787f7c6f..8631514b8 100644
--- a/services.cc
+++ b/services.cc
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/services.h b/services.h
index 36c80d1fb..6e791a195 100644
--- a/services.h
+++ b/services.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/targets.cc b/targets.cc
index 905a60f10..8b7542259 100644
--- a/targets.cc
+++ b/targets.cc
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/targets.h b/targets.h
index 7902555b5..244ea0b53 100644
--- a/targets.h
+++ b/targets.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/tcpip.cc b/tcpip.cc
index 690826dc6..998660c20 100644
--- a/tcpip.cc
+++ b/tcpip.cc
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/tcpip.h b/tcpip.h
index c51638061..c5af557f9 100644
--- a/tcpip.h
+++ b/tcpip.h
@@ -25,7 +25,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/timing.cc b/timing.cc
index 2817cb7df..a489dc794 100644
--- a/timing.cc
+++ b/timing.cc
@@ -26,7 +26,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/timing.h b/timing.h
index 9e9b4c365..a1698d106 100644
--- a/timing.h
+++ b/timing.h
@@ -26,7 +26,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/traceroute.cc b/traceroute.cc
index a9d010847..f019ea6a9 100644
--- a/traceroute.cc
+++ b/traceroute.cc
@@ -22,7 +22,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/traceroute.h b/traceroute.h
index 9e6089807..7b7d8b90f 100644
--- a/traceroute.h
+++ b/traceroute.h
@@ -23,7 +23,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/utils.cc b/utils.cc
index 1a6675d45..93ce6a33d 100644
--- a/utils.cc
+++ b/utils.cc
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                * 
diff --git a/utils.h b/utils.h
index 591ff839e..ab81783b1 100644
--- a/utils.h
+++ b/utils.h
@@ -24,7 +24,7 @@
  * following:                                                              *
  * o Integrates source code from Nmap                                      *
  * o Reads or includes Nmap copyrighted data files, such as                *
- *   nmap-os-fingerprints or nmap-service-probes.                          *
+ *   nmap-os-db or nmap-service-probes.                                    *
  * o Executes Nmap and parses the results (as opposed to typical shell or  *
  *   execution-menu apps, which simply display raw Nmap output and so are  *
  *   not derivative works.)                                                *