From 5d05aec2efd2f5026b8eb4f2c0279521d564e4b8 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 18 Jun 2013 16:42:33 +0200 Subject: [PATCH] auth: Cleanup the agent return code. --- src/auth.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/auth.c b/src/auth.c index 5b8f748f..f44f24af 100644 --- a/src/auth.c +++ b/src/auth.c @@ -1107,13 +1107,11 @@ int ssh_userauth_publickey_auto(ssh_session session, state = session->auth_auto_state; if (state->state == SSH_AUTH_AUTO_STATE_NONE) { #ifndef _WIN32 - /* Try authentication with ssh-agent first */ + /* Try authentication with ssh-agent first */ rc = ssh_userauth_agent(session, username); - if (rc == SSH_AUTH_SUCCESS) { + if (rc == SSH_AUTH_SUCCESS || rc == SSH_AUTH_AGAIN) { return rc; } - if (rc == SSH_AUTH_AGAIN) - return rc; #endif state->state = SSH_AUTH_AUTO_STATE_PUBKEY; }