From c1ecec7cda805908dff0b40fb888628630231823 Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Wed, 26 Jan 2011 22:50:05 +0100
Subject: SSH1: Update a few fix from 0.4.8-git

---
 src/auth.c   | 2 +-
 src/client.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

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)");
-- 
cgit v1.2.3