File dbus-cve-2012-3524-3.patch of Package dbus-1.openSUSE_12.2_Update
From 57ae3670508bbf4ec57049de47c9cae727a64802 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 28 Sep 2012 16:01:56 +0000
Subject: hardening: Remove activation helper handling for DBUS_VERBOSE
It's not really useful.
See https://bugs.freedesktop.org/show_bug.cgi?id=52202#c17
---
diff --git a/bus/activation-helper.c b/bus/activation-helper.c
index ab9d601..7864e0f 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);
--
cgit v0.9.0.2-2-gbebe