Other policykit fixes

Conflicts:

	policy/modules/services/policykit.if

diff --git a/policy/modules/services/policykit.if b/policy/modules/services/policykit.if
index 819fb1cf3d1781cd61c69b085410e8ee9919b658..be00a65f17299f110b9a881d1326d50c28058b72 100644 (file)
--- a/policy/modules/services/policykit.if
+++ b/policy/modules/services/policykit.if
@@ -1,23 +1,5 @@
 ## <summary>Policy framework for controlling privileges for system-wide services.</summary>
 
-#######################################
-## <summary>
-## Add policykit_domain attribute for a domain 
-## </summary>
-## <param name="domain">
-##  <summary>
-##  Domain allowed access.
-##  </summary>
-## </param>
-#
-interface(`policykit_domain',`
-    gen_require(`
-               attribute policykit_domain;
-    ')
-
-       type $1 attribute policykit_domain;
-')
-
 ########################################
 ## <summary>
 ##     Send and receive messages from

diff --git a/policy/modules/services/policykit.te b/policy/modules/services/policykit.te
index 3abd6aa7a1c73c44e253c5b4ec03e3ee6153385a..e3aa61b6054f3b1912f196df95f7a9a5cd643762 100644 (file)
--- a/policy/modules/services/policykit.te
+++ b/policy/modules/services/policykit.te
@@ -7,25 +7,21 @@ policy_module(policykit, 1.1.0)
 
 attribute policykit_domain;
 
-type policykit_t alias polkit_t;
-type policykit_exec_t alias polkit_exec_t;
+type policykit_t, policykit_domain;
+type policykit_exec_t;
 init_daemon_domain(policykit_t, policykit_exec_t)
-policykit_domain(policykit_t)
 
-type policykit_auth_t alias polkit_auth_t;
-type policykit_auth_exec_t alias polkit_auth_exec_t;
+type policykit_auth_t, policykit_domain;
+type policykit_auth_exec_t;
 init_daemon_domain(policykit_auth_t, policykit_auth_exec_t)
-policykit_domain(policykit_auth_t)
 
-type policykit_grant_t alias polkit_grant_t;
-type policykit_grant_exec_t alias polkit_grant_exec_t;
+type policykit_grant_tm policykit_domain;
+type policykit_grant_exec_t;
 init_system_domain(policykit_grant_t, policykit_grant_exec_t)
-policykit_domain(policykit_grant_t)
 
-type policykit_resolve_t alias polkit_resolve_t;
-type policykit_resolve_exec_t alias polkit_resolve_exec_t;
+type policykit_resolve_t, policykit_domain;
+type policykit_resolve_exec_t;
 init_system_domain(policykit_resolve_t, policykit_resolve_exec_t)
-policykit_domain(policykit_resolve_t)
 
 type policykit_reload_t alias polkit_reload_t;
 files_type(policykit_reload_t)