try agents first (seems to be how SSH does it)

mikew · Oct 21, 2024 · d53bc1c · d53bc1c
1 parent dc44d0e
commit d53bc1c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/client/main.go b/src/client/main.go
@@ -370,12 +370,12 @@ func getSshClientForServer(endpoint *SshEndpoint) (*ssh.Client, error) {
 	authMethods = append(authMethods, ssh.PublicKeysCallback(func() ([]ssh.Signer, error) {
 		allSigners := []ssh.Signer{}
 
-		if identitySigner, _ := getSignerForIdentityFile(endpoint.Host); identitySigner != nil {
-			allSigners = append(allSigners, identitySigner)
+		if agentSigners, _ := getSignersForIdentityAgent(endpoint.GivenHost); agentSigners != nil {
+			allSigners = append(allSigners, agentSigners...)
 		}
 
-		if agentSigners, _ := getSignersForIdentityAgent(endpoint.Host); agentSigners != nil {
-			allSigners = append(allSigners, agentSigners...)
+		if identitySigner, _ := getSignerForIdentityFile(endpoint.GivenHost); identitySigner != nil {
+			allSigners = append(allSigners, identitySigner)
 		}
 
 		return allSigners, nil