safcm: don't hang on error before a connection is established

[safcm/safcm.git] / cmd / safcm / sync.go

diff --git a/cmd/safcm/sync.go b/cmd/safcm/sync.go
index 0f7c54ff309f360ac0e0bc9cbe4071a467c7c02b..1a482b3dd958c274f5fad95a03114596df959d14 100644 (file)
--- a/cmd/safcm/sync.go
+++ b/cmd/safcm/sync.go
@@ -370,8 +370,17 @@ func (s *Sync) Host(wg *sync.WaitGroup) error {
        }()
 
        // Connect to remote host
-       err := conn.DialSSH(s.host.SshUser, s.host.Name, s.config.SshConfig)
+       user := s.host.SshUser
+       if user == "" {
+               user = s.config.SshUser
+       }
+       err := conn.DialSSH(rpc.SSHConfig{
+               Host:      s.host.Name,
+               User:      user,
+               SshConfig: s.config.SshConfig,
+       })
        if err != nil {
+               conn.Kill()
                return err
        }
        defer conn.Kill()