[selinux-policy: 2623/3172] Fix some whitespace and style issues.
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Oct 7 22:53:12 UTC 2010
commit 0e5494a3d970904edc1aebbf19816d6a12ea6833
Author: Jeremy Solt <jsolt at tresys.com>
Date: Mon Apr 12 15:54:18 2010 -0400
Fix some whitespace and style issues.
policy/modules/services/certmonger.fc | 4 +-
policy/modules/services/certmonger.if | 46 ++++++++++++++++----------------
policy/modules/services/certmonger.te | 10 +++---
3 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/policy/modules/services/certmonger.fc b/policy/modules/services/certmonger.fc
index e3449bb..5ad1a52 100644
--- a/policy/modules/services/certmonger.fc
+++ b/policy/modules/services/certmonger.fc
@@ -1,6 +1,6 @@
/etc/rc\.d/init\.d/certmonger -- gen_context(system_u:object_r:certmonger_initrc_exec_t,s0)
-/usr/sbin/certmonger -- gen_context(system_u:object_r:certmonger_exec_t,s0)
+/usr/sbin/certmonger -- gen_context(system_u:object_r:certmonger_exec_t,s0)
-/var/lib/certmonger(/.*)? gen_context(system_u:object_r:certmonger_var_lib_t,s0)
+/var/lib/certmonger(/.*)? gen_context(system_u:object_r:certmonger_var_lib_t,s0)
/var/run/certmonger.pid -- gen_context(system_u:object_r:certmonger_var_run_t,s0)
diff --git a/policy/modules/services/certmonger.if b/policy/modules/services/certmonger.if
index aeee5d6..ce8f433 100644
--- a/policy/modules/services/certmonger.if
+++ b/policy/modules/services/certmonger.if
@@ -20,6 +20,27 @@ interface(`certmonger_domtrans',`
########################################
## <summary>
+## Send and receive messages from
+## certmonger over dbus.
+## </summary>
+## <param name="domain">
+## <summary>
+## Domain allowed access.
+## </summary>
+## </param>
+#
+interface(`certmonger_dbus_chat',`
+ gen_require(`
+ type certmonger_t;
+ class dbus send_msg;
+ ')
+
+ allow $1 certmonger_t:dbus send_msg;
+ allow certmonger_t $1:dbus send_msg;
+')
+
+########################################
+## <summary>
## Execute certmonger server in the certmonger domain.
## </summary>
## <param name="domain">
@@ -115,27 +136,6 @@ interface(`certmonger_manage_lib_files',`
########################################
## <summary>
-## Send and receive messages from
-## certmonger over dbus.
-## </summary>
-## <param name="domain">
-## <summary>
-## Domain allowed access.
-## </summary>
-## </param>
-#
-interface(`certmonger_dbus_chat',`
- gen_require(`
- type certmonger_t;
- class dbus send_msg;
- ')
-
- allow $1 certmonger_t:dbus send_msg;
- allow certmonger_t $1:dbus send_msg;
-')
-
-########################################
-## <summary>
## All of the rules required to administrate
## an certmonger environment
## </summary>
@@ -157,8 +157,8 @@ interface(`certmonger_admin',`
type certmonger_var_lib_t, certmonger_var_run_t;
')
- allow $1 certmonger_t:process { ptrace signal_perms getattr };
- read_files_pattern($1, certmonger_t, certmonger_t)
+ ps_process_pattern($1, certmonger_t)
+ allow $1 certmonger_t:process { ptrace signal_perms };
# Allow certmonger_t to restart the apache service
certmonger_initrc_domtrans($1)
diff --git a/policy/modules/services/certmonger.te b/policy/modules/services/certmonger.te
index f72ce9c..36a3a7a 100644
--- a/policy/modules/services/certmonger.te
+++ b/policy/modules/services/certmonger.te
@@ -30,15 +30,13 @@ allow certmonger_t self:unix_stream_socket create_stream_socket_perms;
allow certmonger_t self:tcp_socket create_stream_socket_perms;
allow certmonger_t self:netlink_route_socket r_netlink_socket_perms;
-manage_dirs_pattern(certmonger_t, certmonger_var_run_t, certmonger_var_run_t)
-manage_files_pattern(certmonger_t, certmonger_var_run_t, certmonger_var_run_t)
-files_pid_filetrans(certmonger_t, certmonger_var_run_t, { file dir })
-
manage_dirs_pattern(certmonger_t, certmonger_var_lib_t, certmonger_var_lib_t)
manage_files_pattern(certmonger_t, certmonger_var_lib_t, certmonger_var_lib_t)
files_var_lib_filetrans(certmonger_t, certmonger_var_lib_t, { file dir } )
-domain_use_interactive_fds(certmonger_t)
+manage_dirs_pattern(certmonger_t, certmonger_var_run_t, certmonger_var_run_t)
+manage_files_pattern(certmonger_t, certmonger_var_run_t, certmonger_var_run_t)
+files_pid_filetrans(certmonger_t, certmonger_var_run_t, { file dir })
corenet_tcp_sendrecv_generic_if(certmonger_t)
corenet_tcp_sendrecv_generic_node(certmonger_t)
@@ -47,6 +45,8 @@ corenet_tcp_connect_certmaster_port(certmonger_t)
dev_read_urand(certmonger_t)
+domain_use_interactive_fds(certmonger_t)
+
files_read_etc_files(certmonger_t)
files_read_usr_files(certmonger_t)
files_list_tmp(certmonger_t)
More information about the scm-commits
mailing list