diff options
| author | Colin Walters <walters@verbum.org> | 2012-09-28 15:31:05 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2012-09-28 15:31:05 -0400 |
| commit | dcee0dd7c0a80b35d92712024507929303b9f07a (patch) | |
| tree | 45b19b0580b0d221e6a4792f065372145ca05098 | |
| parent | 819eb8a9f5c852af3b5dca2bbea3b434d9d06404 (diff) | |
| download | dbus-dcee0dd7c0a80b35d92712024507929303b9f07a.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.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 3a06bb0c..f2107956 100644 --- a/configure.ac +++ b/configure.ac @@ -596,7 +596,7 @@ AC_DEFINE_UNQUOTED([DBUS_USE_SYNC], [$have_sync], [Use the gcc __sync extension] AC_SEARCH_LIBS(socket,[socket network]) AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) -AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull issetugid getresuid secure_getenv __secure_getenv ) +AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull issetugid getresuid) AC_CHECK_HEADERS([syslog.h]) if test "x$ac_cv_header_syslog_h" = "xyes"; then 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 } /** |