diff options
author | Colin Walters <walters@verbum.org> | 2012-09-28 12:01:56 -0400 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2012-09-28 16:19:39 -0400 |
commit | 6115b97f8505a473590de31b0c3a75559c0ca2c4 (patch) | |
tree | 01741c9335279d32b62250d35ca9b449149f9a5f | |
parent | f2c505f24f46d316df9ba5022c17062b9bd7939b (diff) |
hardening: Remove activation helper handling for DBUS_VERBOSE
It's not really useful.
See https://bugs.freedesktop.org/show_bug.cgi?id=52202#c17
Conflicts:
bus/activation-helper.c
-rw-r--r-- | bus/activation-helper.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/bus/activation-helper.c b/bus/activation-helper.c index baba8f04..bc5ed07b 100644 --- a/bus/activation-helper.c +++ b/bus/activation-helper.c @@ -140,18 +140,12 @@ out_all: return desktop_file; } -/* Cleares the environment, except for DBUS_VERBOSE and DBUS_STARTER_x */ +/* Clears the environment, except for DBUS_STARTER_x */ static dbus_bool_t clear_environment (DBusError *error) { - const char *debug_env = NULL; const char *starter_env = NULL; -#ifdef DBUS_ENABLE_VERBOSE_MODE - /* are we debugging */ - debug_env = _dbus_getenv ("DBUS_VERBOSE"); -#endif - /* we save the starter */ starter_env = _dbus_getenv ("DBUS_STARTER_ADDRESS"); @@ -165,12 +159,6 @@ clear_environment (DBusError *error) } #endif -#ifdef DBUS_ENABLE_VERBOSE_MODE - /* restore the debugging environment setting if set */ - if (debug_env) - _dbus_setenv ("DBUS_VERBOSE", debug_env); -#endif - /* restore the starter */ if (starter_env) _dbus_setenv ("DBUS_STARTER_ADDRESS", starter_env); |