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, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a03ad4c5..62c53fb48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2005-12-25  Clint Adams  <clint@zsh.org>
 
-	* 22104: Completion/Unix/Command/_ssh: add support
-	for new options such as ControlMaster and ControlPath.
+	* 22104, 22105: Completion/Unix/Command/_ssh: add
+	support for new options such as ControlMaster and
+	ControlPath, and for -M, -S, -O switches.
 
 2005-12-19  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index 53829fac0..9182f3ced 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -75,6 +75,9 @@ _ssh () {
       '-V[show version number]' \
       '(-X)-x[disable X11 forwarding]' \
       '(-x)-X[enable X11 forwarding]' \
+      '-M[master mode for connection sharing]' \
+      '-S:path to control socket:_files' \
+      '-O:multiplex control command:(check exit)' \
       '*-L[specify local port forwarding]:local port forwarding:->forward' \
       '*-R[specify remote port forwarding]:remote port forwarding:->forward' \
       ':remote host name:->userhost' \