forked from qt-creator/qt-creator
ProjectExplorer: Do no start ssh in a new session on macOS
Fixes: QTCREATORBUG-32613 Change-Id: If131af9f6f1b87ec65ceb61882c20265bdb55504 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
@@ -93,7 +93,13 @@ void SshParameters::setupSshEnvironment(Process *process)
|
|||||||
}
|
}
|
||||||
process->setEnvironment(env);
|
process->setEnvironment(env);
|
||||||
|
|
||||||
// Otherwise, ssh will ignore SSH_ASKPASS and read from /dev/tty directly.
|
// Originally, OpenSSH used to ignore the value of SSH_ASKPASS if it had access to a terminal,
|
||||||
|
// reading instead from /dev/tty directly.
|
||||||
|
// Therefore, we needed to start the ssh process in a new session.
|
||||||
|
// Since version 8.4, we can (and do) force the use of SSH_ASKPASS via the SSH_ASKPASS_REQUIRE
|
||||||
|
// environment variable. We still create a new session for backward compatibility, but not
|
||||||
|
// on macOS, because of QTCREATORBUG-32613.
|
||||||
|
if (!HostOsInfo::isMacHost())
|
||||||
process->setDisableUnixTerminal();
|
process->setDisableUnixTerminal();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user