about summary refs log tree commit diff
path: root/src/libstore
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2018-03-05T17·23+0100
committerGitHub <noreply@github.com>2018-03-05T17·23+0100
commit70dbac7491c372b514b4fd825f99a761803f40f5 (patch)
treecaab5b17fd7c0427b2fa054a953659ee165556af /src/libstore
parente9a5ce9b079f21a42b01bdee9a08953a2d34d901 (diff)
parent088ef81759f22bf0115a52f183ba66b0be3b9ef2 (diff)
Merge pull request #1948 from shlevy/no-forward
ssh-ng: Don't forward options to the daemon.
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/remote-store.hh3
-rw-r--r--src/libstore/ssh-store.cc10
2 files changed, 12 insertions, 1 deletions
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 7f36e206416b..0cc20bf94194 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -122,11 +122,12 @@ protected:
 
     ref<Pool<Connection>> connections;
 
+    virtual void setOptions(Connection & conn);
+
 private:
 
     std::atomic_bool failed{false};
 
-    void setOptions(Connection & conn);
 };
 
 class UDSRemoteStore : public LocalFSStore, public RemoteStore
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index 107c6e1ecb4d..398408ea8d78 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -51,6 +51,16 @@ private:
     std::string host;
 
     SSHMaster master;
+
+    void setOptions(RemoteStore::Connection & conn) override
+    {
+        /* TODO Add a way to explicitly ask for some options to be
+           forwarded. One option: A way to query the daemon for its
+           settings, and then a series of params to SSHStore like
+           forward-cores or forward-overridden-cores that only
+           override the requested settings.
+        */
+    };
 };