Merge "Strengthen setenforce and setbool assertions"
diff --git a/unconfined.te b/unconfined.te
index e016584..af60be8 100644
--- a/unconfined.te
+++ b/unconfined.te
@@ -11,9 +11,8 @@
 allow unconfineddomain domain:ipc_class_set *;
 allow unconfineddomain domain:key *;
 allow unconfineddomain fs_type:filesystem *;
-allow unconfineddomain fs_type:dir_file_class_set *;
-allow unconfineddomain dev_type:dir_file_class_set *;
-allow unconfineddomain file_type:dir_file_class_set *;
+allow unconfineddomain {fs_type dev_type file_type}:{ dir blk_file lnk_file sock_file fifo_file } *;
+allow unconfineddomain {fs_type dev_type file_type}:{ chr_file file } ~entrypoint;
 allow unconfineddomain node_type:node *;
 allow unconfineddomain node_type:{ tcp_socket udp_socket } node_bind;
 allow unconfineddomain netif_type:netif *;