proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-24 11:52:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2553 from libgit2/cmn/ssh-errors

Browse Source 
ssh: store error message immediately after a failed agent call
This commit is contained in:
Vicent Marti 2014-09-05 02:50:11 +02:00
commit 0972443c47
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/transports/ssh.c
View File

@ -292,6 +292,10 @@ static int ssh_agent_auth(LIBSSH2_SESSION *session, git_cred_ssh_key *c) {
} }
shutdown: shutdown:
if (rc != LIBSSH2_ERROR_NONE)
ssh_error(session, "error authenticating");
libssh2_agent_disconnect(agent); libssh2_agent_disconnect(agent);
libssh2_agent_free(agent); libssh2_agent_free(agent);
@ -305,6 +309,7 @@ static int _git_ssh_authenticate_session(
int rc; int rc;
do { do {
giterr_clear();
switch (cred->credtype) { switch (cred->credtype) {
case GIT_CREDTYPE_USERPASS_PLAINTEXT: { case GIT_CREDTYPE_USERPASS_PLAINTEXT: {
git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred; git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred;
@ -361,7 +366,8 @@ static int _git_ssh_authenticate_session(
return GIT_EAUTH; return GIT_EAUTH;
if (rc != LIBSSH2_ERROR_NONE) { if (rc != LIBSSH2_ERROR_NONE) {
ssh_error(session, "Failed to authenticate SSH session"); if (!giterr_last())
ssh_error(session, "Failed to authenticate SSH session");
return -1; return -1;
} }