From 90d9c58d4dabb370849cd523fb9ee471e8140b76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 31 Jul 2012 18:19:44 -0400
Subject: Pass all --option flags to the daemon

---
 src/nix-worker/nix-worker.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/nix-worker/nix-worker.cc')

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;
-- 
cgit 1.4.1