From c7495461fe6b48b4070452ed8640fbc4888f1210 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 28 Sep 2012 15:31:47 -0400 Subject: [PATCH] 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. --- dbus/dbus-keyring.c | 6 ------ dbus/dbus-sysdeps-unix.c | 6 ------ 2 files changed, 12 deletions(-) diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c index 2516bc3..3b9ce31 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 6fa5bcb..b4ecc96 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, -- 2.7.4