guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

28/376: Only add the importNative primop if the allow-arbitrary-code-dur


From: Ludovic Courtès
Subject: 28/376: Only add the importNative primop if the allow-arbitrary-code-during-evaluation option is true (default false)
Date: Wed, 28 Jan 2015 22:03:49 +0000

civodul pushed a commit to tag 1.8
in repository guix.

commit d62f46e500958bc97ae6837911e27c20a47cc181
Author: Shea Levy <address@hidden>
Date:   Tue Jun 24 10:50:03 2014 -0400

    Only add the importNative primop if the 
allow-arbitrary-code-during-evaluation option is true (default false)
---
 src/libexpr/primops.cc  |    3 ++-
 src/libstore/globals.cc |    2 ++
 src/libstore/globals.hh |    3 +++
 3 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index d6ac7c9..ff82f36 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -1368,7 +1368,8 @@ void EvalState::createBaseEnv()
     mkApp(v, *baseEnv.values[baseEnvDispl - 1], *v2);
     forceValue(v);
     addConstant("import", v);
-    addPrimOp("__importNative", 2, prim_importNative);
+    if (settings.enableImportNative)
+        addPrimOp("__importNative", 2, prim_importNative);
     addPrimOp("__typeOf", 1, prim_typeOf);
     addPrimOp("isNull", 1, prim_isNull);
     addPrimOp("__isFunction", 1, prim_isFunction);
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 180344e..5d359e1 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -61,6 +61,7 @@ Settings::Settings()
     envKeepDerivations = false;
     lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1";
     showTrace = false;
+    enableImportNative = false;
 }
 
 
@@ -148,6 +149,7 @@ void Settings::update()
     get(sshSubstituterHosts, "ssh-substituter-hosts");
     get(useSshSubstituter, "use-ssh-substituter");
     get(logServers, "log-servers");
+    get(enableImportNative, "allow-arbitrary-code-during-evaluation");
 
     string subs = getEnv("NIX_SUBSTITUTERS", "default");
     if (subs == "default") {
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 65a6c38..8dd59a9 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -200,6 +200,9 @@ struct Settings {
     /* A list of URL prefixes that can return Nix build logs. */
     Strings logServers;
 
+    /* Whether the importNative primop should be enabled */
+    bool enableImportNative;
+
 private:
     SettingsMap settings, overrides;
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]