about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_ssh3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2dd4a988e..26b0275b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	* 29736: Doc/Zsh/mod_zutil.yo: mention when zstyle -t returns 1.
 
+	* 29738: Completion/Unix/Command/_ssh: Add PreferredAuthentications
+	completion.
+
 2011-09-05  Barton E. Schaefer  <schaefer@brasslantern.com>
 
 	* users/16302: Completion/Unix/Type/_path_files: pattern matching
@@ -15369,5 +15372,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5454 $
+* $Revision: 1.5455 $
 *****************************************************
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index 491eba6f2..7b7317a42 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -225,6 +225,9 @@ _ssh () {
           _description files expl 'path to control socket'
           _files "$expl[@]" && ret=0
 	  ;;
+        *(#i)preferredauthentications*)
+          _values -s , 'authentication method' gssapi-with-mic \
+              hostbased publickey keyboard-interactive password && ret=0
         esac
       else
         _wanted values expl 'configure file option' \