| 1 |
commit: 7b7b51c2c6b76af6095c5ef494ba516faa6ad7f3 |
| 2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 3 |
AuthorDate: Thu Nov 1 21:03:31 2012 +0000 |
| 4 |
Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 5 |
CommitDate: Thu Nov 1 21:03:31 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=7b7b51c2 |
| 7 |
|
| 8 |
Reshuffle gentoo specific gnome changes, and merge some lost changes from upstream |
| 9 |
|
| 10 |
--- |
| 11 |
policy/modules/contrib/gnome.if | 8 ++++---- |
| 12 |
policy/modules/contrib/gnome.te | 9 ++++++--- |
| 13 |
2 files changed, 10 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/policy/modules/contrib/gnome.if b/policy/modules/contrib/gnome.if |
| 16 |
index 2a59b8a..d03fd43 100644 |
| 17 |
--- a/policy/modules/contrib/gnome.if |
| 18 |
+++ b/policy/modules/contrib/gnome.if |
| 19 |
@@ -1,8 +1,8 @@ |
| 20 |
-## <summary>GNU network object model environment (GNOME)</summary> |
| 21 |
+## <summary>GNU network object model environment.</summary> |
| 22 |
|
| 23 |
-############################################################ |
| 24 |
+######################################## |
| 25 |
## <summary> |
| 26 |
-## Role access for gnome. (Deprecated) |
| 27 |
+## Role access for gnome. (Deprecated) |
| 28 |
## </summary> |
| 29 |
## <param name="role"> |
| 30 |
## <summary> |
| 31 |
@@ -299,7 +299,7 @@ interface(`gnome_setattr_generic_home_dirs',` |
| 32 |
## </summary> |
| 33 |
## </param> |
| 34 |
# |
| 35 |
-template(`gnome_read_config',` |
| 36 |
+interface(`gnome_read_config',` |
| 37 |
refpolicywarn(`$0($*) has been deprecated, use gnome_read_generic_home_content() instead.') |
| 38 |
gnome_read_generic_home_content($1) |
| 39 |
') |
| 40 |
|
| 41 |
diff --git a/policy/modules/contrib/gnome.te b/policy/modules/contrib/gnome.te |
| 42 |
index c5c8c9c..50eeb0b 100644 |
| 43 |
--- a/policy/modules/contrib/gnome.te |
| 44 |
+++ b/policy/modules/contrib/gnome.te |
| 45 |
@@ -37,9 +37,6 @@ typealias gnome_home_t alias { auditadm_gnome_home_t secadm_gnome_home_t }; |
| 46 |
typealias gnome_home_t alias unconfined_gnome_home_t; |
| 47 |
userdom_user_home_content(gnome_home_t) |
| 48 |
|
| 49 |
-type gnome_xdg_config_t; |
| 50 |
-xdg_config_home_content(gnome_xdg_config_t) |
| 51 |
- |
| 52 |
type gkeyringd_exec_t; |
| 53 |
application_executable_file(gkeyringd_exec_t) |
| 54 |
|
| 55 |
@@ -49,6 +46,12 @@ userdom_user_home_content(gnome_keyring_home_t) |
| 56 |
type gnome_keyring_tmp_t; |
| 57 |
userdom_user_tmp_file(gnome_keyring_tmp_t) |
| 58 |
|
| 59 |
+ifdef(`distro_gentoo',` |
| 60 |
+ type gnome_xdg_config_t; |
| 61 |
+ |
| 62 |
+ xdg_config_home_content(gnome_xdg_config_t) |
| 63 |
+') |
| 64 |
+ |
| 65 |
############################## |
| 66 |
# |
| 67 |
# Common local Policy |
Archives