diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-06-06 18:00:58 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-06-06 18:58:55 +0200 |
| commit | aa0f8409db9abb4d8d04127b1072f12a64b5f7ee (patch) | |
| tree | f24e5dd174f749cacd4d1971beba4b95c05f4667 /nix/nix-daemon | |
| parent | d2aa12250ece6d71ef1edee2ea2a69ccf70ac354 (diff) | |
daemon: Always require a signature when importing an archive.
* nix/nix-daemon/nix-daemon.cc (performOp): Pass true as the first argument to
'performOp'.
Diffstat (limited to 'nix/nix-daemon')
| -rw-r--r-- | nix/nix-daemon/nix-daemon.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc index 2b89190dbe0..10159db62e0 100644 --- a/nix/nix-daemon/nix-daemon.cc +++ b/nix/nix-daemon/nix-daemon.cc | |||
| @@ -440,7 +440,10 @@ static void performOp(bool trusted, unsigned int clientVersion, | |||
| 440 | case wopImportPaths: { | 440 | case wopImportPaths: { |
| 441 | startWork(); | 441 | startWork(); |
| 442 | TunnelSource source(from); | 442 | TunnelSource source(from); |
| 443 | Paths paths = store->importPaths(!trusted, source); | 443 | |
| 444 | /* Unlike Nix, always require a signature, even for "trusted" | ||
| 445 | users. */ | ||
| 446 | Paths paths = store->importPaths(true, source); | ||
| 444 | stopWork(); | 447 | stopWork(); |
| 445 | writeStrings(paths, to); | 448 | writeStrings(paths, to); |
| 446 | break; | 449 | break; |
