Commit 5872c6f7 authored by Tyler Hicks's avatar Tyler Hicks Committed by Simon McVittie

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=75113Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
Reviewed-by: default avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
parent 3a10304a
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment