diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-25 18:02:48 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-25 18:02:48 +0200 |
| commit | 67937907ca7e90bc8fe3019d3c4d6436a8eba7ed (patch) | |
| tree | 0a06763ab72b6bb6704675ee6a35d001a29b2dc1 /src/libstore/remote-store.cc | |
| parent | 71a20d4d95ad40060857d5da6b813f437267fbb2 (diff) | |
nix-daemon: Pass on the user's $SSH_AUTH_SOCK to the SSH substituter
Diffstat (limited to 'src/libstore/remote-store.cc')
| -rw-r--r-- | src/libstore/remote-store.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index b3967bb24..7c51f395a 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -163,6 +163,8 @@ void RemoteStore::setOptions() if (GET_PROTOCOL_MINOR(daemonVersion) >= 12) { Settings::SettingsMap overrides = settings.getOverrides(); + if (overrides["ssh-auth-sock"] == "") + overrides["ssh-auth-sock"] = getEnv("SSH_AUTH_SOCK"); writeInt(overrides.size(), to); foreach (Settings::SettingsMap::iterator, i, overrides) { writeString(i->first, to); |