nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #3353 from tbsmoest/priv_tobias_pr_set_deathsig-1.4

Browse source 
Fix PR_SET_PDEATHSIG results in Broken pipe (#2395)
This commit is contained in:
Eelco Dolstra 2020-02-19 12:29:12 +01:00 committed by GitHub
parent 82de90961b 3e347220c8
commit c4d3674de6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/ssh.cc
View file

@ -33,6 +33,9 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
out.create(); out.create();
auto conn = std::make_unique<Connection>(); auto conn = std::make_unique<Connection>();
ProcessOptions options;
options.dieWithParent = false;
conn->sshPid = startProcess([&]() { conn->sshPid = startProcess([&]() {
restoreSignals(); restoreSignals();
@ -64,7 +67,7 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
// could not exec ssh/bash // could not exec ssh/bash
throw SysError("unable to execute '%s'", args.front()); throw SysError("unable to execute '%s'", args.front());
}); }, options);
in.readSide = -1; in.readSide = -1;
@ -91,6 +94,9 @@ Path SSHMaster::startMaster()
Pipe out; Pipe out;
out.create(); out.create();
ProcessOptions options;
options.dieWithParent = false;
state->sshMaster = startProcess([&]() { state->sshMaster = startProcess([&]() {
restoreSignals(); restoreSignals();
@ -110,7 +116,7 @@ Path SSHMaster::startMaster()
execvp(args.begin()->c_str(), stringsToCharPtrs(args).data()); execvp(args.begin()->c_str(), stringsToCharPtrs(args).data());
throw SysError("unable to execute '%s'", args.front()); throw SysError("unable to execute '%s'", args.front());
}); }, options);
out.writeSide = -1; out.writeSide = -1;