From 6472c3bf0d4b529f28f9e50834e1fc3dd101c409 Mon Sep 17 00:00:00 2001
From: ThinkChaos <ThinkChaos@users.noreply.github.com>
Date: Sat, 4 Nov 2023 12:08:00 -0400
Subject: [PATCH] fix(ssh): extraneous master processes

---
 src/libstore/ssh.cc | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc
index 03b2f0be9..300eb391c 100644
--- a/src/libstore/ssh.cc
+++ b/src/libstore/ssh.cc
@@ -132,7 +132,6 @@ Path SSHMaster::startMaster()
 
     if (state->sshMaster != -1) return state->socketPath;
 
-
     state->socketPath = (Path) *state->tmpDir + "/ssh.sock";
 
     Pipe out;
@@ -144,7 +143,8 @@ Path SSHMaster::startMaster()
     logger->pause();
     Finally cleanup = [&]() { logger->resume(); };
 
-    bool wasMasterRunning = isMasterRunning();
+    if (isMasterRunning())
+        return state->socketPath;
 
     state->sshMaster = startProcess([&]() {
         restoreProcessContext();
@@ -165,14 +165,13 @@ Path SSHMaster::startMaster()
 
     out.writeSide = -1;
 
-    if (!wasMasterRunning) {
-        std::string reply;
-        try {
-            reply = readLine(out.readSide.get());
-        } catch (EndOfFile & e) { }
+    std::string reply;
+    try {
+        reply = readLine(out.readSide.get());
+    } catch (EndOfFile & e) { }
 
-        if (reply != "started")
-            throw Error("failed to start SSH master connection to '%s'", host);
+    if (reply != "started") {
+        throw Error("failed to start SSH master connection to '%s'", host);
     }
 
     return state->socketPath;