From: Colin Walters <walters@verbum.org>
Date: Fri, 28 Sep 2012 19:31:47 +0000 (-0400)
Subject: Revert "hardening: Use __secure_getenv() in *addition* to _dbus_check_setuid()"
X-Git-Tag: dbus-1.7.0~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7495461fe6b48b4070452ed8640fbc4888f1210;p=thirdparty%2Fdbus.git

Revert "hardening: Use __secure_getenv() in *addition* to _dbus_check_setuid()"

Follow to reverting a556443757b19fee67ef4441141246dd9cfed4f.
See https://bugs.freedesktop.org/show_bug.cgi?id=52202#c24

This reverts commit d7ffad72146c2329692e0cf32eb1ac1dbb4fb51c.
---

diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index 2516bc34e..3b9ce3150 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -718,12 +718,6 @@ _dbus_keyring_new_for_credentials (DBusCredentials  *credentials,
   
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 
-  if (_dbus_getenv ("HOME") == NULL)
-    {
-      dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
-                            "Unable to create DBus keyring with no $HOME");
-      return FALSE;
-    }
   if (_dbus_check_setuid ())
     {
       dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 6fa5bcb6f..b4ecc96e7 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -3434,12 +3434,6 @@ _dbus_get_autolaunch_address (const char *scope,
   DBusString uuid;
   dbus_bool_t retval;
 
-  if (_dbus_getenv ("PATH") == NULL)
-    {
-      dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
-                            "Unable to autolaunch when PATH is unset");
-      return FALSE;
-    }
   if (_dbus_check_setuid ())
     {
       dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,