From 28bfc7645c16a407d6fc3889a3ce611cbb86ec8f Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Thu, 8 Sep 2011 20:56:38 +0200 Subject: auth: different code for auth_agent --- include/libssh/session.h | 1 + src/auth.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/libssh/session.h b/include/libssh/session.h index 0f5989b..bb5bd51 100644 --- a/include/libssh/session.h +++ b/include/libssh/session.h @@ -57,6 +57,7 @@ enum ssh_pending_call_e { SSH_PENDING_CALL_AUTH_PASSWORD, SSH_PENDING_CALL_AUTH_OFFER_PUBKEY, SSH_PENDING_CALL_AUTH_PUBKEY, + SSH_PENDING_CALL_AUTH_AGENT }; /* libssh calls may block an undefined amount of time */ diff --git a/src/auth.c b/src/auth.c index 624c278..34d7aa5 100644 --- a/src/auth.c +++ b/src/auth.c @@ -778,7 +778,7 @@ static int ssh_userauth_agent_publickey(ssh_session session, switch(session->pending_call_state) { case SSH_PENDING_CALL_NONE: break; - case SSH_PENDING_CALL_AUTH_PUBKEY: + case SSH_PENDING_CALL_AUTH_AGENT: goto pending; default: ssh_set_error(session, @@ -883,7 +883,7 @@ static int ssh_userauth_agent_publickey(ssh_session session, } session->auth_state = SSH_AUTH_STATE_NONE; - session->pending_call_state = SSH_PENDING_CALL_AUTH_PUBKEY; + session->pending_call_state = SSH_PENDING_CALL_AUTH_AGENT; rc = packet_send(session); if (rc == SSH_ERROR) { return SSH_AUTH_ERROR; -- cgit