diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-02-28 23:54:20 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-02-28 23:54:20 +0000 |
| commit | dc92b01885c0c49d094148b1c4dc871ccdd265ad (patch) | |
| tree | 9d4426dfe847570906487649c32c5b320697705c /src/libstore/ssh.cc | |
| parent | 79152e307e7eef667c3de9c21571d017654a7c32 (diff) | |
| parent | 1c985428c4783568bcfb4692c6ce816eb5c5c31d (diff) | |
Merge remote-tracking branch 'upstream/master' into auto-uid-allocation
Diffstat (limited to 'src/libstore/ssh.cc')
| -rw-r--r-- | src/libstore/ssh.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc index 93f72675d..1bbad71f2 100644 --- a/src/libstore/ssh.cc +++ b/src/libstore/ssh.cc @@ -29,7 +29,7 @@ void SSHMaster::addCommonSSHOpts(Strings & args) if (!sshPublicHostKey.empty()) { Path fileName = (Path) *state->tmpDir + "/host-key"; auto p = host.rfind("@"); - string thost = p != string::npos ? string(host, p + 1) : host; + std::string thost = p != std::string::npos ? std::string(host, p + 1) : host; writeFile(fileName, thost + " " + base64Decode(sshPublicHostKey) + "\n"); args.insert(args.end(), {"-oUserKnownHostsFile=" + fileName}); } |