diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/User/_ssh | 30 |
2 files changed, 29 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 727561b7c..5121959f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-06-21 Chmouel Boudjnah <chmouel@mandrakesoft.com> + + * 12019: Completion/User/_ssh: upgrade to the last openssh + options. + 2000-06-21 Sven Wischnowsky <wischnow@zsh.org> * 12011: Completion/Commands/_history_complete_word, diff --git a/Completion/User/_ssh b/Completion/User/_ssh index eeb0e08dc..304a43554 100644 --- a/Completion/User/_ssh +++ b/Completion/User/_ssh @@ -25,24 +25,32 @@ _ssh () { ssh-opt) _arguments -C -s \ '-a[disable forwarding of authentication agent connection]' \ + '-A[enables forwarding of the authentication agent connection]' \ '-c[select encryption cipher]:encryption cipher:(idea des 3des blowfish arcfour tss none)' \ '-e[set escape character]:escape character (or `none'"'"'):' \ '(-n)-f[go to background]' \ + '-g[allows remote hosts to connect to local forwarded ports]'\ '-i[select identity file]:SSH identity file:_files' \ '-k[disable forwarding of kerberos tickets]' \ '-l[specify login name]:login name:_ssh_users' \ '-n[redirect stdin from /dev/null]' \ + '-N[do not execute a remote command. (protocol version 2 only)]'\ '*-o[specify extra options]:option string:->option' \ '-p[specify port on remote host]:port number on remote host:' \ - '-q[quiet operation]' \ '-P[use non priviledged port]' \ + '-q[quiet operation]' \ '-t[force pseudo-tty allocation]' \ + '-T[disable pseudo-tty allocation (protocol version 2 only)]'\ '-v[verbose mode]' \ '-V[show version number]' \ '-x[disable X11 forwarding]' \ + '-X[enable X11 forwarding]' \ '-C[compress all data]' \ '-L[specify local port forwarding]:local port forwarding:->forward' \ '-R[specify remote port forwarding]:remote port forwarding:->forward' \ + '-2[forces ssh to try protocol version 2 only]'\ + '-4[forces ssh to use IPv4 addresses only]' \ + '-6[forces ssh to use IPv6 addresses only]' \ "$args[@]" && ret=0 while [[ -n "$state" ]]; do @@ -107,7 +115,7 @@ _ssh () { ProxyCommand RemoteForward RhostsAuthentication \ RhostsRSAAuthentication RSAAuthentication \ StrictHostKeyChecking TISAuthentication \ - UsePriviledgedPort User UserKnownHostsFile UseRsh \ + UsePriviledgedPort Protocol User UserKnownHostsFile UseRsh \ XAuthLocation && ret=0 fi ;; @@ -153,15 +161,18 @@ _ssh () { scp) _arguments -C -s \ '-c[select encryption cipher]:encryption cipher:(idea des 3des blowfish arcfour tss none)' \ - '-P[specify port on remote host]:port number on remote host:' \ '-i[select identity file]:SSH identity file:_files' \ - '-S[specify path to ssh]:path to ssh:_files -g \*\(-\*\)' \ - '-o[give SSH options]:options:->options' \ '-p[preserve modification times]' \ '-r[recursively copy directories]' \ '-v[verbose mode]' \ '-B[batch mode]' \ + '-q[disables the progress meter]' \ '-C[compress data]' \ + '-P[specify port on remote host]:port number on remote host:' \ + '-4[forces scp to use IPv4 addresses only]' \ + '-6[forces scp to use IPv6 addresses only]' \ + '-S[specify path to ssh]:path to ssh:_files -g \*\(-\*\)' \ + '-o[give SSH options]:options:->options' \ '*:file:->file' && ret=0 if [[ "$state" = options ]]; then @@ -186,10 +197,11 @@ _ssh () { ;; ssh-add) _arguments -s \ - '-p[read passphrase from stdin]' \ '-l[list all identities]' \ + '-L[lists public key parameters of all identities in the agent]'\ '-d[remove identity]' \ '-D[delete all identities]' \ + '-p[read passphrase from stdin]' \ '*:SSH identity file:_files' return ;; @@ -210,6 +222,12 @@ _ssh () { '(-p -u)-C[specify new comment]:new comment:' \ '(-b -f -C -u -c)-p[change passphrase of private key file]' \ '(-b -f -N -p -u)-c[change comment in private and public key files]' \ + '-l[show fingerprint of specified private or public key file]' \ + '-q[silence ssh-keygen]' \ + '-R[exit 0 or 1 if RSA support is functional]' \ + '-x[read a DSA private key and print a SSH2 public key to stdout]'\ + '-X[read a SSH2 public key and print a DSA public key to stdout]'\ + '-y[read a DSA private key and print a DSA public key to stdout]'\ '(-b -N -C -p -c)-u[change key cipher to default]' return ;; |