From a2db29cc4ff9d20bbbde656913747c2bb68e3bc6 Mon Sep 17 00:00:00 2001
From: Lukas Vrabec <lvrabec@redhat.com>
Date: Nov 21 2013 16:36:29 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy


---

diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index aa0a099..563dcb7 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -574,6 +574,13 @@ dnsmasq = module
 dnssec = module
 
 # Layer: services
+# Module: docker
+#
+# Docker
+# 
+docker = module
+
+# Layer: services
 # Module: dovecot
 #
 # Dovecot POP and IMAP mail server
diff --git a/permissivedomains.te b/permissivedomains.te
index c864bad..e4771f9 100644
--- a/permissivedomains.te
+++ b/permissivedomains.te
@@ -1,76 +1,19 @@
-policy_module(permissivedomains,20)
+policy_module(permissivedomains,21)
 
 optional_policy(`
     gen_require(`
-                type gssproxy_t;
-        ')
-
-        permissive gssproxy_t;
-')
-
-optional_policy(`
-    gen_require(`
-                type prosody_t;
-        ')
-
-        permissive prosody_t;
-')
-
-optional_policy(`
-    gen_require(`
-                type redis_t;
-        ')
-
-        permissive redis_t;
-')
-
-optional_policy(`
-    gen_require(`
-                type hypervkvp_t;
-        ')
-
-        permissive hypervkvp_t;
-')
-
-optional_policy(`
-    gen_require(`
-                type hypervvssd_t;
-        ')
-
-        permissive hypervvssd_t;
-')
-
-
-
-optional_policy(`
-    gen_require(`
-                type lsmd_t;
-        ')
-
-        permissive lsmd_t;
-')
-
-
-optional_policy(`
-    gen_require(`
-                type mip6d_t;
-    ')
-')
-
-optional_policy(`
-    gen_require(`
-                type opensm_t;
+                type bumblebee_t;
     ')
 ')
 
 optional_policy(`
     gen_require(`
-                type bumblebee_t;
-    ')
+                type freqset_t;
+   ')
 ')
 
 optional_policy(`
     gen_require(`
-                type freqset_t;
+                type docker_t;
    ')
 ')