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/download-via-ssh/download-via-ssh.cc | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'src/download-via-ssh')

diff --git a/src/download-via-ssh/download-via-ssh.cc b/src/download-via-ssh/download-via-ssh.cc
index b5350f998490..6361e71e9927 100644
--- a/src/download-via-ssh/download-via-ssh.cc
+++ b/src/download-via-ssh/download-via-ssh.cc
@@ -111,18 +111,6 @@ void run(Strings args)
     if (args.empty())
         throw UsageError("download-via-ssh requires an argument");
 
-    Settings::SettingsMap overrides = settings.getOverrides();
-    Settings::SettingsMap::iterator use = overrides.find("untrusted-use-ssh-substituter");
-    if (use != overrides.end()) {
-        if (use->second == "true") settings.useSshSubstituter = true;
-        else if (use->second == "false") settings.useSshSubstituter = false;
-        else throw Error(format("configuration option `use-ssh-substituter' should be either `true' or `false', not `%1%'")
-                        % use->second);
-    }
-
-    if (!settings.useSshSubstituter)
-        return;
-
     if (settings.sshSubstituterHosts.empty())
         return;
 
-- 
cgit 1.4.1