diff options
| author | Tyler Hicks <tyhicks@canonical.com> | 2015-02-04 17:53:31 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-18 20:42:05 +0000 |
| commit | 24f1502e42b58a7c238779c023c6bfe870dc78cc (patch) | |
| tree | df05ab64c7129955498554e7d02a1577ab1b2dfb /dbus/dbus-protocol.h | |
| parent | eac45c0484edfdbf5d8d7c0b613c31dc64d2f53b (diff) | |
| download | dbus-24f1502e42b58a7c238779c023c6bfe870dc78cc.tar.gz | |
Add DBus method to return the AA context of a connection
This is not intended for upstream inclusion. It implements a bus method
(GetConnectionAppArmorSecurityContext) to get a connection's AppArmor
security context but upstream D-Bus has recently added a generic way of
getting a connection's security credentials (GetConnectionCredentials).
Ubuntu should carry this patch until packages in the archive are moved
over to the new, generic method of getting a connection's credentials.
[Altered by Simon McVittie: survive non-UTF-8 contexts which
would otherwise be a local denial of service, except that Ubuntu
inherits a non-fatal warnings patch from Debian; new commit message
taken from the Ubuntu changelog; do not emit unreachable code if
AppArmor is disabled.]
Diffstat (limited to 'dbus/dbus-protocol.h')
| -rw-r--r-- | dbus/dbus-protocol.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index 933c3658..2b7fd231 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -444,6 +444,8 @@ extern "C" { #define DBUS_ERROR_INVALID_FILE_CONTENT "org.freedesktop.DBus.Error.InvalidFileContent" /** Asked for SELinux security context and it wasn't available. */ #define DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown" +/** Asked for AppArmor security context and it wasn't available. */ +#define DBUS_ERROR_APPARMOR_SECURITY_CONTEXT_UNKNOWN "org.freedesktop.DBus.Error.AppArmorSecurityContextUnknown" /** Asked for ADT audit data and it wasn't available. */ #define DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN "org.freedesktop.DBus.Error.AdtAuditDataUnknown" /** There's already an object with the requested object path. */ |