tvtime, roles: use user exec domain attribute

Signed-off-by: Kenton Groombridge <me@concord.sh>

policy/modules/apps/tvtime.if

@@ -4,30 +4,41 @@
 ## <summary>
 ##	Role access for tvtime
 ## </summary>
+## <param name="role_prefix">
+##	<summary>
+##	The prefix of the user role (e.g., user
+##	is the prefix for user_r).
+##	</summary>
+## </param>
+## <param name="user_domain">
+##	<summary>
+##	User domain for the role.
+##	</summary>
+## </param>
+## <param name="user_exec_domain">
+##	<summary>
+##	User exec domain for execute and transition access.
+##	</summary>
+## </param>
 ## <param name="role">
 ##	<summary>
 ##	Role allowed access
 ##	</summary>
 ## </param>
-## <param name="domain">
-##	<summary>
-##	User domain for the role
-##	</summary>
-## </param>
 #
-interface(`tvtime_role',`
+template(`tvtime_role',`
 	gen_require(`
 		attribute_role tvtime_roles;
 		type tvtime_t, tvtime_exec_t, tvtime_tmp_t;
 		type tvtime_home_t, tvtime_tmpfs_t;
 	')
 
-	roleattribute $1 tvtime_roles;
+	roleattribute $4 tvtime_roles;
 
-	domtrans_pattern($2, tvtime_exec_t, tvtime_t)
+	domtrans_pattern($3, tvtime_exec_t, tvtime_t)
 
-	ps_process_pattern($2, tvtime_t)
-	allow $2 tvtime_t:process { ptrace signal_perms };
+	ps_process_pattern($3, tvtime_t)
+	allow $3 tvtime_t:process { ptrace signal_perms };
 
 	allow $2 { tvtime_home_t tvtime_tmp_t }:dir { manage_dir_perms relabel_dir_perms };
 	allow $2 { tvtime_home_t tvtime_tmpfs_t tvtime_tmp_t }:file { manage_file_perms relabel_file_perms };
@@ -35,4 +46,8 @@ interface(`tvtime_role',`
 	allow $2 tvtime_tmpfs_t:fifo_file { manage_fifo_file_perms relabel_fifo_file_perms };
 	allow $2 tvtime_tmpfs_t:sock_file { manage_sock_file_perms relabel_sock_file_perms };
 	userdom_user_home_dir_filetrans($2, tvtime_home_t, dir, ".tvtime")
+
+	optional_policy(`
+		systemd_user_app_status($1, tvtime_t)
+	')
 ')

policy/modules/roles/staff.te

@@ -187,7 +187,7 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		tvtime_role(staff_r, staff_t)
+		tvtime_role(staff, staff_t, staff_application_exec_domain, staff_r)
 	')
 
 	optional_policy(`

policy/modules/roles/sysadm.te

@@ -1068,7 +1068,7 @@ optional_policy(`
 ')
 
 optional_policy(`
-	tvtime_role(sysadm_r, sysadm_t)
+	tvtime_role(sysadm, sysadm_t, sysadm_application_exec_domain, sysadm_r)
 ')
 
 optional_policy(`

policy/modules/roles/unprivuser.te

@@ -171,7 +171,7 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		tvtime_role(user_r, user_t)
+		tvtime_role(user, user_t, user_application_exec_domain, user_r)
 	')
 
 	optional_policy(`