ssh: Add some -o and related arg completions.

1 files changed, 30 insertions, 19 deletions

diff --git a/completions/ssh b/completions/ssh
index 9030aab6..3531c167 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -17,22 +17,25 @@ _ssh_macs()
 _ssh_options()
 {
     compopt -o nospace
-    COMPREPLY=( $( compgen -S = -W 'AddressFamily BatchMode BindAddress \
-        ChallengeResponseAuthentication CheckHostIP Cipher Ciphers \
-        ClearAllForwardings Compression CompressionLevel ConnectionAttempts \
-        ConnectTimeout ControlMaster ControlPath DynamicForward EscapeChar \
-        ExitOnForwardFailure ForwardAgent ForwardX11 ForwardX11Trusted \
-        GatewayPorts GlobalKnownHostsFile GSSAPIAuthentication \
-        GSSAPIDelegateCredentials HashKnownHosts Host HostbasedAuthentication \
-        HostKeyAlgorithms HostKeyAlias HostName IdentityFile IdentitiesOnly \
-        KbdInteractiveDevices LocalCommand LocalForward LogLevel MACs \
-        NoHostAuthenticationForLocalhost NumberOfPasswordPrompts \
-        PasswordAuthentication PermitLocalCommand Port \
-        PreferredAuthentications Protocol ProxyCommand PubkeyAuthentication \
-        RekeyLimit RemoteForward RhostsRSAAuthentication RSAAuthentication \
-        SendEnv ServerAliveInterval ServerAliveCountMax SmartcardDevice \
-        StrictHostKeyChecking TCPKeepAlive Tunnel TunnelDevice \
-        UsePrivilegedPort User UserKnownHostsFile VerifyHostKeyDNS \
+    COMPREPLY=( $( compgen -S = -W 'AddressFamily BatchMode BindAddress
+        ChallengeResponseAuthentication CheckHostIP Cipher Ciphers
+        ClearAllForwardings Compression CompressionLevel ConnectionAttempts
+        ConnectTimeout ControlMaster ControlPath ControlPersist DynamicForward
+        EnableSSHKeysign EscapeChar ExitOnForwardFailure ForwardAgent
+        ForwardX11 ForwardX11Timeout ForwardX11Trusted GatewayPorts
+        GlobalKnownHostsFile GSSAPIAuthentication GSSAPIClientIdentity
+        GSSAPIDelegateCredentials GSSAPIKeyExchange GSSAPIRenewalForcesRekey
+        GSSAPIServerIdentity GSSAPITrustDns HashKnownHosts Host
+        HostbasedAuthentication HostKeyAlgorithms HostKeyAlias HostName
+        IdentityFile IdentitiesOnly IPQoS KbdInteractiveDevices KexAlgorithms
+        LocalCommand LocalForward LogLevel MACs
+        NoHostAuthenticationForLocalhost NumberOfPasswordPrompts
+        PasswordAuthentication PermitLocalCommand PKCS11Provider Port
+        PreferredAuthentications Protocol ProxyCommand PubkeyAuthentication
+        RekeyLimit RemoteForward RequestTTY RhostsRSAAuthentication
+        RSAAuthentication SendEnv ServerAliveCountMax ServerAliveInterval
+        SmartcardDevice StrictHostKeyChecking TCPKeepAlive Tunnel TunnelDevice
+        UsePrivilegedPort User UserKnownHostsFile VerifyHostKeyDNS
         VisualHostKey XAuthLocation' -- "$cur" ) )
 }
 
@@ -47,9 +50,10 @@ _ssh_suboption()
 
     case $prev in
         BatchMode|ChallengeResponseAuthentication|CheckHostIP|\
-        ClearAllForwardings|Compression|ExitOnForwardFailure|ForwardAgent|\
-        ForwardX11|ForwardX11Trusted|GatewayPorts|GSSAPIAuthentication|\
-        GSSAPIKeyExchange|GSSAPIDelegateCredentials|GSSAPITrustDns|\
+        ClearAllForwardings|ControlPersist|Compression|EnableSSHKeysign|\
+        ExitOnForwardFailure|ForwardAgent|ForwardX11|ForwardX11Trusted|\
+        GatewayPorts|GSSAPIAuthentication|GSSAPIKeyExchange|\
+        GSSAPIDelegateCredentials|GSSAPIRenewalForcesRekey|GSSAPITrustDns|\
         HashKnownHosts|HostbasedAuthentication|IdentitiesOnly|\
         KbdInteractiveAuthentication|KbdInteractiveDevices|\
         NoHostAuthenticationForLocalhost|PasswordAuthentication|\
@@ -67,9 +71,16 @@ _ssh_suboption()
         Cipher)
             COMPREPLY=( $( compgen -W 'blowfish des 3des' -- "$cur" ) )
             ;;
+        IPQoS)
+            COMPREPLY=( $( compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
+                cs{0..7} ef lowdelay throughput reliability' -- "$cur" ) )
+            ;;
         Protocol)
             COMPREPLY=( $( compgen -W '1 2 1,2 2,1' -- "$cur" ) )
             ;;
+        RequestTTY)
+            COMPREPLY=( $( compgen -W 'no yes force auto' -- "$cur" ) )
+            ;;
         Tunnel)
             COMPREPLY=( $( compgen -W 'yes no point-to-point ethernet' \
                     -- "$cur" ) )