Ssh: Support older servers

Change-Id: I686fad0996f53d4904f5ac9a5b9a0f4393b50d9f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Ssh: Support older servers
Change-Id: I686fad0996f53d4904f5ac9a5b9a0f4393b50d9f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
530ebc4b · Orgad Shaneh · Christian Kandeler · f048e6f4 · 530ebc4b
Commit 530ebc4b authored Oct 10, 2012 by Orgad Shaneh Committed by Christian Kandeler Oct 11, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

src/libs/ssh/sshconnection.cpp src/libs/ssh/sshconnection.cpp +3 -0

No files found.
--- 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,