From e5558cd0c52b3cdf70d14911ad4b8dbbf08979c5 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 20 Dec 2018 17:46:18 +0100 Subject: [PATCH] SSH: Shorten the path name of the control socket The maximum path length for a UNIX domain socket is much lower than for other file types. Fixes: QTCREATORBUG-21748 Change-Id: I5e27169f356d7a2960a817e308a1f5d4858b6f7d Reviewed-by: James McDonnell --- src/libs/ssh/sshconnection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp index b507f3c20c0..52db107dc93 100644 --- a/src/libs/ssh/sshconnection.cpp +++ b/src/libs/ssh/sshconnection.cpp @@ -108,7 +108,7 @@ struct SshConnection::SshConnectionPrivate QString socketFilePath() const { QTC_ASSERT(masterSocketDir, return QString()); - return masterSocketDir->path() + "/control_socket"; + return masterSocketDir->path() + "/cs"; } QStringList connectionOptions() const @@ -352,7 +352,7 @@ void SshConnection::doConnectToHost() if (!d->sharingEnabled) emitConnected(); QTC_ASSERT(TemporaryDirectory::masterTemporaryDirectory(), return); - d->masterSocketDir.reset(new TemporaryDirectory("qtc-ssh-XXXXXX")); + d->masterSocketDir.reset(new TemporaryDirectory("ssh-XXXXXX")); if (!d->masterSocketDir->isValid()) { emitError(tr("Cannot establish SSH connection: Failed to create temporary " "directory for control socket: %1")