aboutsummaryrefslogtreecommitdiff
path: root/src/auth.c
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2011-09-02 14:09:12 +0300
committerAris Adamantiadis <aris@0xbadc0de.be>2011-09-02 14:09:12 +0300
commit7e5f1edcb4ac5dd1e4a56c017796b855dd2a498e (patch)
treeee1f54824f2f700b04a008e00ed40ef809334080 /src/auth.c
parent20f8e73e3eaf8d7f69786db3f6385095e244e85c (diff)
downloadlibssh-7e5f1edcb4ac5dd1e4a56c017796b855dd2a498e.tar.gz
libssh-7e5f1edcb4ac5dd1e4a56c017796b855dd2a498e.tar.xz
libssh-7e5f1edcb4ac5dd1e4a56c017796b855dd2a498e.zip
auth: fix things broken during merge
Diffstat (limited to 'src/auth.c')
-rw-r--r--src/auth.c28
1 files changed, 4 insertions, 24 deletions
diff --git a/src/auth.c b/src/auth.c
index fb70cd2a..f56bad34 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -88,24 +88,15 @@ static int ssh_userauth_request_service(ssh_session session)
return rc;
}
-static int auth_status_termination(void *user) {
- ssh_session session = (ssh_session) user;
-
- switch(session->auth_state) {
+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;
- case SSH_AUTH_STATE_PARTIAL:
- 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:
+ default:
return 1;
}
-
- /* should never been reached */
- return 1;
}
/**
@@ -317,17 +308,6 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_pk_ok){
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.
*