From 21822e9d7ded722048a3cad7b9121c3ce71089ba Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 16 Feb 2015 15:28:28 +0000 Subject: [PATCH 11/31] fix: _bus_apparmor_aa_supports_dbus: document necessary kernel API guarantee --- bus/apparmor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bus/apparmor.c b/bus/apparmor.c index 94366f0..d171833 100644 --- a/bus/apparmor.c +++ b/bus/apparmor.c @@ -97,6 +97,11 @@ _bus_apparmor_aa_supports_dbus (void) if (aa_find_mountpoint (&aa_securityfs) != 0) goto out; + /* + * John Johansen has confirmed that the mainline kernel will not have + * the apparmorfs/features/dbus/mask file until the mainline kernel + * has AppArmor getpeersec support. + */ if (!_dbus_string_append (&aa_dbus, aa_securityfs) || !_dbus_string_append (&aa_dbus, "/features/dbus/mask")) goto out; -- 2.1.4