From b0e95e6d38e59fdf9d9c0e7f2288104279527116 Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Wed, 9 Oct 2013 09:39:43 +0800 Subject: [PATCH] Remove unnecessary dbus_setenv() DBUS_ACTIVATION_ADDRESS changed to DBUS_STARTER_ADDRESS and DBUS_ACTIVATION_BUS_TYPE changed to DBUS_STARTER_BUS_TYPE since 2005 by this commit - 8873c90 So the dbus_setenv() which used to unset the above two wrong environment variables has no effect in fact. And giving that setenv(3) and putenv(3) are not threadsafe, so it's better to remove them. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68308 --- dbus/dbus-bus.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index 9d2095f..0fd4831 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -294,12 +294,6 @@ init_connections_unlocked (void) * the above code will work right */ - if (!dbus_setenv ("DBUS_ACTIVATION_ADDRESS", NULL)) - return FALSE; - - if (!dbus_setenv ("DBUS_ACTIVATION_BUS_TYPE", NULL)) - return FALSE; - if (!_dbus_register_shutdown_func (addresses_shutdown_func, NULL)) return FALSE; -- 1.7.9.5