4 files changed, 20 insertions, 17 deletions
diff --git a/cmd/podman/images.go b/cmd/podman/images.go
index 1c46571c3..3f755efc1 100644
--- a/cmd/podman/images.go
+++ b/cmd/podman/images.go
@@ -362,7 +362,7 @@ func CreateFilterFuncs(ctx context.Context, r *adapter.LocalRuntime, filters []s
 	var filterFuncs []imagefilters.ResultFilter
 	for _, filter := range filters {
 		splitFilter := strings.Split(filter, "=")
-		if len(splitFilter) != 2 {
+		if len(splitFilter) < 2 {
 			return nil, errors.Errorf("invalid filter syntax %s", filter)
 		}
 		switch splitFilter[0] {
diff --git a/cmd/podman/info.go b/cmd/podman/info.go
index a6fce7fcb..823303354 100644
--- a/cmd/podman/info.go
+++ b/cmd/podman/info.go
@@ -10,6 +10,7 @@ import (
 	"github.com/containers/libpod/pkg/adapter"
 	"github.com/containers/libpod/version"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -60,7 +61,16 @@ func infoCmd(c *cliconfig.InfoValues) error {
 	if err != nil {
 		return errors.Wrapf(err, "error getting info")
 	}
+
 	if runtime.Remote {
+		endpoint, err := runtime.RemoteEndpoint()
+		if err != nil {
+			logrus.Errorf("Failed to obtain server connection: %s", err.Error())
+		} else {
+			remoteClientInfo["Connection"] = endpoint.Connection
+			remoteClientInfo["Connection Type"] = endpoint.Type.String()
+		}
+
 		remoteClientInfo["RemoteAPI Version"] = version.RemoteAPIVersion
 		remoteClientInfo["Podman Version"] = version.Version
 		remoteClientInfo["OS Arch"] = fmt.Sprintf("%s/%s", rt.GOOS, rt.GOARCH)
diff --git a/cmd/podman/login.go b/cmd/podman/login.go
index 6bf148cca..9f9631d0d 100644
--- a/cmd/podman/login.go
+++ b/cmd/podman/login.go
@@ -74,21 +74,6 @@ func loginCmd(c *cliconfig.LoginValues) error {
 		sc.DockerCertPath = c.CertDir
 	}
 
-	if c.Flag("get-login").Changed {
-		user, err := config.GetUserLoggedIn(sc, server)
-
-		if err != nil {
-			return errors.Wrapf(err, "unable to check for login user")
-		}
-
-		if user == "" {
-			return errors.Errorf("not logged into %s", server)
-		}
-
-		fmt.Printf("%s\n", user)
-		return nil
-	}
-
 	// username of user logged in to server (if one exists)
 	userFromAuthFile, passFromAuthFile, err := config.GetAuthentication(sc, server)
 	// Do not return error if no credentials found in credHelpers, new credentials will be stored by config.SetAuthentication
@@ -96,6 +81,14 @@ func loginCmd(c *cliconfig.LoginValues) error {
 		return errors.Wrapf(err, "error reading auth file")
 	}
 
+	if c.Flag("get-login").Changed {
+		if userFromAuthFile == "" {
+			return errors.Errorf("not logged into %s", server)
+		}
+		fmt.Printf("%s\n", userFromAuthFile)
+		return nil
+	}
+
 	ctx := getContext()
 
 	password := c.Password
diff --git a/cmd/podman/runlabel.go b/cmd/podman/runlabel.go
index c426817de..e87b88992 100644
--- a/cmd/podman/runlabel.go
+++ b/cmd/podman/runlabel.go
@@ -152,7 +152,7 @@ func runlabelCmd(c *cliconfig.RunlabelValues) error {
 		return err
 	}
 	if !c.Quiet {
-		fmt.Printf("command: %s\n", strings.Join(cmd, " "))
+		fmt.Printf("command: %s\n", strings.Join(append([]string{os.Args[0]}, cmd[1:]...), " "))
 		if c.Display {
 			return nil
 		}