Re: [PATCH] ssh -Y

["Benjamin R. Haskell" <zsh@xxxxxxxxxx>]

On Wed, 29 Apr 2009, Ingmar Vanhassel wrote:

> ---
>  Completion/Unix/Command/_ssh |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
> index 293732c..438ecc2 100644
> --- a/Completion/Unix/Command/_ssh
> +++ b/Completion/Unix/Command/_ssh
> @@ -75,6 +75,7 @@ _ssh () {
>        '-V[show version number]' \
>        '(-X)-x[disable X11 forwarding]' \
>        '(-x)-X[enable X11 forwarding]' \
> +      '-Y[enable trusted X11 forwarding]' \
>        '-M[master mode for connection sharing]' \
>        '-S:path to control socket:_files' \
>        '-O:multiplex control command:(check exit)' \
> 


I had a merge conflict from this... should've sent it in sooner...

Aren't -X, -x, and -Y mutually exclusive?  Here's the way I'd incorporated 
'-Y':  (patch is against CVS)

Best,
Ben


Index: Completion/Unix/Command/_ssh
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_ssh,v
retrieving revision 1.34
diff -u -w -r1.34 _ssh
--- Completion/Unix/Command/_ssh	29 Apr 2009 12:32:37 -0000	1.34
+++ Completion/Unix/Command/_ssh	29 Apr 2009 13:28:45 -0000
@@ -73,9 +73,9 @@
       '(-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)' \