From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 14 Jul 2011 17:45:45 +0000 (+0100)
Subject: activation-helper: check_permissions: in the test build, don't have unused variables
X-Git-Tag: dbus-1.5.8~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b03841dbc4e707bffede1995b5055757f0a66c0a;p=thirdparty%2Fdbus.git

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>
---

diff --git a/bus/activation-helper.c b/bus/activation-helper.c
index baba8f049..b7ea6867e 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)