summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-04-29 16:36:53 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-04-29 16:36:53 +0000
commit65168c749c0b86337705da7a8012c093918c80b7 (patch)
treec55175b7675205af9a7b31b43733d527cd68a7e8
parente84adfe6cb9031d946ee22be8634f1ef9290b236 (diff)
downloadzsh-65168c749c0b86337705da7a8012c093918c80b7.tar.gz
zsh-65168c749c0b86337705da7a8012c093918c80b7.tar.xz
zsh-65168c749c0b86337705da7a8012c093918c80b7.zip
26900: Ben Haskell: ssh -Y, -x and -X are mutually exclusive
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_ssh6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d9fce4c4f..2a50ce768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-29  Peter Stephenson  <pws@csr.com>
 
+	* 26900: Benjamin R. Haskell: Completion/Unix/Command/_ssh: ssh -Y,
+	-x and -X are mutually exclusive.
+
 	* 26899: Ingmar Vanhassel: Completion/Unix/Command/_ssh: -Y option
 
 	* 26898: Ingmar Vanhassel: configure.ac: don't link
@@ -11636,5 +11639,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4672 $
+* $Revision: 1.4673 $
 *****************************************************
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index 438ecc215..bc207bfd9 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -73,9 +73,9 @@ _ssh () {
       '(-1 -t)-T[disable pseudo-tty allocation (protocol version 2 only)]' \
       '(-q)*-v[verbose mode]' \
       '-V[show version number]' \
-      '(-X)-x[disable X11 forwarding]' \
-      '(-x)-X[enable X11 forwarding]' \
-      '-Y[enable trusted X11 forwarding]' \
+      '(-X -Y)-x[disable X11 forwarding]' \
+      '(-x -Y)-X[enable (untrusted) X11 forwarding]' \
+      '(-x -X)-Y[enable trusted X11 forwarding]' \
       '-M[master mode for connection sharing]' \
       '-S:path to control socket:_files' \
       '-O:multiplex control command:(check exit)' \