| 1 |
commit: 54417068974d78f141a2decd800c4f1b9bf4fd53 |
| 2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 3 |
AuthorDate: Thu Nov 1 21:26:33 2012 +0000 |
| 4 |
Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 5 |
CommitDate: Thu Nov 1 21:26:33 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=54417068 |
| 7 |
|
| 8 |
Reshuffle gentoo specific networkmanager changes |
| 9 |
|
| 10 |
--- |
| 11 |
policy/modules/contrib/networkmanager.if | 1 - |
| 12 |
policy/modules/contrib/networkmanager.te | 43 ++++++++++++++++------------- |
| 13 |
2 files changed, 24 insertions(+), 20 deletions(-) |
| 14 |
|
| 15 |
diff --git a/policy/modules/contrib/networkmanager.if b/policy/modules/contrib/networkmanager.if |
| 16 |
index 4bd346e..15484ff 100644 |
| 17 |
--- a/policy/modules/contrib/networkmanager.if |
| 18 |
+++ b/policy/modules/contrib/networkmanager.if |
| 19 |
@@ -321,4 +321,3 @@ interface(`networkmanager_run_wpa_cli',` |
| 20 |
networkmanager_domtrans_wpa_cli($1) |
| 21 |
role $2 types wpa_cli_t; |
| 22 |
') |
| 23 |
- |
| 24 |
|
| 25 |
diff --git a/policy/modules/contrib/networkmanager.te b/policy/modules/contrib/networkmanager.te |
| 26 |
index f753f63..6adcb2e 100644 |
| 27 |
--- a/policy/modules/contrib/networkmanager.te |
| 28 |
+++ b/policy/modules/contrib/networkmanager.te |
| 29 |
@@ -34,8 +34,10 @@ type wpa_cli_t; |
| 30 |
type wpa_cli_exec_t; |
| 31 |
init_system_domain(wpa_cli_t, wpa_cli_exec_t) |
| 32 |
|
| 33 |
-type wpa_cli_var_run_t; |
| 34 |
-files_pid_file(wpa_cli_var_run_t) |
| 35 |
+ifdef(`distro_gentoo',` |
| 36 |
+ type wpa_cli_var_run_t; |
| 37 |
+ files_pid_file(wpa_cli_var_run_t) |
| 38 |
+') |
| 39 |
|
| 40 |
######################################## |
| 41 |
# |
| 42 |
@@ -355,31 +357,34 @@ files_tmp_filetrans(wpa_cli_t, NetworkManager_tmp_t, sock_file) |
| 43 |
list_dirs_pattern(wpa_cli_t, NetworkManager_var_run_t, NetworkManager_var_run_t) |
| 44 |
rw_sock_files_pattern(wpa_cli_t, NetworkManager_var_run_t, NetworkManager_var_run_t) |
| 45 |
|
| 46 |
-manage_files_pattern(wpa_cli_t, wpa_cli_var_run_t, wpa_cli_var_run_t) |
| 47 |
-files_pid_filetrans(wpa_cli_t, wpa_cli_var_run_t, file) |
| 48 |
+init_dontaudit_use_fds(wpa_cli_t) |
| 49 |
+init_use_script_ptys(wpa_cli_t) |
| 50 |
+ |
| 51 |
+miscfiles_read_localization(wpa_cli_t) |
| 52 |
+ |
| 53 |
+term_dontaudit_use_console(wpa_cli_t) |
| 54 |
|
| 55 |
-corecmd_exec_bin(wpa_cli_t) |
| 56 |
-corecmd_exec_shell(wpa_cli_t) |
| 57 |
+ifdef(`distro_gentoo',` |
| 58 |
+ manage_files_pattern(wpa_cli_t, wpa_cli_var_run_t, wpa_cli_var_run_t) |
| 59 |
+ files_pid_filetrans(wpa_cli_t, wpa_cli_var_run_t, file) |
| 60 |
|
| 61 |
-domain_use_interactive_fds(wpa_cli_t) |
| 62 |
+ corecmd_exec_bin(wpa_cli_t) |
| 63 |
+ corecmd_exec_shell(wpa_cli_t) |
| 64 |
|
| 65 |
-files_read_etc_files(wpa_cli_t) |
| 66 |
-files_search_pids(wpa_cli_t) |
| 67 |
+ domain_use_interactive_fds(wpa_cli_t) |
| 68 |
|
| 69 |
-term_dontaudit_use_console(wpa_cli_t) |
| 70 |
+ files_read_etc_files(wpa_cli_t) |
| 71 |
+ files_search_pids(wpa_cli_t) |
| 72 |
|
| 73 |
-getty_use_fds(wpa_cli_t) |
| 74 |
+ term_dontaudit_use_console(wpa_cli_t) |
| 75 |
|
| 76 |
-init_domtrans_script(wpa_cli_t) |
| 77 |
-init_dontaudit_use_fds(wpa_cli_t) |
| 78 |
-init_use_script_ptys(wpa_cli_t) |
| 79 |
+ getty_use_fds(wpa_cli_t) |
| 80 |
|
| 81 |
-logging_send_syslog_msg(wpa_cli_t) |
| 82 |
+ init_domtrans_script(wpa_cli_t) |
| 83 |
|
| 84 |
-miscfiles_read_localization(wpa_cli_t) |
| 85 |
+ logging_send_syslog_msg(wpa_cli_t) |
| 86 |
|
| 87 |
-userdom_use_user_terminals(wpa_cli_t) |
| 88 |
+ sysnet_domtrans_dhcpc(wpa_cli_t) |
| 89 |
|
| 90 |
-ifdef(`distro_gentoo',` |
| 91 |
- sysnet_domtrans_dhcpc(wpa_cli_t) |
| 92 |
+ userdom_use_user_terminals(wpa_cli_t) |
| 93 |
') |
Archives