From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 16 Sep 2011 10:56:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'crybaby'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/8bd048dee5e144ea2d1e22f547dd1dfb887bffe9?hp=14b8899253c17a2aea81dc985362692bcd932b66

Merge remote-tracking branch 'crybaby'

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

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