summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois-Xavier Coudert <fxcoudert@gmail.com>2023-02-22 10:52:06 +0100
committerFrancois-Xavier Coudert <fxcoudert@gmail.com>2023-02-22 10:53:23 +0100
commitd286952f9e8fce847404f2651e4e341dd33e96eb (patch)
tree9f65eb7246aa47b388bc17b30c73ba408d9b25df
parent5561070c3787385ceca01cbde6bb26573d1c6292 (diff)
downloadlibgit2-d286952f9e8fce847404f2651e4e341dd33e96eb.tar.gz
Make failure to connect to ssh-agent non-fatal
Fixes https://github.com/libgit2/libgit2/issues/3866 Has been applied in all Julia builds since 2017: https://github.com/JuliaLang/julia/pull/17459 Authored-by: Keno Fischer <kfischer@college.harvard.edu>
-rw-r--r--src/libgit2/transports/ssh.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libgit2/transports/ssh.c b/src/libgit2/transports/ssh.c
index e90ab07e8..60d26e802 100644
--- a/src/libgit2/transports/ssh.c
+++ b/src/libgit2/transports/ssh.c
@@ -246,8 +246,10 @@ static int ssh_agent_auth(LIBSSH2_SESSION *session, git_credential_ssh_key *c) {
rc = libssh2_agent_connect(agent);
- if (rc != LIBSSH2_ERROR_NONE)
+ if (rc != LIBSSH2_ERROR_NONE) {
+ rc = LIBSSH2_ERROR_AUTHENTICATION_FAILED;
goto shutdown;
+ }
rc = libssh2_agent_list_identities(agent);