mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-06 09:01:13 +02:00
Code Releases Activity

36183: _ssh: update to 7.0

Browse source
This commit is contained in:
Mikael Magnusson 2015-08-15 18:52:24 +02:00
parent 3f171fd463
commit a62e968224
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -3,6 +3,8 @@
* 36177: Completion/Zsh/Command/_setopt: complete printexitvalue * 36177: Completion/Zsh/Command/_setopt: complete printexitvalue
both ways both ways
* 36183: Completion/Unix/Command/_ssh: update to 7.0
2015-08-15 Barton E. Schaefer <schaefer@zsh.org> 2015-08-15 Barton E. Schaefer <schaefer@zsh.org>
* 36180: Src/jobs.c: avoid infinite job stop/continue loop on * 36180: Src/jobs.c: avoid infinite job stop/continue loop on

19
Completion/Unix/Command/_ssh
View file

@ -1,6 +1,6 @@
#compdef ssh slogin=ssh scp ssh-add ssh-agent ssh-keygen sftp ssh-copy-id #compdef ssh slogin=ssh scp ssh-add ssh-agent ssh-keygen sftp ssh-copy-id
# Completions currently based on OpenSSH 6.9 (released on 2015-06-30). # Completions currently based on OpenSSH 7.0 (released on 2015-08-11).
# #
# TODO: update ssh-keygen (not based on 5.9) # TODO: update ssh-keygen (not based on 5.9)
# TODO: sshd, ssh-keyscan, ssh-keysign # TODO: sshd, ssh-keyscan, ssh-keysign
@ -39,8 +39,10 @@ _ssh () {
'(-P)-b+[specify interface to transmit on]:bind address:_bind_addresses' \ '(-P)-b+[specify interface to transmit on]:bind address:_bind_addresses' \
'-D+[specify a dynamic port forwarding]:dynamic port forwarding:->dynforward' \ '-D+[specify a dynamic port forwarding]:dynamic port forwarding:->dynforward' \
'-e+[set escape character]:escape character (or `none'\''):' \ '-e+[set escape character]:escape character (or `none'\''):' \
'-E[append log output to file instead of stderr]:_files' \
'(-n)-f[go to background]' \ '(-n)-f[go to background]' \
'-g[allow remote hosts to connect to local forwarded ports]' \ '-g[allow remote hosts to connect to local forwarded ports]' \
'-G[output configuration and exit]' \
'-I+[specify smartcard device]:device:_files' \ '-I+[specify smartcard device]:device:_files' \
'-K[enable GSSAPI-based authentication and forwarding]' \ '-K[enable GSSAPI-based authentication and forwarding]' \
'-k[disable forwarding of GSSAPI credentials]' \ '-k[disable forwarding of GSSAPI credentials]' \
@ -56,11 +58,12 @@ _ssh () {
'(-v)*-q[quiet operation]' \ '(-v)*-q[quiet operation]' \
'*-R[specify remote port forwarding]:remote port forwarding:->forward' \ '*-R[specify remote port forwarding]:remote port forwarding:->forward' \
'-S+[specify location of control socket for connection sharing]:path to control socket:_files' \ '-S+[specify location of control socket for connection sharing]:path to control socket:_files' \
'-Q[query parameters]:parameter type:((cipher\:"supported symmetric ciphers" cipher-auth\:"supported symmetric ciphers that support authenticated encryption" mac\:"supported message integrity codes" kex\:"key exchange algorithms" key\:"key types" protocol-version\:"supported SSH protocol versions"))' \
'(-1)-s[invoke subsystem]' \ '(-1)-s[invoke subsystem]' \
'(-1 -t)-T[disable pseudo-tty allocation (protocol version 2 only)]' \ '(-1 -t)-T[disable pseudo-tty allocation (protocol version 2 only)]' \
'(-T)-t[force pseudo-tty allocation]' \ '(-T)-t[force pseudo-tty allocation]' \
'-V[show version number]' \ '-V[show version number]' \
'(-q)*-v[verbose mode]' \ '(-q)*-v[verbose mode (multiple increase verbosity, up to 3)]' \
'-W[forward standard input and output to host]:stdinout forward:->hostport' \ '-W[forward standard input and output to host]:stdinout forward:->hostport' \
'-w[request tunnel device forwarding]:local_tun[\:remote_tun] (integer or "any"):' \ '-w[request tunnel device forwarding]:local_tun[\:remote_tun] (integer or "any"):' \
'(-x -Y)-X[enable (untrusted) X11 forwarding]' \ '(-x -Y)-X[enable (untrusted) X11 forwarding]' \
@ -147,7 +150,14 @@ _ssh () {
case "$lstate" in case "$lstate" in
option) option)
if compset -P '*='; then if compset -P '*='; then
case "$IPREFIX" in case "${IPREFIX#-o}" in
(#i)(ciphers|macs|kexalgorithms|hostkeyalgorithms|pubkeyacceptedkeytypes|hostbasedkeytypes)=)
if ! compset -P +; then
_wanted append expl 'append to default' compadd + && ret=0
fi
;;
esac
case "${IPREFIX#-o}" in
(#i)(afstokenpassing|batchmode|canonicalizefallbacklocal|challengeresponseauthentication|checkhostip|clearallforwardings|compression|enablesshkeysign|exitonforwardfailure|fallbacktorsh|forward(agent|x11)|forwardx11trusted|gatewayports|gssapiauthentication|gssapidelegatecredentials|gssapitrustdns|hashknownhosts|hostbasedauthentication|identitiesonly|kbdinteractiveauthentication|(tcp|)keepalive|nohostauthenticationforlocalhost|passwordauthentication|permitlocalcommand|proxyusefdpass|pubkeyauthentication|rhosts(|rsa)authentication|rsaauthentication|streamlocalbindunlink|usersh|kerberos(authentication|tgtpassing)|useprivilegedport|visualhostkey)=*) (#i)(afstokenpassing|batchmode|canonicalizefallbacklocal|challengeresponseauthentication|checkhostip|clearallforwardings|compression|enablesshkeysign|exitonforwardfailure|fallbacktorsh|forward(agent|x11)|forwardx11trusted|gatewayports|gssapiauthentication|gssapidelegatecredentials|gssapitrustdns|hashknownhosts|hostbasedauthentication|identitiesonly|kbdinteractiveauthentication|(tcp|)keepalive|nohostauthenticationforlocalhost|passwordauthentication|permitlocalcommand|proxyusefdpass|pubkeyauthentication|rhosts(|rsa)authentication|rsaauthentication|streamlocalbindunlink|usersh|kerberos(authentication|tgtpassing)|useprivilegedport|visualhostkey)=*)
_wanted values expl 'truth value' compadd yes no && ret=0 _wanted values expl 'truth value' compadd yes no && ret=0
;; ;;
@ -234,7 +244,7 @@ _ssh () {
(#i)hostname=*) (#i)hostname=*)
_wanted hosts expl 'real host name to log into' _ssh_hosts && ret=0 _wanted hosts expl 'real host name to log into' _ssh_hosts && ret=0
;; ;;
(#i)(hostbasedkeytypes|hostkeyalgorithms)=*) (#i)(hostbasedkeytypes|hostkeyalgorithms|pubkeyacceptedkeytypes)=*)
_values -s , 'key types' \ _values -s , 'key types' \
'ecdsa-sha2-nistp256-cert-v01@openssh.com' \ 'ecdsa-sha2-nistp256-cert-v01@openssh.com' \
'ecdsa-sha2-nistp384-cert-v01@openssh.com' \ 'ecdsa-sha2-nistp384-cert-v01@openssh.com' \
@ -450,6 +460,7 @@ _ssh () {
Protocol \ Protocol \
ProxyCommand \ ProxyCommand \
ProxyUseFdpass \ ProxyUseFdpass \
PubkeyAcceptedKeyTypes \
PubkeyAuthentication \ PubkeyAuthentication \
RekeyLimit \ RekeyLimit \
RemoteForward \ RemoteForward \