From d3eb1cf3bbf57a33ac2e71a19a150c077011ecd9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 3 Mar 2017 19:23:20 +0100
Subject: build-remote: Don't use a SSH master

This is unnecessary because we make only one connection.
---
 src/build-remote/build-remote.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/build-remote/build-remote.cc')

diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc
index fd710c2b6b71..3908dfac487d 100644
--- a/src/build-remote/build-remote.cc
+++ b/src/build-remote/build-remote.cc
@@ -233,7 +233,9 @@ int main (int argc, char * * argv)
                 lock = -1;
 
                 try {
-                    sshStore = openStore("ssh://" + bestMachine->hostName + "?ssh-key=" + bestMachine->sshKey);
+                    sshStore = openStore("ssh://" + bestMachine->hostName,
+                        { {"ssh-key", bestMachine->sshKey },
+                          {"max-connections", "1" } });
                     hostName = bestMachine->hostName;
                 } catch (std::exception & e) {
                     printError("unable to open SSH connection to ‘%s’: %s; trying other available machines...",
-- 
cgit 1.4.1