aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2003-11-03 15:42:52 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2003-11-03 15:42:52 +0000
commitba2482aad62406540cde7d398032b5a7335a9a5a (patch)
treea7accb237ac0b9c3c41db4c74b68be135a545313
parente78648891926d9efb9e06fed253120c6ec2e6bb8 (diff)
downloadzsh-ba2482aad62406540cde7d398032b5a7335a9a5a.tar.gz
zsh-ba2482aad62406540cde7d398032b5a7335a9a5a.tar.xz
zsh-ba2482aad62406540cde7d398032b5a7335a9a5a.zip
merge from 4.1
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Unix/Command/_nmap4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d82c0ae6..9e80671ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,10 @@
* 19201: Completion/Unix/Command/_screen: patch from
Yasuhiro Hayase to complete normal commands after screen.
+2003-10-09 Oliver Kiddle <opk@zsh.org>
+
+ * unposted: Completion/Unix/Command/_nmap: update for nmap 3.48
+
2003-10-07 Bart Schaefer <schaefer@zsh.org>
* users/6663: Completion/compaudit: follow symlinks when checking
diff --git a/Completion/Unix/Command/_nmap b/Completion/Unix/Command/_nmap
index f34be5b31..f23937abc 100644
--- a/Completion/Unix/Command/_nmap
+++ b/Completion/Unix/Command/_nmap
@@ -5,9 +5,10 @@ local curcontext="$curcontext" state line suf ret=1
_arguments -C \
'!-sI:zombie host:_hosts' \
'!-P'{T,S,U}'+:port list' \
- '*-s-[specify scan type]:scan type:((S\:TCP\ SYN\ scan T\:TCP\ connect\(\)\ scan F\:stealth\ FIN\ scan X\:stealth\ Xmas\ tree\ scan N\:stealth\ null\ scan P\:ping\ scanning U\:UDP\ scan O\:IP\ prototocol\ scan I\:idle\ scan A\:ACK\ scan W\:window\ scan R\:RPC\ scan L\:list\ scan))' \
+ '*-s-[specify scan type]:scan type:((S\:TCP\ SYN\ scan T\:TCP\ connect\(\)\ scan F\:stealth\ FIN\ scan X\:stealth\ Xmas\ tree\ scan N\:stealth\ null\ scan P\:ping\ scanning U\:UDP\ scan O\:IP\ prototocol\ scan I\:idle\ scan A\:ACK\ scan W\:window\ scan R\:RPC\ scan L\:list\ scan V\:version\ detection))' \
'-b[specify ftp relay host]:ftp relay host:_hosts' \
'*-P-[specify probe types and options]:probe type/options:->probe-opts' \
+ '-A[enable OS detection and version scanning]' \
'-O[enable remote OS identification]' \
'-6[enable IPv6 support]' \
'-I[enable TCP reverse ident scanning]' \
@@ -33,6 +34,7 @@ _arguments -C \
'--randomize_hosts[scan hosts in random order]' \
'-M[specify maximum number of parallel TCP connects]:maximum TCP connects' \
'--packet_trace[show all packets sent in tcpdump-like format]' \
+ '--version_trace[show packets related to version scanning]' \
'--datadir[specify directory containing data files]:directory:_directories' \
'-T[specify timing policy]:timing policy:(Paranoid Sneaky Polite Normal Aggressive Insane)' \
'--host_timeout[specify maximum time for scanning a single host]:timeout (ms)' \