diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-11-09T17·45+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-11-09T17·45+0100 |
| commit | 21c55ab3b54fc2db30ca53c572d24b38331f508c (patch) | |
| tree | 9c70dbbdeb47dca6eb723f85631b000298abc09b /src/nix-daemon | |
| parent | a83b10f84c403d0a38439ce0dd2ce8963cc58af7 (diff) | |
Implement backwards-compatible RemoteStore::addToStore()
The SSHStore PR adds this functionality to the daemon, but we have to handle the case where the Nix daemon is 1.11. Also, don't require signatures for trusted users. This restores 1.11 behaviour. Fixes https://github.com/NixOS/hydra/issues/398.
Diffstat (limited to 'src/nix-daemon')
| -rw-r--r-- | src/nix-daemon/nix-daemon.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc index 41c847dad131..0e4bcb525a37 100644 --- a/src/nix-daemon/nix-daemon.cc +++ b/src/nix-daemon/nix-daemon.cc @@ -324,7 +324,7 @@ static void performOp(ref<LocalStore> store, bool trusted, unsigned int clientVe case wopImportPaths: { startWork(); TunnelSource source(from); - Paths paths = store->importPaths(source, 0); + Paths paths = store->importPaths(source, 0, trusted); stopWork(); to << paths; break; |