docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1370 from nathanleclaire/fix_native_ssh_detection 

Fix defaulting to native SSH
This commit is contained in:
Evan Hazlett 2015-06-16 14:45:52 -04:00
parent d3d6454b52 af149d13f7
commit 3b29502a9d
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssh/client.go
View File

@ -73,10 +73,7 @@ func SetDefaultClient(clientType SSHClientType) {
func NewClient(user string, host string, port int, auth *Auth) (Client, error) {
sshBinaryPath, err := exec.LookPath("ssh")
if err != nil {
if defaultClientType == External {
log.Fatal("Requested shellout SSH client type but no ssh binary available")
}
log.Debug("ssh binary not found, using native Go implementation")
log.Debug("SSH binary not found, using native Go implementation")
return NewNativeClient(user, host, port, auth)
}