summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_ssh17
2 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index a5003eb7c..f619240c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-24  Clint Adams  <clint@zsh.org>
+
+	* 20583: Completion/Unix/Command/_ssh: complete "modern" options
+	such as GSSAPIAuthentication.
+
 2004-11-27  Doug Kearns  <djkea2@gus.gscit.monash.edu.au>
 
 	* 20584: Completion/Unix/Command/_screen: offer multiuser screen
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index d59d42878..399da1230 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -213,22 +213,29 @@ _ssh () {
       else
         _wanted values expl 'configure file option' \
             compadd -M 'm:{a-z}={A-Z}' -S '=' - \
-                AFSTokenPassing BatchMode BindAddress CheckHostIP \
+	    	AddressFamily \
+                AFSTokenPassing BatchMode BindAddress \
+		ChallengeResponseAuthentication CheckHostIP \
 		Cipher Ciphers ClearAllForwardings Compression \
-                CompressionLevel ConnectionAttempts DynamicForward \
+                CompressionLevel ConnectionAttempts ConnectTimeout \
+		DynamicForward EnableSSHKeysign \
 		EscapeChar FallBackToRsh ForwardAgent ForwardX11 \
-                GatewayPorts GlobalKnownHostsFile HostbasedAuthentication \
+		ForwardX11Trusted \
+                GatewayPorts GlobalKnownHostsFile GSSAPIAuthentication \
+		GSSAPIDelegateCredentials HostbasedAuthentication \
 		HostKeyAlgorithms HostKeyAlias HostName IdentityFile \
+		IdentitiesOnly \
 		KeepAlive KerberosAuthentication KerberosTgtPassing \
 		LocalForward LogLevel MACs NoHostAuthenticationForLocalhost \
 		NumberOfPasswordPrompts PreferredAuthentications \
 		PasswordAuthentication Port Protocol ProtocolKeepAlives \
                 ProxyCommand PubkeyAuthentication RemoteForward \
 		RhostsAuthentication RhostsRSAAuthentication \
-		RSAAuthentication ChallengeResponseAuthentication \
+		RSAAuthentication ServerAliveInterval ServerAliveCountMax \
 		SetupTimeOut SmartcardDevice StrictHostKeyChecking \
+		TCPKeepAlive \
                 UsePrivilegedPort User UserKnownHostsFile UseRsh \
-                XAuthLocation && ret=0
+                VerifyHostKeyDNS XAuthLocation && ret=0
       fi
       ;;
     forward)