SSH1: Update a few fix from 0.4.8-git
Этот коммит содержится в:
родитель
00d68d63fa
Коммит
c1ecec7cda
@ -500,7 +500,7 @@ int ssh_userauth_offer_pubkey(ssh_session session, const char *username,
|
|||||||
|
|
||||||
#ifdef WITH_SSH1
|
#ifdef WITH_SSH1
|
||||||
if (session->version == 1) {
|
if (session->version == 1) {
|
||||||
ssh_userauth1_offer_pubkey(session, username, type, publickey);
|
rc = ssh_userauth1_offer_pubkey(session, username, type, publickey);
|
||||||
leave_function();
|
leave_function();
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -509,8 +509,10 @@ static void ssh_client_connection_callback(ssh_session session){
|
|||||||
/* Here we decide which version of the protocol to use. */
|
/* Here we decide which version of the protocol to use. */
|
||||||
if (ssh2 && session->ssh2) {
|
if (ssh2 && session->ssh2) {
|
||||||
session->version = 2;
|
session->version = 2;
|
||||||
|
#ifdef WITH_SSH1
|
||||||
} else if(ssh1 && session->ssh1) {
|
} else if(ssh1 && session->ssh1) {
|
||||||
session->version = 1;
|
session->version = 1;
|
||||||
|
#endif
|
||||||
} else if(ssh1 && !session->ssh1){
|
} else if(ssh1 && !session->ssh1){
|
||||||
#ifdef WITH_SSH1
|
#ifdef WITH_SSH1
|
||||||
ssh_set_error(session, SSH_FATAL,
|
ssh_set_error(session, SSH_FATAL,
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user