lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00
Code Activity

auth: fix things broken during merge

Browse Source
This commit is contained in:
Aris Adamantiadis
2011-09-02 14:09:12 +03:00
parent 20f8e73e3e
commit 7e5f1edcb4
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/auth.c
View File

@@ -88,24 +88,15 @@ static int ssh_userauth_request_service(ssh_session session)
return rc; return rc;
} }
static int auth_status_termination(void *user) { static int auth_status_termination(void *user){
ssh_session session = (ssh_session) user; ssh_session session=(ssh_session)user;
switch(session->auth_state){
switch(session->auth_state) {
case SSH_AUTH_STATE_NONE: case SSH_AUTH_STATE_NONE:
case SSH_AUTH_STATE_KBDINT_SENT: case SSH_AUTH_STATE_KBDINT_SENT:
return 0; return 0;
case SSH_AUTH_STATE_PARTIAL: default:
case SSH_AUTH_STATE_SUCCESS:
case SSH_AUTH_STATE_INFO:
case SSH_AUTH_STATE_FAILED:
case SSH_AUTH_STATE_ERROR:
case SSH_AUTH_STATE_PK_OK:
return 1; return 1;
} }
/* should never been reached */
return 1;
} }
/** /**
@@ -317,17 +308,6 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_pk_ok){
return rc; return rc;
} }
static int auth_status_termination(void *user){
ssh_session session=(ssh_session)user;
switch(session->auth_state){
case SSH_AUTH_STATE_NONE:
case SSH_AUTH_STATE_KBDINT_SENT:
return 0;
default:
return 1;
}
}
/** /**
* @brief Get available authentication methods from the server. * @brief Get available authentication methods from the server.
* *

2
src/channels.c
View File

@@ -1241,7 +1241,7 @@ int channel_write_common(ssh_channel channel, const void *data,
#ifdef WITH_SSH1 #ifdef WITH_SSH1
if (channel->version == 1) { if (channel->version == 1) {
int rc = channel_write1(channel, data, len); rc = channel_write1(channel, data, len);
leave_function(); leave_function();
return rc; return rc;
} }