Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-05 21:14:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Correct issues with building new SSH Agent fixes

Browse source
This commit is contained in:
Jonathan White 2020-02-23 22:51:18 -05:00
parent 40ad211f3e
commit 409190c85a
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/sshagent/SSHAgent.cpp
View file

@ -77,7 +77,7 @@ void SSHAgent::setUseOpenSSH(bool useOpenSSH)
} }
#endif #endif
QString SSHAgent::socketPath(bool allowOverride = true) const QString SSHAgent::socketPath(bool allowOverride) const
{ {
QString socketPath; QString socketPath;
@ -91,6 +91,7 @@ QString SSHAgent::socketPath(bool allowOverride = true) const
socketPath = QProcessEnvironment::systemEnvironment().value("SSH_AUTH_SOCK"); socketPath = QProcessEnvironment::systemEnvironment().value("SSH_AUTH_SOCK");
} }
#else #else
Q_UNUSED(allowOverride)
socketPath = "\\\\.\\pipe\\openssh-ssh-agent"; socketPath = "\\\\.\\pipe\\openssh-ssh-agent";
#endif #endif

2
src/sshagent/SSHAgent.h
View file

@ -37,7 +37,7 @@ public:
bool isEnabled() const; bool isEnabled() const;
void setEnabled(bool enabled); void setEnabled(bool enabled);
QString socketPath(bool allowOverride) const; QString socketPath(bool allowOverride = true) const;
QString authSockOverride() const; QString authSockOverride() const;
void setAuthSockOverride(QString& authSockOverride); void setAuthSockOverride(QString& authSockOverride);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN