diff options
| author | Colin Walters <walters@verbum.org> | 2012-09-28 12:01:56 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2012-09-28 12:55:38 -0400 |
| commit | 9a0c289be67735870d208e2dca2b679da0c31c41 (patch) | |
| tree | 882f434ed2d4d69fc91617ffafe83ecda7fa7cd0 | |
| parent | d7ffad72146c2329692e0cf32eb1ac1dbb4fb51c (diff) | |
| download | dbus-9a0c289be67735870d208e2dca2b679da0c31c41.tar.gz | |
hardening: Remove activation helper handling for DBUS_VERBOSE
It's not really useful.
See https://bugs.freedesktop.org/show_bug.cgi?id=52202#c17
| -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 ab9d6010..7864e0fe 100644 --- a/bus/activation-helper.c +++ b/bus/activation-helper.c @@ -140,17 +140,11 @@ 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 *starter_env = NULL; -#ifdef DBUS_ENABLE_VERBOSE_MODE - const char *debug_env = NULL; - - /* 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); |