3 files changed, 17 insertions, 13 deletions
diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go
index df35c0d6b..b5538efc3 100644
--- a/pkg/rootless/rootless.go
+++ b/pkg/rootless/rootless.go
@@ -61,9 +61,9 @@ var (
 	gidMapOnce  sync.Once
 )
 
-// GetAvailableUidMap returns the UID mappings in the
+// GetAvailableUIDMap returns the UID mappings in the
 // current user namespace.
-func GetAvailableUidMap() ([]user.IDMap, error) {
+func GetAvailableUIDMap() ([]user.IDMap, error) {
 	uidMapOnce.Do(func() {
 		var err error
 		uidMap, err = user.ParseIDMapFile("/proc/self/uid_map")
@@ -75,9 +75,9 @@ func GetAvailableUidMap() ([]user.IDMap, error) {
 	return uidMap, uidMapError
 }
 
-// GetAvailableGidMap returns the GID mappings in the
+// GetAvailableGIDMap returns the GID mappings in the
 // current user namespace.
-func GetAvailableGidMap() ([]user.IDMap, error) {
+func GetAvailableGIDMap() ([]user.IDMap, error) {
 	gidMapOnce.Do(func() {
 		var err error
 		gidMap, err = user.ParseIDMapFile("/proc/self/gid_map")
@@ -92,11 +92,11 @@ func GetAvailableGidMap() ([]user.IDMap, error) {
 // GetAvailableIDMaps returns the UID and GID mappings in the
 // current user namespace.
 func GetAvailableIDMaps() ([]user.IDMap, []user.IDMap, error) {
-	u, err := GetAvailableUidMap()
+	u, err := GetAvailableUIDMap()
 	if err != nil {
 		return nil, nil, err
 	}
-	g, err := GetAvailableGidMap()
+	g, err := GetAvailableGIDMap()
 	if err != nil {
 		return nil, nil, err
 	}
@@ -114,7 +114,7 @@ func countAvailableIDs(mappings []user.IDMap) int64 {
 // GetAvailableUids returns how many UIDs are available in the
 // current user namespace.
 func GetAvailableUids() (int64, error) {
-	uids, err := GetAvailableUidMap()
+	uids, err := GetAvailableUIDMap()
 	if err != nil {
 		return -1, err
 	}
@@ -125,7 +125,7 @@ func GetAvailableUids() (int64, error) {
 // GetAvailableGids returns how many GIDs are available in the
 // current user namespace.
 func GetAvailableGids() (int64, error) {
-	gids, err := GetAvailableGidMap()
+	gids, err := GetAvailableGIDMap()
 	if err != nil {
 		return -1, err
 	}
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
index 2e1fddc48..d93e4c10c 100644
--- a/pkg/rootless/rootless_linux.c
+++ b/pkg/rootless/rootless_linux.c
@@ -196,7 +196,11 @@ can_use_shortcut ()
     return false;
 
   if (strstr (argv[0], "podman") == NULL)
-    return false;
+    {
+      free (argv[0]);
+      free (argv);
+      return false;
+    }
 
   for (argc = 0; argv[argc]; argc++)
     {
@@ -394,7 +398,7 @@ static void __attribute__((constructor)) init()
 
       if (chdir (cwd) < 0)
         {
-          fprintf (stderr, "cannot chdir: %s\n", strerror (errno));
+          fprintf (stderr, "cannot chdir to %s: %s\n", cwd, strerror (errno));
           _exit (EXIT_FAILURE);
         }
 
@@ -685,7 +689,7 @@ reexec_userns_join (int pid_to_join, char *pause_pid_file_path)
 
   if (chdir (cwd) < 0)
     {
-      fprintf (stderr, "cannot chdir: %s\n", strerror (errno));
+      fprintf (stderr, "cannot chdir to %s: %s\n", cwd, strerror (errno));
       _exit (EXIT_FAILURE);
     }
   free (cwd);
@@ -889,7 +893,7 @@ reexec_in_user_namespace (int ready, char *pause_pid_file_path, char *file_to_re
 
   if (chdir (cwd) < 0)
     {
-      fprintf (stderr, "cannot chdir: %s\n", strerror (errno));
+      fprintf (stderr, "cannot chdir to %s: %s\n", cwd, strerror (errno));
       TEMP_FAILURE_RETRY (write (ready, "1", 1));
       _exit (EXIT_FAILURE);
     }
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index d4b1a0dfd..dda230dbc 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -16,7 +16,7 @@ import (
 	"sync"
 	"unsafe"
 
-	"github.com/containers/podman/v2/pkg/errorhandling"
+	"github.com/containers/podman/v3/pkg/errorhandling"
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"