diff options
| author | Orgad Shaneh <[email protected]> | 2012-10-10 20:34:00 +0200 |
|---|---|---|
| committer | Christian Kandeler <[email protected]> | 2012-10-11 14:15:05 +0200 |
| commit | 530ebc4b0b87816aad6959bf171f9641a6a02827 (patch) | |
| tree | a834e43b58bf1e4128ca9530e1b6a2e5621e86f1 /src/libs/ssh/sshconnection.cpp | |
| parent | f048e6f48e1e8e9f7b425d7a786652665d6e6658 (diff) | |
Ssh: Support older servers
Change-Id: I686fad0996f53d4904f5ac9a5b9a0f4393b50d9f
Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/libs/ssh/sshconnection.cpp')
| -rw-r--r-- | src/libs/ssh/sshconnection.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp index 82aae29cf2c..86489e3d675 100644 --- a/src/libs/ssh/sshconnection.cpp +++ b/src/libs/ssh/sshconnection.cpp @@ -390,12 +390,15 @@ void SshConnectionPrivate::handleServerId() .arg(serverProtoVersion)); } + // TODO: Remove #if on 2.7 +#if 0 // Disable this check to accept older OpenSSH servers that do this wrong. if (serverProtoVersion == QLatin1String("2.0") && !hasCarriageReturn) { throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR, "Identification string is invalid.", tr("Server identification string is invalid (missing carriage return).")); } +#endif if (serverProtoVersion == QLatin1String("1.99") && m_serverHasSentDataBeforeId) { throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR, |