eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

ssh-ng: Don't forward options to the daemon.

Browse source 
This can be iterated on and currently leaves out settings we know we
want to forward, but it fixes #1713 and fixes #1935 and isn't
fundamentally broken like the status quo. Future changes are suggested
in a comment.
This commit is contained in:
Shea Levy 2018-03-05 07:42:15 -05:00
parent e9a5ce9b07
commit 088ef81759
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/remote-store.hh
View file

@ -122,11 +122,12 @@ protected:
ref<Pool<Connection>> connections; ref<Pool<Connection>> connections;
virtual void setOptions(Connection & conn);
private: private:
std::atomic_bool failed{false}; std::atomic_bool failed{false};
void setOptions(Connection & conn);
}; };
class UDSRemoteStore : public LocalFSStore, public RemoteStore class UDSRemoteStore : public LocalFSStore, public RemoteStore

10
src/libstore/ssh-store.cc
View file

@ -51,6 +51,16 @@ private:
std::string host; std::string host;
SSHMaster master; 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.
*/
};
}; };