hacks/ssh: Pass the requested port to `ssh -Ocheck'.
authorMark Wooding <mdw@distorted.org.uk>
Sat, 9 Jul 2011 13:53:42 +0000 (14:53 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 9 Jul 2011 13:57:23 +0000 (14:57 +0100)
Otherwise it doesn't find the correct master socket.

hacks/ssh

index 16b7578..18f39ac 100755 (executable)
--- a/hacks/ssh
+++ b/hacks/ssh
@@ -173,7 +173,9 @@ case "$mode" in
   m)
     mkdir -p -m700 "$SSH_LOGDIR"
     logfile=$SSH_LOGDIR/${login+"$login@"}"$host"${port+":$port"}.log
-    if ! "$REAL_SSH" -Ocheck ${login+"$login@"}"$host" >/dev/null 2>&1; then
+    if ! "$REAL_SSH" -Ocheck \
+      ${port+-p$port} ${login+"$login@"}"$host" \
+      >/dev/null 2>&1; then
       "$REAL_SSH" -MNf "${masteropts[@]}" "$host" \
        </dev/null >/dev/null 2>$logfile
     fi