diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-11 13:19:15 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-18 10:35:05 +0000 |
| commit | 96c3bcec776f932fa1883f6a2597991d138e6925 (patch) | |
| tree | 29dc0852500d439869a1135365996d2ca006d518 /dbus/dbus-auth.c | |
| parent | c966d903747dd6f8c57000e37ed6317af0c70b3d (diff) | |
| download | dbus-96c3bcec776f932fa1883f6a2597991d138e6925.tar.gz | |
Add LSM-agnostic support for LinuxSecurityLabel credential
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89041
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov> (for SELinux)
Acked-by: John Johansen <john.johansen@canonical.com> (for AppArmor)
Acked-by: Casey Schaufler <casey@schaufler-ca.com> (for Smack)
Tested-by: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'dbus/dbus-auth.c')
| -rw-r--r-- | dbus/dbus-auth.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c index 64ad2b06..1503d5f1 100644 --- a/dbus/dbus-auth.c +++ b/dbus/dbus-auth.c @@ -1102,20 +1102,23 @@ handle_server_data_external_mech (DBusAuth *auth, auth->desired_identity)) return FALSE; - /* also copy process ID from the socket credentials + /* also copy misc process info from the socket credentials */ if (!_dbus_credentials_add_credential (auth->authorized_identity, DBUS_CREDENTIAL_UNIX_PROCESS_ID, auth->credentials)) return FALSE; - /* also copy audit data from the socket credentials - */ if (!_dbus_credentials_add_credential (auth->authorized_identity, DBUS_CREDENTIAL_ADT_AUDIT_DATA_ID, auth->credentials)) return FALSE; - + + if (!_dbus_credentials_add_credential (auth->authorized_identity, + DBUS_CREDENTIAL_LINUX_SECURITY_LABEL, + auth->credentials)) + return FALSE; + if (!send_ok (auth)) return FALSE; |