From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7F6CE138A1F for ; Thu, 17 Apr 2014 19:04:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F19A1E0B7D; Thu, 17 Apr 2014 19:04:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C761E0B51 for ; Thu, 17 Apr 2014 19:04:33 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12A3534037D for ; Thu, 17 Apr 2014 19:04:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id A9547181E7 for ; Thu, 17 Apr 2014 19:04:30 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1397761330.8ae4a42143f20541f9a43506ffb3e94fe19c42e1.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/dbus.if policy/modules/contrib/gnome.if policy/modules/contrib/obex.if policy/modules/contrib/telepathy.if X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 8ae4a42143f20541f9a43506ffb3e94fe19c42e1 X-VCS-Branch: master Date: Thu, 17 Apr 2014 19:04:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9acdf27c-bf82-4304-a238-59b86def2813 X-Archives-Hash: 30d805b2a688e69cc35a7d88d1f8a987 commit: 8ae4a42143f20541f9a43506ffb3e94fe19c42e1 Author: Laurent Bigonville bigon be> AuthorDate: Fri Apr 11 17:27:16 2014 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Thu Apr 17 19:02:10 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=8ae4a421 Fix the usage of dbus_spec_session_domain() interface Change the order of the parameters for the calls to dbus_spec_session_domain() interface. For consistancy with the other dbus interfaces and the backward compatibility, we consider that the description was correct and we change the callers instead. The order of the parameter for this interface is the following: dbus_spec_session_domain(role_prefix, domain, entry_point) --- policy/modules/contrib/dbus.if | 2 +- policy/modules/contrib/gnome.if | 2 +- policy/modules/contrib/obex.if | 2 +- policy/modules/contrib/telepathy.if | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/policy/modules/contrib/dbus.if b/policy/modules/contrib/dbus.if index fa6d806..21e8b5c 100644 --- a/policy/modules/contrib/dbus.if +++ b/policy/modules/contrib/dbus.if @@ -469,7 +469,7 @@ interface(`dbus_spec_session_domain',` type $1_dbusd_t; ') - domtrans_pattern($1_dbusd_t, $2, $3) + domtrans_pattern($1_dbusd_t, $3, $2) dbus_spec_session_bus_client($1, $2) dbus_connect_spec_session_bus($1, $2) diff --git a/policy/modules/contrib/gnome.if b/policy/modules/contrib/gnome.if index ab09d61..112d33b 100644 --- a/policy/modules/contrib/gnome.if +++ b/policy/modules/contrib/gnome.if @@ -109,7 +109,7 @@ template(`gnome_role_template',` gnome_stream_connect_gkeyringd($1, $3) optional_policy(` - dbus_spec_session_domain($1, gkeyringd_exec_t, $1_gkeyringd_t) + dbus_spec_session_domain($1, $1_gkeyringd_t, gkeyringd_exec_t) optional_policy(` gnome_dbus_chat_gkeyringd($1, $3) diff --git a/policy/modules/contrib/obex.if b/policy/modules/contrib/obex.if index 8635ea2..410c0e8 100644 --- a/policy/modules/contrib/obex.if +++ b/policy/modules/contrib/obex.if @@ -42,7 +42,7 @@ template(`obex_role_template',` allow $3 obex_t:process { ptrace signal_perms }; ps_process_pattern($3, obex_t) - dbus_spec_session_domain($1, obex_exec_t, obex_t) + dbus_spec_session_domain($1, obex_t, obex_exec_t) obex_dbus_chat($3) ') diff --git a/policy/modules/contrib/telepathy.if b/policy/modules/contrib/telepathy.if index 42946bc..0d58469 100644 --- a/policy/modules/contrib/telepathy.if +++ b/policy/modules/contrib/telepathy.if @@ -78,15 +78,15 @@ template(`telepathy_role_template',` telepathy_msn_stream_connect($3) telepathy_salut_stream_connect($3) - dbus_spec_session_domain($1, telepathy_gabble_exec_t, telepathy_gabble_t) - dbus_spec_session_domain($1, telepathy_sofiasip_exec_t, telepathy_sofiasip_t) - dbus_spec_session_domain($1, telepathy_idle_exec_t, telepathy_idle_t) - dbus_spec_session_domain($1, telepathy_logger_exec_t, telepathy_logger_t) - dbus_spec_session_domain($1, telepathy_mission_control_exec_t, telepathy_mission_control_t) - dbus_spec_session_domain($1, telepathy_salut_exec_t, telepathy_salut_t) - dbus_spec_session_domain($1, telepathy_sunshine_exec_t, telepathy_sunshine_t) - dbus_spec_session_domain($1, telepathy_stream_engine_exec_t, telepathy_stream_engine_t) - dbus_spec_session_domain($1, telepathy_msn_exec_t, telepathy_msn_t) + dbus_spec_session_domain($1, telepathy_gabble_t, telepathy_gabble_exec_t) + dbus_spec_session_domain($1, telepathy_sofiasip_t, telepathy_sofiasip_exec_t) + dbus_spec_session_domain($1, telepathy_idle_t, telepathy_idle_exec_t) + dbus_spec_session_domain($1, telepathy_logger_t, telepathy_logger_exec_t) + dbus_spec_session_domain($1, telepathy_mission_control_t, telepathy_mission_control_exec_t) + dbus_spec_session_domain($1, telepathy_salut_t, telepathy_salut_exec_t) + dbus_spec_session_domain($1, telepathy_sunshine_t, telepathy_sunshine_exec_t) + dbus_spec_session_domain($1, telepathy_stream_engine_t, telepathy_stream_engine_exec_t) + dbus_spec_session_domain($1, telepathy_msn_t, telepathy_msn_exec_t) allow $3 { telepathy_mission_control_cache_home_t telepathy_cache_home_t telepathy_logger_cache_home_t }:dir { manage_dir_perms relabel_dir_perms }; allow $3 { telepathy_gabble_cache_home_t telepathy_mission_control_home_t telepathy_data_home_t }:dir { manage_dir_perms relabel_dir_perms };