mirror of
https://git.libssh.org/projects/libssh.git
synced 2025-11-30 13:01:23 +03:00
SSH1: Update a few fix from 0.4.8-git
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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)");
|
||||
|
||||
Reference in New Issue
Block a user