summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-07-14 18:45:45 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-08-05 12:26:57 +0100
commitb03841dbc4e707bffede1995b5055757f0a66c0a (patch)
tree30da11a2f9a2bfa636fe537c5815a2304705f1b5
parente9508bf5af6fd5d618bbbb0e1a8c7791a26e3acc (diff)
downloaddbus-b03841dbc4e707bffede1995b5055757f0a66c0a.tar.gz
activation-helper: check_permissions: in the test build, don't have unused variables
In the real build they're used to check permissions. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231 Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
-rw-r--r--bus/activation-helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bus/activation-helper.c b/bus/activation-helper.c
index baba8f04..b7ea6867 100644
--- a/bus/activation-helper.c
+++ b/bus/activation-helper.c
@@ -184,6 +184,7 @@ clear_environment (DBusError *error)
static dbus_bool_t
check_permissions (const char *dbus_user, DBusError *error)
{
+#ifndef ACTIVATION_LAUNCHER_TEST
uid_t uid, euid;
struct passwd *pw;
@@ -191,7 +192,6 @@ check_permissions (const char *dbus_user, DBusError *error)
uid = 0;
euid = 0;
-#ifndef ACTIVATION_LAUNCHER_TEST
/* bail out unless the dbus user is invoking the helper */
pw = getpwnam(dbus_user);
if (!pw)