about summary refs log tree commit diff
path: root/src/nix-worker/nix-worker.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-31T22·19-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-31T22·19-0400
commit90d9c58d4dabb370849cd523fb9ee471e8140b76 (patch)
treecaa1ed9ad85e20106df6ad2ab396e46524953b37 /src/nix-worker/nix-worker.cc
parent89a8207029e7f6d5cfe3ab972c49ea46f5b9a784 (diff)
Pass all --option flags to the daemon
Diffstat (limited to 'src/nix-worker/nix-worker.cc')
-rw-r--r--src/nix-worker/nix-worker.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc
index 84ad689048a0..8ccafca29d0c 100644
--- a/src/nix-worker/nix-worker.cc
+++ b/src/nix-worker/nix-worker.cc
@@ -544,6 +544,14 @@ static void performOp(unsigned int clientVersion,
             settings.buildCores = readInt(from);
         if (GET_PROTOCOL_MINOR(clientVersion) >= 10)
             settings.useSubstitutes = readInt(from) != 0;
+        if (GET_PROTOCOL_MINOR(clientVersion) >= 12) {
+            unsigned int n = readInt(from);
+            for (unsigned int i = 0; i < n; i++) {
+                string name = readString(from);
+                string value = readString(from);
+                settings.set("untrusted-" + name, value);
+            }
+        }
         startWork();
         stopWork();
         break;