From 7b5f9f5dd5efc38cc8e203aedf17e19772359850 Mon Sep 17 00:00:00 2001 From: fyodor Date: Sat, 11 Aug 2007 05:20:08 +0000 Subject: [PATCH] merge soc07 r5100:5105 - Added traceroute to -A & updated docs --- docs/nmap.1 | 4 ++-- docs/nmap.usage.txt | 2 +- docs/refguide.xml | 14 ++++++++------ nmap.cc | 6 ++++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/docs/nmap.1 b/docs/nmap.1 index 04ec7f10c..e948fe859 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -180,7 +180,7 @@ OUTPUT: \-\-no\-stylesheet: Prevent associating of XSL stylesheet w/XML output MISC: \-6: Enable IPv6 scanning - \-A: Enables OS detection and Version detection + \-A: Enables OS detection, Version detection, Script scanning and Traceroute \-\-datadir : Specify custom Nmap data file location \-\-send\-eth/\-\-send\-ip: Send using raw ethernet frames or IP packets \-\-privileged: Assume that the user is fully privileged @@ -1325,7 +1325,7 @@ While IPv6 hasn't exactly taken the world by storm, it gets significant use in s \fI\%http://ipv6tb.he.net/\fR. 6to4 tunnels are another popular, free approach. .TP \fB\-A\fR (Aggressive scan options) -This option enables additional advanced and aggressive options. I haven't decided exactly which it stands for yet. Presently this enables OS Detection (\fB\-O\fR) and version scanning (\fB\-sV\fR). More features may be added in the future. The point is to enable a comprehensive set of scan options without people having to remember a large set of flags. This option only enables features, and not timing options (such as +This option enables additional advanced and aggressive options. I haven't decided exactly which it stands for yet. Presently this enables OS Detection (\fB\-O\fR), version scanning (\fB\-sV\fR), script scanning (\fB\-sC\fR) and traceroute (\fB\-\-traceroute\fR). More features may be added in the future. The point is to enable a comprehensive set of scan options without people having to remember a large set of flags. This option only enables features, and not timing options (such as \fB\-T4\fR) or verbosity options (\fB\-v\fR) that you might want as well. .TP \fB\-\-datadir \fR (Specify custom Nmap data file location) diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index 1ab2a7830..2ef3d48a8 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -89,7 +89,7 @@ OUTPUT: --no-stylesheet: Prevent associating of XSL stylesheet w/XML output MISC: -6: Enable IPv6 scanning - -A: Enables OS detection and Version detection + -A: Enables OS detection, Version detection, Script scanning and Traceroute --datadir : Specify custom Nmap data file location --send-eth/--send-ip: Send using raw ethernet frames or IP packets --privileged: Assume that the user is fully privileged diff --git a/docs/refguide.xml b/docs/refguide.xml index 77639d1bb..df442f137 100644 --- a/docs/refguide.xml +++ b/docs/refguide.xml @@ -75,8 +75,8 @@ A typical Nmap scan is shown in . The only Nmap arguments used in this example are , to enable OS and version - detection, for faster execution, and then the - two target hostnames. + detection, script scanning, and traceroute; for + faster execution; and then the two target hostnames. A representative Nmap scan @@ -1523,8 +1523,8 @@ way. -sV Enables version detection, as discussed above. - Alternatively, you can use to enable - both OS detection and version detection. + Alternatively, you can use , which enables + version detection among other things. @@ -1700,7 +1700,7 @@ way. Enables OS detection, as discussed above. Alternatively, you can use to enable - both OS detection and version detection. 2nd generation OS + OS detection along with other things. 2nd generation OS detection is tried first. If that fails, Nmap will either print out the host fingerprint and ask you to submit it (if you are certain about what the target host is running), or @@ -3056,7 +3056,9 @@ overwhelming requests. Specify to only see This option enables additional advanced and aggressive options. I haven't decided exactly which it stands for yet. Presently this enables OS Detection - () and version scanning (). More features may be + (), version scanning (), + script scanning () and + traceroute (). More features may be added in the future. The point is to enable a comprehensive set of scan options without people having to remember a large set of flags. This option only diff --git a/nmap.cc b/nmap.cc index 88f5d428e..a93f8852f 100644 --- a/nmap.cc +++ b/nmap.cc @@ -305,7 +305,7 @@ printf("%s %s ( %s )\n" " --no-stylesheet: Prevent associating of XSL stylesheet w/XML output\n" "MISC:\n" " -6: Enable IPv6 scanning\n" - " -A: Enables OS detection and Version detection\n" + " -A: Enables OS detection and Version detection, Script scanning and Traceroute\n" " --datadir : Specify custom Nmap data file location\n" " --send-eth/--send-ip: Send using raw ethernet frames or IP packets\n" " --privileged: Assume that the user is fully privileged\n" @@ -893,8 +893,10 @@ int nmap_main(int argc, char *argv[]) { #ifndef NOLUA o.script = 1; #endif - if (o.isr00t) + if (o.isr00t) { o.osscan = OS_SCAN_DEFAULT; + o.traceroute = true; + } break; case 'b': o.bouncescan++;