From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 9 Jul 2011 13:53:42 +0000 (+0100)
Subject: hacks/ssh: Pass the requested port to `ssh -Ocheck'.
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/cfed2fe167f44ce0093bfd4c68d871483119cba8?hp=e41b452fce323a3f84907a48a7d2680dbbfe1475

hacks/ssh: Pass the requested port to `ssh -Ocheck'.

Otherwise it doesn't find the correct master socket.
---

diff --git a/hacks/ssh b/hacks/ssh
index 16b7578..18f39ac 100755
--- 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