From 5872c6f7ff502bb993ce4fe47a4e78afd16c65c2 Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks@canonical.com>
Date: Wed, 18 Feb 2015 15:44:59 -0600
Subject: apparmor: Fix build failure with --disable-apparmor

The bus_apparmor_confinement_unref() function definition must exist even
when building with --disable-apparmor.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75113
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---
 bus/apparmor.c | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'bus')

diff --git a/bus/apparmor.c b/bus/apparmor.c
index 072e2edf..a1b3621a 100644
--- a/bus/apparmor.c
+++ b/bus/apparmor.c
@@ -105,30 +105,6 @@ bus_apparmor_confinement_new (char       *label,
   return confinement;
 }
 
-void
-bus_apparmor_confinement_unref (BusAppArmorConfinement *confinement)
-{
-#ifdef HAVE_APPARMOR
-  if (!apparmor_enabled)
-    return;
-
-  _dbus_assert (confinement != NULL);
-  _dbus_assert (confinement->refcount > 0);
-
-  confinement->refcount -= 1;
-
-  if (confinement->refcount == 0)
-    {
-      /**
-       * Do not free confinement->mode, as libapparmor does a single malloc for
-       * both confinement->label and confinement->mode.
-       */
-      free (confinement->label);
-      dbus_free (confinement);
-    }
-#endif
-}
-
 void
 bus_apparmor_audit_init (void)
 {
@@ -552,6 +528,30 @@ bus_apparmor_enabled (void)
 #endif
 }
 
+void
+bus_apparmor_confinement_unref (BusAppArmorConfinement *confinement)
+{
+#ifdef HAVE_APPARMOR
+  if (!apparmor_enabled)
+    return;
+
+  _dbus_assert (confinement != NULL);
+  _dbus_assert (confinement->refcount > 0);
+
+  confinement->refcount -= 1;
+
+  if (confinement->refcount == 0)
+    {
+      /**
+       * Do not free confinement->mode, as libapparmor does a single malloc for
+       * both confinement->label and confinement->mode.
+       */
+      free (confinement->label);
+      dbus_free (confinement);
+    }
+#endif
+}
+
 void
 bus_apparmor_confinement_ref (BusAppArmorConfinement *confinement)
 {
-- 
cgit v1.2.1