diff options
Diffstat (limited to 'bus/apparmor.c')
| -rw-r--r-- | bus/apparmor.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/bus/apparmor.c b/bus/apparmor.c index 072e2edf..a1b3621a 100644 --- a/bus/apparmor.c +++ b/bus/apparmor.c @@ -106,30 +106,6 @@ bus_apparmor_confinement_new (char *label, } 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) { #ifdef HAVE_LIBAUDIT @@ -553,6 +529,30 @@ bus_apparmor_enabled (void) } 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) { #ifdef HAVE_APPARMOR |