projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added NameList method handling, small improvemnets and cleanups
[platform/upstream/dbus.git]
/
dbus
/
dbus-sysdeps.c
diff --git
a/dbus/dbus-sysdeps.c
b/dbus/dbus-sysdeps.c
index
861bfec
..
0fbf9e7
100644
(file)
--- a/
dbus/dbus-sysdeps.c
+++ b/
dbus/dbus-sysdeps.c
@@
-46,10
+46,6
@@
#include <errno.h>
#endif
#include <errno.h>
#endif
-_DBUS_DEFINE_GLOBAL_LOCK (win_fds);
-_DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
-_DBUS_DEFINE_GLOBAL_LOCK (system_users);
-
#ifdef DBUS_WIN
#include <stdlib.h>
#elif (defined __APPLE__)
#ifdef DBUS_WIN
#include <stdlib.h>
#elif (defined __APPLE__)
@@
-182,6
+178,11
@@
_dbus_setenv (const char *varname,
const char*
_dbus_getenv (const char *varname)
{
const char*
_dbus_getenv (const char *varname)
{
+ /* 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);
}
return getenv (varname);
}