From 42eb4afd7a38f3024a66da037d9f39859f7bd8f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Feb 2014 13:58:46 +0100
Subject: Simplify getting use-ssh-substituter from untrusted users

---
 src/nix-daemon/nix-daemon.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/nix-daemon')

diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index 58ef2109b313..f40cdd51b4b6 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -557,11 +557,12 @@ static void performOp(bool trusted, unsigned int clientVersion,
             for (unsigned int i = 0; i < n; i++) {
                 string name = readString(from);
                 string value = readString(from);
-                if (name == "build-timeout")
-                    string2Int(value, settings.buildTimeout);
+                if (name == "build-timeout" || name == "use-ssh-substituter")
+                    settings.set(name, value);
                 else
                     settings.set(trusted ? name : "untrusted-" + name, value);
             }
+            settings.update();
         }
         startWork();
         stopWork();
-- 
cgit 1.4.1