summaryrefslogtreecommitdiff
path: root/dbus/dbus-sysdeps.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2012-09-28 15:31:05 -0400
committerColin Walters <walters@verbum.org>2012-09-28 16:16:33 -0400
commit19fa7c547fb0ae4f7a2190f7978627fa4f48aedf (patch)
treee1717dadcd9ab9d4100c969f19d576c5f2277562 /dbus/dbus-sysdeps.c
parentf68dbdc3e6f895012ce33939fb524accf31bcca5 (diff)
downloaddbus-19fa7c547fb0ae4f7a2190f7978627fa4f48aedf.tar.gz
Revert "hardening: Use __secure_getenv if available"
It breaks gnome-keyring-daemon at least in some configurations; see https://bugs.freedesktop.org/show_bug.cgi?id=52202#c24 This reverts commit 1a556443757b19fee67ef4441141246dd9cfed4f.
Diffstat (limited to 'dbus/dbus-sysdeps.c')
-rw-r--r--dbus/dbus-sysdeps.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 976c7e4b..04fb8d76 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -182,18 +182,12 @@ _dbus_setenv (const char *varname,
const char*
_dbus_getenv (const char *varname)
{
-#if defined(HAVE_SECURE_GETENV)
- return secure_getenv (varname);
-#elif defined(HAVE___SECURE_GETENV)
- return __secure_getenv (varname);
-#else
/* Don't respect any environment variables if the current process is
* setuid. This is the equivalent of glibc's __secure_getenv().
*/
if (_dbus_check_setuid ())
return NULL;
return getenv (varname);
-#endif
}
/**