Changeset 88340b904ae88118c8bf8c823724482f18921931

Timestamp:

03/04/10 08:18:02 (5 months ago)

Author:

Chris PeBenito <cpebenito@tresys.com>

Committer:

Chris PeBenito <cpebenito@tresys.com> 1267712282 -0500

Parent:

[402bbb9fe9636beb7d18e4e24d120911f8ebc5a2]

Message:

Various amavis fixes.

Create amavis_initrc_domtrans.
Call amavis_initrc_domtrans from amavis_admin.
Remove obsolete require.
Allow domains to search bin to enable run amavis executable.

Signed-off-by: Dominick Grift <domg472@gmail.com>

Files:

• policy/modules/services/amavis.if (modified) (3 diffs)

policy/modules/services/amavis.if

@@ -19 +19 @@
-        ')
-
+        corecmd_search_bin($1)
-        domtrans_pattern($1, amavis_exec_t, amavis_t)
+')
+
+########################################
+## <summary>
+##      Execute amavis server in the amavis domain.
+## </summary>
+## <param name="domain">
+##      <summary>
+##      The type of the process performing this action.
+##      </summary>
+## </param>
+#
+interface(`amavis_initrc_domtrans',`
+        gen_require(`
+                type afs_initrc_exec_t;
+        ')
+
+        init_labeled_script_domtrans($1, amavis_initrc_exec_t)
-')
-
@@ -210 +229 @@
-                type amavis_spool_t, amavis_var_lib_t, amavis_var_run_t;
-                type amavis_etc_t, amavis_quarantine_t;
-                type amavis_initrc_exec_t;
-        ')
-
@@ -216 +234 @@
-        ps_process_pattern($1, amavis_t)
-
-init_labeled_script_domtrans($1, amavis_initrc_exec_t
+amavis_initrc_domtrans($1
-        domain_system_change_exemption($1)
-        role_transition $2 amavis_initrc_exec_t system_r;