aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2011-01-26 22:50:05 +0100
committerAris Adamantiadis <aris@0xbadc0de.be>2011-01-26 22:50:05 +0100
commitc1ecec7cda805908dff0b40fb888628630231823 (patch)
tree22e59f57938b2a4de9c85adfb304ebc8abb88f38 /src
parent00d68d63fa2859fddae415f5f30201f6e65154e8 (diff)
downloadlibssh-c1ecec7cda805908dff0b40fb888628630231823.tar.gz
libssh-c1ecec7cda805908dff0b40fb888628630231823.tar.xz
libssh-c1ecec7cda805908dff0b40fb888628630231823.zip
SSH1: Update a few fix from 0.4.8-git
Diffstat (limited to 'src')
-rw-r--r--src/auth.c2
-rw-r--r--src/client.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/auth.c b/src/auth.c
index 185119f9..27fdd59b 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -500,7 +500,7 @@ int ssh_userauth_offer_pubkey(ssh_session session, const char *username,
#ifdef WITH_SSH1
if (session->version == 1) {
- ssh_userauth1_offer_pubkey(session, username, type, publickey);
+ rc = ssh_userauth1_offer_pubkey(session, username, type, publickey);
leave_function();
return rc;
}
diff --git a/src/client.c b/src/client.c
index a7ef4132..66d4a9ae 100644
--- a/src/client.c
+++ b/src/client.c
@@ -509,9 +509,11 @@ static void ssh_client_connection_callback(ssh_session session){
/* Here we decide which version of the protocol to use. */
if (ssh2 && session->ssh2) {
session->version = 2;
- } else if(ssh1 && session->ssh1) {
+#ifdef WITH_SSH1
+ } else if(ssh1 && session->ssh1) {
session->version = 1;
- } else if(ssh1 && !session->ssh1){
+#endif
+ } else if(ssh1 && !session->ssh1){
#ifdef WITH_SSH1
ssh_set_error(session, SSH_FATAL,
"SSH-1 protocol not available (configure session to allow SSH-1)");