diff --git a/CHANGELOG b/CHANGELOG index 2736a7e94..dec1632b7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ # Nmap Changelog ($Id$); -*-text-*- +o [NSEDoc] Scripts that use modules automatically have the script + arguments defined by those modules included in their documentation. + It's no longer necessary to manually supply @args for the arguments + in the modules you use. [David] + o An integer overflow in the scan progress meter was fixed. It caused nonsense output like UDP Scan Timing: About 11.34% done; ETC: 03:21 (-688:-41:-48 remaining) diff --git a/scripts/pop3-brute.nse b/scripts/pop3-brute.nse index 7118d334a..a4f451c5d 100644 --- a/scripts/pop3-brute.nse +++ b/scripts/pop3-brute.nse @@ -6,8 +6,6 @@ Tries to log into a POP3 account by guessing usernames and passwords. -- @args pop3loginmethod The login method to use: "USER" -- (default), "SASL-PLAIN", "SASL-LOGIN", -- "SASL-CRAM-MD5", or "APOP". --- @args userdb The filename of an alternate username database. --- @args passdb The filename of an alternate password database. author = "Philip Pickering " license = "Same as Nmap--See http://nmap.org/book/man-legal.html" diff --git a/scripts/smb-check-vulns.nse b/scripts/smb-check-vulns.nse index a434d39d3..7ef3fa94e 100644 --- a/scripts/smb-check-vulns.nse +++ b/scripts/smb-check-vulns.nse @@ -48,9 +48,6 @@ on the Nmap-dev mailing list and I'll add it to my list [Ron Bowes]). -- | MS08-067: FIXED -- |_ regsvc DoS: VULNERABLE -- --- @args smb* This script supports the smbusername, --- smbpassword, smbhash, and smbtype --- script arguments of the smb module. -- @args unsafe If set, this script will run checks that, if the system isn't -- patched, are basically guaranteed to crash something. Remember that -- non-unsafe checks aren't necessarily safe either) diff --git a/scripts/smb-enum-domains.nse b/scripts/smb-enum-domains.nse index cbc23da1e..55431b633 100644 --- a/scripts/smb-enum-domains.nse +++ b/scripts/smb-enum-domains.nse @@ -37,10 +37,6 @@ After the initial bind to SAMR, the sequence of calls is: -- | |_ Password properties: -- | |_ Password complexity requirements do not exist -- |_ |_ Administrator account cannot be locked out --- --- @args smb* This script supports the smbusername, --- smbpassword, smbhash, and smbtype --- script arguments of the smb module. ----------------------------------------------------------------------- author = "Ron Bowes" diff --git a/scripts/smb-enum-processes.nse b/scripts/smb-enum-processes.nse index 090d60e05..ec467a2f8 100644 --- a/scripts/smb-enum-processes.nse +++ b/scripts/smb-enum-processes.nse @@ -76,10 +76,6 @@ same code) won't show up again. -- | | Priority: 4 -- | |_Thread Count: 1, Handle Count: 22 -- ... --- --- @args smb* This script supports the smbusername, --- smbpassword, smbhash, and smbtype --- script arguments of the smb module. ----------------------------------------------------------------------- author = "Ron Bowes" diff --git a/scripts/smb-enum-sessions.nse b/scripts/smb-enum-sessions.nse index 13bb960c8..8a9bcf49d 100644 --- a/scripts/smb-enum-sessions.nse +++ b/scripts/smb-enum-sessions.nse @@ -39,10 +39,6 @@ same code) won't show up again. -- | |_ DOMAIN\rbowes since 2008-10-20 09:03:23 -- | Active SMB Sessions: -- |_ |_ ADMINISTRATOR is connected from 10.100.254.138 for [just logged in, it's probably you], idle for [not idle] --- --- @args smb* This script supports the smbusername, --- smbpassword, smbhash, and smbtype --- script arguments of the smb module. ----------------------------------------------------------------------- author = "Ron Bowes" diff --git a/scripts/smb-enum-shares.nse b/scripts/smb-enum-shares.nse index b50699a01..63b7162ad 100644 --- a/scripts/smb-enum-shares.nse +++ b/scripts/smb-enum-shares.nse @@ -54,10 +54,6 @@ test. -- | |_ Comment: Default share -- | |_ Users: 0, Max: -- |_ |_ Path: C:\ --- --- @args smb* This script supports the smbusername, --- smbpassword, smbhash, and smbtype --- script arguments of the smb module. ----------------------------------------------------------------------- author = "Ron Bowes" diff --git a/scripts/smb-enum-users.nse b/scripts/smb-enum-users.nse index 3e9c37d1f..c7217c25f 100644 --- a/scripts/smb-enum-users.nse +++ b/scripts/smb-enum-users.nse @@ -127,9 +127,6 @@ the code I wrote for this is largely based on the techniques used by them. -- | |_ Type: Alias -- |_ |_ Domain: LOCALSYSTEM -- --- @args smb* This script supports the smbusername, --- smbpassword, smbhash, and smbtype --- script arguments of the smb module. -- @args lsaonly If set, script will only enumerate using an LSA bruteforce (requires less -- access than samr). Only set if you know what you're doing, you'll get better results -- by using the default options. diff --git a/scripts/smb-os-discovery.nse b/scripts/smb-os-discovery.nse index 75a573417..077af793e 100644 --- a/scripts/smb-os-discovery.nse +++ b/scripts/smb-os-discovery.nse @@ -24,11 +24,6 @@ they likely won't change the outcome in any meaningful way. -- | LAN Manager: Windows 2000 LAN Manager -- | Name: WORKGROUP\TEST1 -- |_ System time: 2008-09-09 20:55:55 UTC-5 --- --- @args smb* This script supports the smbusername, --- smbpassword, smbhash, and smbtype --- script arguments of the smb module, but they are unlikely --- to be required. ----------------------------------------------------------------------- author = "Ron Bowes" diff --git a/scripts/smb-security-mode.nse b/scripts/smb-security-mode.nse index 489742a82..456a727eb 100644 --- a/scripts/smb-security-mode.nse +++ b/scripts/smb-security-mode.nse @@ -42,10 +42,6 @@ set the username and password, etc.), but it probably won't ever require them. -- | smb-security-mode: User-level authentication -- | smb-security-mode: Challenge/response passwords supported -- |_ smb-security-mode: Message signing supported --- --- @args smb* This script supports the smbusername, --- smbpassword, smbhash, and smbtype --- script arguments of the smb module. ----------------------------------------------------------------------- author = "Ron Bowes" diff --git a/scripts/smb-server-stats.nse b/scripts/smb-server-stats.nse index 4ddff683e..e0a8586e6 100644 --- a/scripts/smb-server-stats.nse +++ b/scripts/smb-server-stats.nse @@ -27,10 +27,6 @@ up to version 1.0.3 (and possibly higher). -- | |_ Permission errors: 1, System errors: 0 -- | |_ Print jobs spooled: 0 -- |_ |_ Files opened (including pipes): 18 --- --- @args smb* This script supports the smbusername, --- smbpassword, smbhash, and smbtype --- script arguments of the smb module. ----------------------------------------------------------------------- author = "Ron Bowes" diff --git a/scripts/smb-system-info.nse b/scripts/smb-system-info.nse index 4b25efc7a..a95ffa46a 100644 --- a/scripts/smb-system-info.nse +++ b/scripts/smb-system-info.nse @@ -45,10 +45,6 @@ same code) won't show up again. -- | Browsers -- | |_ Internet Explorer 7.0000 -- |_ |_ Firefox 3.0.3 (en-US) --- --- @args smb* This script supports the smbusername, --- smbpassword, smbhash, and smbtype --- script arguments of the smb module. ----------------------------------------------------------------------- diff --git a/scripts/snmp-brute.nse b/scripts/snmp-brute.nse index e2fdbaab7..c03d10ec6 100644 --- a/scripts/snmp-brute.nse +++ b/scripts/snmp-brute.nse @@ -7,8 +7,6 @@ Attempts to find an SNMP community string by brute force guessing. -- @args snmpcommunity The SNMP community string to use. If supplied, this -- script will not run. -- @args snmplist The filename of a list of community strings to try. --- @args userdb The filename of an alternate username database. --- @args passdb The filename of an alternate password database. author = "Philip Pickering " diff --git a/scripts/snmp-sysdescr.nse b/scripts/snmp-sysdescr.nse index 13e635065..2dd527e31 100644 --- a/scripts/snmp-sysdescr.nse +++ b/scripts/snmp-sysdescr.nse @@ -3,9 +3,6 @@ Attempts to extract system information from an SNMP version 1 service. ]] --- --- @args snmpcommunity The community string to use. If not supplied, it is --- public. --- -- @output -- | snmp-sysdescr: HP ETHERNET MULTI-ENVIRONMENT,ROM A.25.80,JETDIRECT,JD117,EEPROM V.28.22,CIDATE 08/09/2006 -- |_ System uptime: 28 days, 17:18:59 (248153900 timeticks)