diff --git a/Changelog b/Changelog index b24b7647..3799670f 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,4 @@ +- Debian update for NetworkManager/wpa_supplicant from Martin Orr. - Logrotate and Bind updates from Vaclav Ovsik. - Init script file and domain support. - Glibc 2.7 fix from Vaclav Ovsik. diff --git a/policy/modules/services/networkmanager.fc b/policy/modules/services/networkmanager.fc index dd7e0853..ef57f3d9 100644 --- a/policy/modules/services/networkmanager.fc +++ b/policy/modules/services/networkmanager.fc @@ -1,6 +1,14 @@ +ifdef(`distro_debian',` +/sbin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) +') + /usr/s?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) /usr/s?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) +ifdef(`distro_debian',` +/var/log/wpa_supplicant.* -- gen_context(system_u:object_r:NetworkManager_log_t,s0) +') + /var/run/NetworkManager\.pid -- gen_context(system_u:object_r:NetworkManager_var_run_t,s0) /var/run/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0) /var/run/wpa_supplicant(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0) diff --git a/policy/modules/services/networkmanager.te b/policy/modules/services/networkmanager.te index a656bb8d..269e5e11 100644 --- a/policy/modules/services/networkmanager.te +++ b/policy/modules/services/networkmanager.te @@ -1,5 +1,5 @@ -policy_module(networkmanager, 1.10.1) +policy_module(networkmanager, 1.10.2) ######################################## # @@ -16,6 +16,9 @@ logging_log_file(NetworkManager_log_t) type NetworkManager_script_exec_t; init_script_file(NetworkManager_script_exec_t) +type NetworkManager_tmp_t; +files_tmp_file(NetworkManager_tmp_t) + type NetworkManager_var_run_t; files_pid_file(NetworkManager_var_run_t) @@ -39,6 +42,12 @@ allow NetworkManager_t self:packet_socket create_socket_perms; can_exec(NetworkManager_t, NetworkManager_exec_t) +manage_files_pattern(NetworkManager_t, NetworkManager_log_t, NetworkManager_log_t) +logging_log_filetrans(NetworkManager_t, NetworkManager_log_t, file) + +manage_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t) +files_tmp_filetrans(NetworkManager_t, NetworkManager_tmp_t, sock_file) + manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t) manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t) manage_sock_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)