feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Ssh: Support older servers

Browse Source 
Change-Id: I686fad0996f53d4904f5ac9a5b9a0f4393b50d9f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Orgad Shaneh
2012-10-10 20:34:00 +02:00
committed by Christian Kandeler
parent f048e6f48e
commit 530ebc4b0b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/ssh/sshconnection.cpp
View File

@@ -390,12 +390,15 @@ void SshConnectionPrivate::handleServerId()
.arg(serverProtoVersion)); .arg(serverProtoVersion));
} }
// TODO: Remove #if on 2.7
#if 0
// Disable this check to accept older OpenSSH servers that do this wrong. // Disable this check to accept older OpenSSH servers that do this wrong.
if (serverProtoVersion == QLatin1String("2.0") && !hasCarriageReturn) { if (serverProtoVersion == QLatin1String("2.0") && !hasCarriageReturn) {
throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR, throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR,
"Identification string is invalid.", "Identification string is invalid.",
tr("Server identification string is invalid (missing carriage return).")); tr("Server identification string is invalid (missing carriage return)."));
} }
#endif
if (serverProtoVersion == QLatin1String("1.99") && m_serverHasSentDataBeforeId) { if (serverProtoVersion == QLatin1String("1.99") && m_serverHasSentDataBeforeId) {
throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR, throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR,