Merge pull request #7295 from baude/msiremotefixes

podman-remote fixes for msi and client

2 files changed, 12 insertions, 2 deletions

diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 2aa7267c2..dd9c75ece 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -290,6 +290,7 @@ func resolveDestination() (string, string) {
 
 	cfg, err := config.ReadCustomConfig()
 	if err != nil {
+		logrus.Warning(errors.Wrap(err, "unable to read local containers.conf"))
 		return registry.DefaultAPIAddress(), ""
 	}
 
diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go
index 89cea10ca..af13b970c 100644
--- a/cmd/podman/system/connection/add.go
+++ b/cmd/podman/system/connection/add.go
@@ -124,6 +124,7 @@ func add(cmd *cobra.Command, args []string) error {
 		cfg.Engine.ServiceDestinations = map[string]config.Destination{
 			args[0]: dst,
 		}
+		cfg.Engine.ActiveService = args[0]
 	} else {
 		cfg.Engine.ServiceDestinations[args[0]] = dst
 	}
@@ -181,12 +182,20 @@ func getUDS(cmd *cobra.Command, uri *url.URL) (string, error) {
 		authMethods = append(authMethods, ssh.PublicKeysCallback(a.Signers))
 	}
 
-	config := &ssh.ClientConfig{
+	if len(authMethods) == 0 {
+		pass, err := terminal.ReadPassword(fmt.Sprintf("%s's login password:", uri.User.Username()))
+		if err != nil {
+			return "", err
+		}
+		authMethods = append(authMethods, ssh.Password(string(pass)))
+	}
+
+	cfg := &ssh.ClientConfig{
 		User:            uri.User.Username(),
 		Auth:            authMethods,
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 	}
-	dial, err := ssh.Dial("tcp", uri.Host, config)
+	dial, err := ssh.Dial("tcp", uri.Host, cfg)
 	if err != nil {
 		return "", errors.Wrapf(err, "failed to connect to %q", uri.Host)
 	}