self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 02:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

--cluster flag was ignored for tsh join

Browse source 
Looks like `client.ConnectToNode()` always needs to be given the site name as
in "host:port@site" format. We do this for SSH, but forgot to do this
for Join.

Fixes #504
This commit is contained in:
Ev Kontsevoy 2016-08-17 17:30:10 -07:00
parent 2f60436d5f
commit 4ce8d5db0d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/client/api.go
View file

@ -409,7 +409,11 @@ func (tc *TeleportClient) Join(sessionID session.ID, input io.Reader) (err error
return trace.NotFound(notFoundErrorMessage)
}
// connect to server:
nc, err := proxyClient.ConnectToNode(node.Addr, tc.Config.HostLogin)
fullNodeAddr := node.Addr
if tc.SiteName != "" {
fullNodeAddr = fmt.Sprintf("%s@%s", node.Addr, tc.SiteName)
}
nc, err := proxyClient.ConnectToNode(fullNodeAddr, tc.Config.HostLogin)
if err != nil {
return trace.Wrap(err)
}