From 44baab0a7011a87a2eaa795bc0058a13da6d1bc0 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Mon, 24 Feb 2020 21:26:16 +0100
Subject: utils: relax check for directory to use

when we use namespaces, we set the run directory to 0711 to allow
other users to access it.

without this relaxation, the /run/user/$UID directory would be
skipped.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 pkg/util/utils_supported.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go
index 0b78a8150..c6aed9943 100644
--- a/pkg/util/utils_supported.go
+++ b/pkg/util/utils_supported.go
@@ -33,7 +33,7 @@ func GetRuntimeDir() (string, error) {
 				logrus.Debugf("unable to make temp dir %s", tmpDir)
 			}
 			st, err := os.Stat(tmpDir)
-			if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && st.Mode().Perm() == 0700 {
+			if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && (st.Mode().Perm()&0700 == 0700) {
 				runtimeDir = tmpDir
 			}
 		}
@@ -43,7 +43,7 @@ func GetRuntimeDir() (string, error) {
 				logrus.Debugf("unable to make temp dir %s", tmpDir)
 			}
 			st, err := os.Stat(tmpDir)
-			if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && st.Mode().Perm() == 0700 {
+			if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && (st.Mode().Perm()&0700 == 0700) {
 				runtimeDir = tmpDir
 			}
 		}
-- 
cgit v1.2.3-54-g00ecf


From 1e94c2964d517ca4840ff5fa7ae1fd76753642de Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Mon, 24 Feb 2020 21:52:38 +0100
Subject: build: move initialization after SetXdgDirs

otherwise it triggers the config file initialization from
vendor/github.com/containers/common/pkg/config before the init() in
main.go can set correctly XDG_RUNTIME_DIR and DBUS_SESSION_BUS_ADDRESS
when they are missing.

commit 96de762eedd1470dfbe73cf424eea848589268d7 introduced the
regression.

Closes: https://github.com/containers/libpod/issues/5314

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 cmd/podman/build.go |  3 +--
 cmd/podman/main.go  | 16 ++++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/cmd/podman/build.go b/cmd/podman/build.go
index 12aedac37..fa4689211 100644
--- a/cmd/podman/build.go
+++ b/cmd/podman/build.go
@@ -53,13 +53,12 @@ var (
 	}
 )
 
-func init() {
+func initBuild() {
 	buildCommand.Command = _buildCommand
 	buildCommand.SetHelpTemplate(HelpTemplate())
 	buildCommand.SetUsageTemplate(UsageTemplate())
 	flags := buildCommand.Flags()
 	flags.SetInterspersed(true)
-
 	budFlags := buildahcli.GetBudFlags(&budFlagsValues)
 	flag := budFlags.Lookup("pull")
 	if err := flag.Value.Set("true"); err != nil {
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index a22b01f24..3320ab72f 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -83,7 +83,7 @@ var rootCmd = &cobra.Command{
 
 var MainGlobalOpts cliconfig.MainFlags
 
-func init() {
+func initCobra() {
 	cobra.OnInitialize(initConfig)
 	rootCmd.TraverseChildren = true
 	rootCmd.Version = version.Version
@@ -94,16 +94,20 @@ func init() {
 	rootCmd.AddCommand(getMainCommands()...)
 }
 
-func initConfig() {
-	//	we can do more stuff in here.
-}
-
-func before(cmd *cobra.Command, args []string) error {
+func init() {
 	if err := libpod.SetXdgDirs(); err != nil {
 		logrus.Errorf(err.Error())
 		os.Exit(1)
 	}
+	initBuild()
+	initCobra()
+}
+
+func initConfig() {
+	//	we can do more stuff in here.
+}
 
+func before(cmd *cobra.Command, args []string) error {
 	//	Set log level; if not log-level is provided, default to error
 	logLevel := MainGlobalOpts.LogLevel
 	if logLevel == "" {
-- 
cgit v1.2.3-54-g00ecf