diff --git a/.cvsignore b/.cvsignore
index 1ecab65..ac3c5db 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -149,3 +149,4 @@ serefpolicy-3.5.4.tgz
 serefpolicy-3.5.5.tgz
 serefpolicy-3.5.6.tgz
 serefpolicy-3.5.7.tgz
+serefpolicy-3.5.8.tgz
diff --git a/modules-targeted.conf b/modules-targeted.conf
index c80fba3..c3e62e4 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -30,7 +30,7 @@ alsa = base
 #
 # ada executable
 # 
-ada = base
+ada = module
 
 # Layer: modules
 # Module: awstats
@@ -44,7 +44,7 @@ awstats = module
 #
 # Automated backup program.
 # 
-amanda = base
+amanda = module
 
 # Layer: services
 # Module: amavis
@@ -65,7 +65,7 @@ anaconda = base
 #
 # Apache web server
 # 
-apache = base
+apache = module
 
 # Layer: services
 # Module: apm
@@ -87,7 +87,7 @@ application = base
 #
 # Ethernet activity monitor.
 # 
-arpwatch = base
+arpwatch = module
 
 # Layer: services
 # Module: audioentropy
@@ -115,28 +115,28 @@ automount = base
 #
 # mDNS/DNS-SD daemon implementing Apple ZeroConf architecture
 # 
-avahi = base
+avahi = module
 
 # Layer: services
 # Module: bind
 #
 # Berkeley internet name domain DNS server.
 # 
-bind = base
+bind = module
 
 # Layer: services
 # Module: dnsmasq
 #
 # A lightweight DHCP and caching DNS server.
 # 
-dnsmasq = base
+dnsmasq = module
 
 # Layer: services
 # Module: bluetooth
 #
 # Bluetooth tools and system services.
 # 
-bluetooth = base
+bluetooth = module
 
 # Layer: kernel
 # Module: bootloader
@@ -151,8 +151,7 @@ bootloader = base
 #
 # Canna - kana-kanji conversion server
 # 
-canna = base
-
+canna = module
 
 # Layer: services
 # Module: ccs
@@ -195,7 +194,7 @@ cipe = module
 #
 # Comsat, a biff server.
 # 
-comsat = base
+comsat = module
 
 # Layer: services
 # Module: clamav
@@ -254,21 +253,21 @@ cpucontrol = base
 #
 # Periodic execution of scheduled commands.
 # 
-cron = base
+cron = module 
 
 # Layer: services
 # Module: cups
 #
 # Common UNIX printing system
 # 
-cups = base
+cups = module
 
 # Layer: services
 # Module: cvs
 #
 # Concurrent versions system
 # 
-cvs = base
+cvs = module
 
 # Layer: services
 # Module: cyphesis
@@ -282,7 +281,7 @@ cyphesis = module
 #
 # Cyrus is an IMAP service intended to be run on sealed servers
 # 
-cyrus = base
+cyrus = module
 
 # Layer: system
 # Module: daemontools
@@ -296,7 +295,7 @@ daemontools = module
 #
 # Dictionary server for the SKK Japanese input method system.
 # 
-dbskk = base
+dbskk = module
 
 # Layer: services
 # Module: dbus
@@ -305,7 +304,6 @@ dbskk = base
 # 
 dbus = base
 
-
 # Layer: services
 # Module: dcc
 #
@@ -340,7 +338,7 @@ dhcp = base
 #
 # Dictionary daemon
 # 
-dictd = base
+dictd = module
 
 # Layer: services
 # Module: distcc
@@ -390,7 +388,7 @@ gpg = off
 #
 # General Purpose Mouse driver
 # 
-gpm = base
+gpm = module
 
 # Layer: apps
 # Module: ethereal
@@ -411,7 +409,7 @@ fail2ban = module
 #
 # Remote-mail retrieval and forwarding utility
 # 
-fetchmail = base
+fetchmail = module
 
 # Layer: kernel
 # Module: files
@@ -434,7 +432,7 @@ filesystem = base
 #
 # Finger user information service.
 # 
-finger = base
+finger = module
 
 # Layer: admin
 # Module: firstboot
@@ -456,7 +454,7 @@ fstools = base
 #
 # File transfer protocol service
 # 
-ftp = base
+ftp = module
 
 # Layer: apps
 # Module: games
@@ -521,7 +519,7 @@ hotplug = base
 #
 # Port of Apple Rendezvous multicast DNS
 # 
-howl = base
+howl = module
 
 # Layer: services
 # Module: inetd
@@ -542,7 +540,7 @@ init = base
 #
 # Internet News NNTP server
 # 
-inn = base
+inn = module
 
 # Layer: system
 # Module: iptables
@@ -592,14 +590,14 @@ i18n_input = off
 #
 # java executable
 # 
-java = base
+java = module
 
 # Layer: services
 # Module: kerberos
 #
 # MIT Kerberos admin and KDC
 # 
-kerberos = base
+kerberos = module
 
 # Layer: kernel
 # Module: kernel
@@ -614,7 +612,7 @@ kernel = base
 #
 # KDE Talk daemon
 # 
-ktalk = base
+ktalk = module
 
 # Layer: admin
 # Module: kudzu
@@ -629,7 +627,7 @@ kudzu = base
 #
 # OpenLDAP directory server
 # 
-ldap = base
+ldap = module
 
 # Layer: system
 # Module: libraries
@@ -685,7 +683,7 @@ logwatch = base
 #
 # Line printer daemon
 # 
-lpd = base
+lpd = module
 
 # Layer: system
 # Module: lvm
@@ -694,14 +692,12 @@ lpd = base
 # 
 lvm = base
 
-
 # Layer: services
 # Module: mailman
 #
 # Mailman is for managing electronic mail discussion and e-newsletter lists
 # 
-mailman = base
-
+mailman = module
 
 # Layer: services
 # Module: mailscanner
@@ -803,7 +799,7 @@ mta = base
 #
 # Policy for MySQL
 # 
-mysql = base
+mysql = module
 
 # Layer: services
 # Module: nagios
@@ -831,7 +827,7 @@ networkmanager = base
 #
 # Policy for NIS (YP) servers and clients
 # 
-nis = base
+nis = module
 
 
 # Layer: services
@@ -847,7 +843,7 @@ nscd = base
 #
 # Network time protocol daemon
 # 
-ntp = base
+ntp = module
 
 # Layer: services
 # Module: nx
@@ -876,7 +872,7 @@ openct = off
 #
 # Policy for OPENVPN full-featured SSL VPN solution
 # 
-openvpn = base
+openvpn = module
 
 
 # Layer: service
@@ -905,43 +901,42 @@ pcmcia = base
 #
 # The Open Group Pegasus CIM/WBEM Server.
 # 
-pegasus = base
+pegasus = module
 
 # Layer: services
 # Module: postgresql
 #
 # PostgreSQL relational database
 # 
-postgresql = base
+postgresql = module
 
 # Layer: services
 # Module: portmap
 #
 # RPC port mapping service.
 # 
-portmap = base
-
+portmap = module
 
 # Layer: services
 # Module: postfix
 #
 # Postfix email server
 # 
-postfix = base
+postfix = module
 
 o# Layer: services
 # Module: postgrey
 #
 # email scanner
 # 
-postgrey = base
+postgrey = module
 
 # Layer: services
 # Module: ppp
 #
 # Point to Point Protocol daemon creates links in ppp networks
 # 
-ppp = base
+ppp = module
 
 # Layer: admin
 # Module: prelink
@@ -955,14 +950,14 @@ prelink = base
 #
 # Procmail mail delivery agent
 # 
-procmail = base
+procmail = module
 
 # Layer: services
 # Module: privoxy
 #
 # Privacy enhancing web proxy.
 # 
-privoxy = base
+privoxy = module
 
 # Layer: services
 # Module: publicfile
@@ -1005,22 +1000,14 @@ raid = base
 #
 # RADIUS authentication and accounting server.
 # 
-radius = base
-
-# Layer: services
-# Module: radius
-#
-# RADIUS authentication and accounting server.
-# 
-radius = base
-
+radius = module
 
 # Layer: services
 # Module: radvd
 #
 # IPv6 router advertisement daemon
 # 
-radvd = base
+radvd = module
 
 # Layer: services
 # Module: razor
@@ -1048,14 +1035,14 @@ rhgb = base
 #
 # Network router discovery daemon
 # 
-rdisc = base
+rdisc = module
 
 # Layer: services
 # Module: remotelogin
 #
 # Policy for rshd, rlogind, and telnetd.
 # 
-remotelogin = base
+remotelogin = module
 
 # Layer: services
 # Module: ricci
@@ -1069,7 +1056,7 @@ ricci = module
 #
 # Remote login daemon
 # 
-rlogin = base
+rlogin = module
 
 # Layer: services
 # Module: roundup
@@ -1098,14 +1085,14 @@ rpm = base
 #
 # Remote shell service.
 # 
-rshd = base
+rshd = module
 
 # Layer: services
 # Module: rsync
 #
 # Fast incremental file transfer for synchronization
 # 
-rsync = base
+rsync = module
 
 # Layer: services
 # Module: rwho
@@ -1119,7 +1106,7 @@ rwho = module
 #
 # SASL authentication server
 # 
-sasl = base
+sasl = module
 
 # Layer: services
 # Module: sendmail
@@ -1135,7 +1122,7 @@ sendmail = base
 # name  Service  Switch  daemon for resolving names
 # from Windows NT servers.
 # 
-samba = base
+samba = module
 
 # Layer: apps
 # Module: screen
@@ -1181,7 +1168,6 @@ setroubleshoot = base
 # 
 slrnpull = off
 
-
 # Layer: apps
 # Module: slocate
 #
@@ -1201,21 +1187,21 @@ smartmon = module
 #
 # Simple network management protocol services
 # 
-snmp = base
+snmp = module
 
 # Layer: services
 # Module: spamassassin
 #
 # Filter used for removing unsolicited email.
 # 
-spamassassin = base
+spamassassin = module
 
 # Layer: services
 # Module: squid
 #
 # Squid caching http proxy server
 # 
-squid = base
+squid = module
 
 # Layer: services
 # Module: ssh
@@ -1236,7 +1222,7 @@ storage = base
 #
 # SSL Tunneling Proxy
 # 
-stunnel = base
+stunnel = module
 
 # Layer: admin
 # Module: su
@@ -1265,14 +1251,14 @@ sysnetwork = base
 #
 # Policy for sysstat. Reports on various system states
 # 
-sysstat = base
+sysstat = module
 
 # Layer: services
 # Module: tcpd
 #
 # Policy for TCP daemon.
 # 
-tcpd = base
+tcpd = module
 
 # Layer: system
 # Module: udev
@@ -1300,7 +1286,7 @@ unconfined = module
 #
 # wine executable
 # 
-wine = base
+wine = module
 
 # Layer: admin
 # Module: tzdata
@@ -1356,7 +1342,7 @@ usernetctl = module
 #
 # virtualization software
 # 
-xen = base
+xen = module
 
 # Layer: services
 # Module: virt
@@ -1384,7 +1370,7 @@ brctl = base
 #
 # Telnet daemon
 # 
-telnet = base
+telnet = module
 
 # Layer: services
 # Module: timidity
@@ -1398,14 +1384,14 @@ timidity = off
 #
 # Trivial file transfer protocol daemon
 # 
-tftp = base
+tftp = module
 
 # Layer: services
 # Module: uucp
 #
 # Unix to Unix Copy
 # 
-uucp = base
+uucp = module
 
 # Layer: services
 # Module: vbetool 
@@ -1419,14 +1405,14 @@ vbetool = base
 #
 # Web server log analysis
 # 
-webalizer = base
+webalizer = module
 
 # Layer: services
 # Module: xfs
 #
 # X Windows Font Server
 # 
-xfs = base
+xfs = module
 
 # Layer: services
 # Module: xserver
@@ -1440,7 +1426,7 @@ xserver = base
 #
 # Zebra border gateway protocol network routing service
 # 
-zebra = base
+zebra = module
 
 # Layer: admin
 # Module: usermanage
@@ -1511,14 +1497,7 @@ apcupsd = module
 #
 # Policy for aide
 # 
-aide = base
-
-# Layer: services
-# Module: aide
-#
-# Policy for aide
-# 
-aide = base
+aide = module
 
 # Layer: services
 # Module: w3c
@@ -1630,7 +1609,7 @@ kerneloops = module
 #
 # openoffice executable
 # 
-openoffice = base
+openoffice = module
 
 # Layer: apps
 # Module: podsleuth
diff --git a/policy-20080710.patch b/policy-20080710.patch
index 7c258d4..2359834 100644
--- a/policy-20080710.patch
+++ b/policy-20080710.patch
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.8/Makefile
 --- nsaserefpolicy/Makefile	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.8/Makefile	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/Makefile	2008-09-12 10:59:28.000000000 -0400
 @@ -311,20 +311,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -47,7 +47,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Mak
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.8/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.8/Rules.modular	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/Rules.modular	2008-09-12 10:59:28.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -79,7 +79,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rul
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.8/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -1,15 +0,0 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -98,13 +98,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context	2008-09-12 10:59:28.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/guest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -114,7 +114,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +guest_r:guest_t:s0		guest_r:guest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
  system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -130,7 +130,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -5,6 +5,8 @@
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
@@ -142,7 +142,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -6,4 +6,6 @@
  system_r:sshd_t:s0		unconfined_r:unconfined_t:s0
  system_r:sysadm_su_t:s0		unconfined_r:unconfined_t:s0
@@ -152,7 +152,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -5,4 +5,5 @@
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
@@ -162,13 +162,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +user_r:user_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context	2008-09-12 10:59:28.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mcs/xguest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -179,7 +179,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-mls/guest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -187,7 +187,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -195,7 +195,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +system_r:crond_t	guest_r:guest_crond_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -211,7 +211,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -220,7 +220,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +system_r:xdm_t		xguest_r:xguest_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.8/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/global_tunables	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/global_tunables	2008-09-12 10:59:28.000000000 -0400
 @@ -34,7 +34,7 @@
  
  ## <desc>
@@ -261,7 +261,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.5.8/policy/mls
 --- nsaserefpolicy/policy/mls	2008-09-05 10:28:20.000000000 -0400
-+++ serefpolicy-3.5.8/policy/mls	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/mls	2008-09-12 10:59:28.000000000 -0400
 @@ -381,11 +381,18 @@
  	 ( t1 == mlsxwinread ));
  
@@ -284,7 +284,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.8/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/alsa.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/alsa.te	2008-09-12 10:59:28.000000000 -0400
 @@ -51,6 +51,8 @@
  
  auth_use_nsswitch(alsa_t)
@@ -296,7 +296,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.8/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/anaconda.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/anaconda.te	2008-09-12 10:59:28.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -307,7 +307,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.5.8/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/certwatch.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/certwatch.te	2008-09-12 10:59:28.000000000 -0400
 @@ -15,8 +15,19 @@
  #
  # Local policy
@@ -346,7 +346,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.5.8/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/consoletype.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/consoletype.te	2008-09-12 10:59:28.000000000 -0400
 @@ -8,9 +8,11 @@
  
  type consoletype_t;
@@ -372,7 +372,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  init_use_fds(consoletype_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.5.8/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2008-08-25 09:12:31.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/firstboot.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/firstboot.te	2008-09-12 10:59:28.000000000 -0400
 @@ -118,15 +118,7 @@
  	usermanage_domtrans_admin_passwd(firstboot_t)
  ')
@@ -394,7 +394,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -') dnl end TODO
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.5.8/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/kismet.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/kismet.te	2008-09-12 10:59:28.000000000 -0400
 @@ -26,7 +26,10 @@
  #
  
@@ -415,40 +415,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  auth_use_nsswitch(kismet_t)
  
  files_read_etc_files(kismet_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-3.5.8/policy/modules/admin/kudzu.te
---- nsaserefpolicy/policy/modules/admin/kudzu.te	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/kudzu.te	2008-09-11 16:37:43.000000000 -0400
-@@ -21,8 +21,8 @@
- # Local policy
- #
- 
--allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod };
--dontaudit kudzu_t self:capability { sys_ptrace sys_tty_config };
-+allow kudzu_t self:capability { dac_override sys_admin sys_ptrace sys_rawio net_admin sys_tty_config mknod };
-+dontaudit kudzu_t self:capability sys_tty_config;
- allow kudzu_t self:process { signal_perms execmem };
- allow kudzu_t self:fifo_file rw_fifo_file_perms;
- allow kudzu_t self:unix_stream_socket { connectto create_stream_socket_perms };
-@@ -68,6 +68,7 @@
- modutils_read_module_deps(kudzu_t)
- modutils_read_module_config(kudzu_t)
- modutils_rename_module_config(kudzu_t)
-+modutils_unlink_module_config(kudzu_t)
- 
- storage_read_scsi_generic(kudzu_t)
- storage_read_tape(kudzu_t)
-@@ -103,6 +104,8 @@
- init_use_fds(kudzu_t)
- init_use_script_ptys(kudzu_t)
- init_stream_connect_script(kudzu_t)
-+init_read_init_state(kudzu_t)
-+init_ptrace_init_domain(kudzu_t)
- # kudzu will telinit to make init re-read
- # the inittab after configuring serial consoles
- init_telinit(kudzu_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.5.8/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2008-09-03 10:17:00.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/logrotate.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/logrotate.te	2008-09-12 10:59:28.000000000 -0400
 @@ -97,6 +97,7 @@
  files_read_etc_files(logrotate_t)
  files_read_etc_runtime_files(logrotate_t)
@@ -467,7 +436,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.5.8/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/logwatch.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/logwatch.te	2008-09-12 10:59:28.000000000 -0400
 @@ -54,18 +54,19 @@
  domain_read_all_domains_state(logwatch_t)
  
@@ -499,7 +468,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.5.8/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/mrtg.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/mrtg.te	2008-09-12 10:59:28.000000000 -0400
 @@ -78,6 +78,7 @@
  dev_read_urand(mrtg_t)
  
@@ -559,7 +528,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.if serefpolicy-3.5.8/policy/modules/admin/netutils.if
 --- nsaserefpolicy/policy/modules/admin/netutils.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/netutils.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/netutils.if	2008-09-12 10:59:28.000000000 -0400
 @@ -70,7 +70,7 @@
  
  ########################################
@@ -652,7 +621,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.5.8/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/netutils.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/netutils.te	2008-09-12 10:59:28.000000000 -0400
 @@ -50,6 +50,7 @@
  files_tmp_filetrans(netutils_t, netutils_tmp_t, { file dir })
  
@@ -774,7 +743,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.5.8/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/prelink.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/prelink.te	2008-09-12 10:59:28.000000000 -0400
 @@ -26,7 +26,7 @@
  # Local policy
  #
@@ -834,7 +803,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.5.8/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/readahead.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/readahead.te	2008-09-12 10:59:28.000000000 -0400
 @@ -22,7 +22,7 @@
  # Local policy
  #
@@ -854,7 +823,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.5.8/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/rpm.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/rpm.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -11,7 +11,8 @@
  
  /usr/sbin/system-install-packages --	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -885,7 +854,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ifdef(`distro_suse', `
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.5.8/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/rpm.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/rpm.if	2008-09-12 10:59:28.000000000 -0400
 @@ -152,6 +152,24 @@
  
  ########################################
@@ -1193,7 +1162,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.5.8/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/rpm.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/rpm.te	2008-09-12 10:59:28.000000000 -0400
 @@ -31,6 +31,9 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -1282,7 +1251,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	usermanage_domtrans_useradd(rpm_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.5.8/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/su.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/su.if	2008-09-12 10:59:28.000000000 -0400
 @@ -41,15 +41,13 @@
  
  	allow $2 $1_su_t:process signal;
@@ -1440,7 +1409,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #######################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.5.8/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/sudo.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/sudo.if	2008-09-12 10:59:28.000000000 -0400
 @@ -55,7 +55,7 @@
  	#
  
@@ -1555,7 +1524,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.5.8/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/tmpreaper.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/tmpreaper.te	2008-09-12 10:59:28.000000000 -0400
 @@ -22,12 +22,16 @@
  dev_read_urand(tmpreaper_t)
  
@@ -1602,7 +1571,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.5.8/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/usermanage.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/usermanage.te	2008-09-12 10:59:28.000000000 -0400
 @@ -97,6 +97,7 @@
  
  # allow checking if a shell is executable
@@ -1675,7 +1644,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.if serefpolicy-3.5.8/policy/modules/admin/vbetool.if
 --- nsaserefpolicy/policy/modules/admin/vbetool.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/vbetool.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/vbetool.if	2008-09-12 10:59:28.000000000 -0400
 @@ -18,3 +18,34 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, vbetool_exec_t, vbetool_t)
@@ -1713,7 +1682,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.5.8/policy/modules/admin/vbetool.te
 --- nsaserefpolicy/policy/modules/admin/vbetool.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/vbetool.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/vbetool.te	2008-09-12 10:59:28.000000000 -0400
 @@ -23,6 +23,9 @@
  dev_rwx_zero(vbetool_t)
  dev_read_sysfs(vbetool_t)
@@ -1735,7 +1704,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.if serefpolicy-3.5.8/policy/modules/admin/vpn.if
 --- nsaserefpolicy/policy/modules/admin/vpn.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/vpn.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/vpn.if	2008-09-12 10:59:28.000000000 -0400
 @@ -48,6 +48,7 @@
  	vpn_domtrans($1)
  	role $2 types vpnc_t;
@@ -1746,7 +1715,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-3.5.8/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/admin/vpn.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/admin/vpn.te	2008-09-12 10:59:28.000000000 -0400
 @@ -22,9 +22,10 @@
  # Local policy
  #
@@ -1770,7 +1739,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.fc serefpolicy-3.5.8/policy/modules/apps/ethereal.fc
 --- nsaserefpolicy/policy/modules/apps/ethereal.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/ethereal.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/ethereal.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.ethereal(/.*)? 		gen_context(system_u:object_r:ROLE_ethereal_home_t,s0)
 +HOME_DIR/\.ethereal(/.*)? 		gen_context(system_u:object_r:ethereal_home_t,s0)
@@ -1779,7 +1748,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/sbin/tethereal.*		--	gen_context(system_u:object_r:tethereal_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.if serefpolicy-3.5.8/policy/modules/apps/ethereal.if
 --- nsaserefpolicy/policy/modules/apps/ethereal.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/ethereal.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/ethereal.if	2008-09-12 10:59:28.000000000 -0400
 @@ -35,6 +35,7 @@
  template(`ethereal_per_role_template',`
  
@@ -1885,7 +1854,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #######################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.te serefpolicy-3.5.8/policy/modules/apps/ethereal.te
 --- nsaserefpolicy/policy/modules/apps/ethereal.te	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/ethereal.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/ethereal.te	2008-09-12 10:59:28.000000000 -0400
 @@ -16,6 +16,13 @@
  type tethereal_tmp_t;
  files_tmp_file(tethereal_tmp_t)
@@ -1902,7 +1871,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Tethereal policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.if serefpolicy-3.5.8/policy/modules/apps/games.if
 --- nsaserefpolicy/policy/modules/apps/games.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/games.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/games.if	2008-09-12 10:59:28.000000000 -0400
 @@ -130,10 +130,10 @@
  
  	sysnet_read_config($1_games_t)
@@ -1944,7 +1913,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.5.8/policy/modules/apps/gnome.fc
 --- nsaserefpolicy/policy/modules/apps/gnome.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/gnome.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/gnome.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,8 +1,10 @@
 -HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:ROLE_gnome_home_t,s0)
 -HOME_DIR/\.gconf(d)?(/.*)?	gen_context(system_u:object_r:ROLE_gconf_home_t,s0)
@@ -1964,7 +1933,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +HOME_DIR/.pulse(/.*)?		gen_context(system_u:object_r:gnome_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.5.8/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/gnome.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/gnome.if	2008-09-12 10:59:28.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		type gconfd_exec_t, gconf_etc_t;
@@ -2213,7 +2182,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.5.8/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/gnome.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/gnome.te	2008-09-12 10:59:28.000000000 -0400
 @@ -8,8 +8,34 @@
  
  attribute gnomedomain;
@@ -2254,7 +2223,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-3.5.8/policy/modules/apps/gpg.fc
 --- nsaserefpolicy/policy/modules/apps/gpg.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/gpg.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/gpg.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,9 +1,9 @@
 -HOME_DIR/\.gnupg(/.+)?		gen_context(system_u:object_r:ROLE_gpg_secret_t,s0)
 +HOME_DIR/\.gnupg(/.+)?		gen_context(system_u:object_r:gpg_secret_t,s0)
@@ -2271,7 +2240,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/lib(64)?/gnupg/gpgkeys.* --	gen_context(system_u:object_r:gpg_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-3.5.8/policy/modules/apps/gpg.if
 --- nsaserefpolicy/policy/modules/apps/gpg.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/gpg.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/gpg.if	2008-09-12 10:59:28.000000000 -0400
 @@ -37,6 +37,9 @@
  template(`gpg_per_role_template',`
  	gen_require(`
@@ -2610,7 +2579,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.5.8/policy/modules/apps/gpg.te
 --- nsaserefpolicy/policy/modules/apps/gpg.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/gpg.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/gpg.te	2008-09-12 10:59:28.000000000 -0400
 @@ -15,15 +15,253 @@
  gen_tunable(gpg_agent_env_file, false)
  
@@ -2871,7 +2840,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.5.8/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/java.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/java.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -3,14 +3,15 @@
  #
  /opt/(.*/)?bin/java[^/]* --	gen_context(system_u:object_r:java_exec_t,s0)
@@ -2905,7 +2874,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/bin/octave-[^/]*  	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.5.8/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/java.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/java.if	2008-09-12 10:59:28.000000000 -0400
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -3181,7 +3150,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.5.8/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/java.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/java.te	2008-09-12 10:59:28.000000000 -0400
 @@ -6,16 +6,10 @@
  # Declarations
  #
@@ -3233,13 +3202,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.5.8/policy/modules/apps/livecd.fc
 --- nsaserefpolicy/policy/modules/apps/livecd.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/livecd.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/livecd.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,2 @@
 +
 +/usr/bin/livecd-creator	--	gen_context(system_u:object_r:livecd_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.if serefpolicy-3.5.8/policy/modules/apps/livecd.if
 --- nsaserefpolicy/policy/modules/apps/livecd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/livecd.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/livecd.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,56 @@
 +
 +## <summary>policy for livecd</summary>
@@ -3299,7 +3268,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.te serefpolicy-3.5.8/policy/modules/apps/livecd.te
 --- nsaserefpolicy/policy/modules/apps/livecd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/livecd.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/livecd.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,26 @@
 +policy_module(livecd, 1.0.0)
 +
@@ -3329,7 +3298,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +seutil_domtrans_setfiles_mac(livecd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-3.5.8/policy/modules/apps/loadkeys.te
 --- nsaserefpolicy/policy/modules/apps/loadkeys.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/loadkeys.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/loadkeys.te	2008-09-12 10:59:28.000000000 -0400
 @@ -32,7 +32,6 @@
  term_dontaudit_use_console(loadkeys_t)
  term_use_unallocated_ttys(loadkeys_t)
@@ -3348,7 +3317,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +sysadm_dontaudit_list_home_dirs(loadkeys_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.5.8/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/mono.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/mono.if	2008-09-12 10:59:28.000000000 -0400
 @@ -21,7 +21,106 @@
  
  ########################################
@@ -3468,7 +3437,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	corecmd_search_bin($1)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.5.8/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/mono.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/mono.te	2008-09-12 10:59:28.000000000 -0400
 @@ -15,7 +15,7 @@
  # Local policy
  #
@@ -3488,7 +3457,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.fc serefpolicy-3.5.8/policy/modules/apps/mozilla.fc
 --- nsaserefpolicy/policy/modules/apps/mozilla.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/mozilla.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/mozilla.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,8 +1,8 @@
 -HOME_DIR/\.galeon(/.*)?			gen_context(system_u:object_r:ROLE_mozilla_home_t,s0)
 -HOME_DIR/\.java(/.*)?			gen_context(system_u:object_r:ROLE_mozilla_home_t,s0)
@@ -3519,7 +3488,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/lib64/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.5.8/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/mozilla.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/mozilla.if	2008-09-12 10:59:28.000000000 -0400
 @@ -35,7 +35,10 @@
  template(`mozilla_per_role_template',`
  	gen_require(`
@@ -3991,7 +3960,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.5.8/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/mozilla.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/mozilla.te	2008-09-12 10:59:28.000000000 -0400
 @@ -6,15 +6,20 @@
  # Declarations
  #
@@ -4022,7 +3991,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +typealias mozilla_tmp_t alias user_mozilla_tmp_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.fc serefpolicy-3.5.8/policy/modules/apps/mplayer.fc
 --- nsaserefpolicy/policy/modules/apps/mplayer.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/mplayer.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/mplayer.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -10,4 +10,4 @@
  /usr/bin/mencoder	--	gen_context(system_u:object_r:mencoder_exec_t,s0)
  /usr/bin/xine		--	gen_context(system_u:object_r:mplayer_exec_t,s0)
@@ -4031,7 +4000,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +HOME_DIR/\.mplayer(/.*)?        gen_context(system_u:object_r:mplayer_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.if serefpolicy-3.5.8/policy/modules/apps/mplayer.if
 --- nsaserefpolicy/policy/modules/apps/mplayer.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/mplayer.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/mplayer.if	2008-09-12 10:59:28.000000000 -0400
 @@ -34,7 +34,8 @@
  #
  template(`mplayer_per_role_template',`
@@ -4176,7 +4145,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.te serefpolicy-3.5.8/policy/modules/apps/mplayer.te
 --- nsaserefpolicy/policy/modules/apps/mplayer.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/mplayer.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/mplayer.te	2008-09-12 10:59:28.000000000 -0400
 @@ -22,3 +22,7 @@
  type mplayer_exec_t;
  corecmd_executable_file(mplayer_exec_t)
@@ -4187,7 +4156,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.5.8/policy/modules/apps/nsplugin.fc
 --- nsaserefpolicy/policy/modules/apps/nsplugin.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,8 @@
 +
 +/usr/lib(64)?/nspluginwrapper/npviewer.bin	--	gen_context(system_u:object_r:nsplugin_exec_t,s0)
@@ -4199,7 +4168,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +HOME_DIR/\.gstreamer-.*			gen_context(system_u:object_r:nsplugin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.5.8/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,292 @@
 +
 +## <summary>policy for nsplugin</summary>
@@ -4495,7 +4464,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.5.8/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,226 @@
 +
 +policy_module(nsplugin, 1.0.0)
@@ -4725,14 +4694,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.fc serefpolicy-3.5.8/policy/modules/apps/openoffice.fc
 --- nsaserefpolicy/policy/modules/apps/openoffice.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/openoffice.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/openoffice.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,3 @@
 +/usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:openoffice_exec_t,s0)
 +/usr/lib64/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:openoffice_exec_t,s0)
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.if serefpolicy-3.5.8/policy/modules/apps/openoffice.if
 --- nsaserefpolicy/policy/modules/apps/openoffice.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/openoffice.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/openoffice.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,102 @@
 +## <summary>Openoffice</summary>
 +
@@ -4838,7 +4807,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.te serefpolicy-3.5.8/policy/modules/apps/openoffice.te
 --- nsaserefpolicy/policy/modules/apps/openoffice.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/openoffice.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/openoffice.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,14 @@
 +
 +policy_module(openoffice, 1.0.0)
@@ -4856,7 +4825,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.fc serefpolicy-3.5.8/policy/modules/apps/podsleuth.fc
 --- nsaserefpolicy/policy/modules/apps/podsleuth.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,2 +1,4 @@
  
  /usr/bin/podsleuth	--	gen_context(system_u:object_r:podsleuth_exec_t,s0)
@@ -4864,7 +4833,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/cache/podsleuth(/.*)?		gen_context(system_u:object_r:podsleuth_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.if serefpolicy-3.5.8/policy/modules/apps/podsleuth.if
 --- nsaserefpolicy/policy/modules/apps/podsleuth.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.if	2008-09-12 10:59:28.000000000 -0400
 @@ -16,4 +16,38 @@
  	')
  
@@ -4906,7 +4875,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.5.8/policy/modules/apps/podsleuth.te
 --- nsaserefpolicy/policy/modules/apps/podsleuth.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.te	2008-09-12 10:59:28.000000000 -0400
 @@ -11,24 +11,55 @@
  application_domain(podsleuth_t, podsleuth_exec_t)
  role system_r types podsleuth_t;
@@ -4967,7 +4936,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  dbus_system_bus_client_template(podsleuth, podsleuth_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.5.8/policy/modules/apps/qemu.fc
 --- nsaserefpolicy/policy/modules/apps/qemu.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/qemu.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/qemu.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,2 +1,4 @@
  /usr/bin/qemu	--	gen_context(system_u:object_r:qemu_exec_t,s0)
  /usr/bin/qemu-kvm --	gen_context(system_u:object_r:qemu_exec_t,s0)
@@ -4975,7 +4944,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/cache/libvirt(/.*)? -- gen_context(system_u:object_r:qemu_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.if serefpolicy-3.5.8/policy/modules/apps/qemu.if
 --- nsaserefpolicy/policy/modules/apps/qemu.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/qemu.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/qemu.if	2008-09-12 10:59:28.000000000 -0400
 @@ -48,6 +48,48 @@
  	allow qemu_t $3:chr_file rw_file_perms;
  ')
@@ -5334,7 +5303,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.5.8/policy/modules/apps/qemu.te
 --- nsaserefpolicy/policy/modules/apps/qemu.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/qemu.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/qemu.te	2008-09-12 10:59:28.000000000 -0400
 @@ -6,6 +6,8 @@
  # Declarations
  #
@@ -5480,7 +5449,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # qemu_unconfined local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-3.5.8/policy/modules/apps/screen.fc
 --- nsaserefpolicy/policy/modules/apps/screen.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/screen.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/screen.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # /home
@@ -5492,7 +5461,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # /usr
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.5.8/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/screen.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/screen.if	2008-09-12 10:59:28.000000000 -0400
 @@ -35,6 +35,7 @@
  template(`screen_per_role_template',`
  	gen_require(`
@@ -5547,7 +5516,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	kernel_read_kernel_sysctls($1_screen_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.te serefpolicy-3.5.8/policy/modules/apps/screen.te
 --- nsaserefpolicy/policy/modules/apps/screen.te	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/screen.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/screen.te	2008-09-12 10:59:28.000000000 -0400
 @@ -11,3 +11,7 @@
  
  type screen_exec_t;
@@ -5558,7 +5527,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.fc serefpolicy-3.5.8/policy/modules/apps/thunderbird.fc
 --- nsaserefpolicy/policy/modules/apps/thunderbird.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/thunderbird.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/thunderbird.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -3,4 +3,4 @@
  #
  /usr/bin/thunderbird.*			--	gen_context(system_u:object_r:thunderbird_exec_t,s0)
@@ -5567,7 +5536,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +HOME_DIR/\.thunderbird(/.*)?			gen_context(system_u:object_r:user_thunderbird_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.if serefpolicy-3.5.8/policy/modules/apps/thunderbird.if
 --- nsaserefpolicy/policy/modules/apps/thunderbird.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/thunderbird.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/thunderbird.if	2008-09-12 10:59:28.000000000 -0400
 @@ -43,9 +43,9 @@
  	application_domain($1_thunderbird_t, thunderbird_exec_t)
  	role $3 types $1_thunderbird_t;
@@ -5641,7 +5610,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	',`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.te serefpolicy-3.5.8/policy/modules/apps/thunderbird.te
 --- nsaserefpolicy/policy/modules/apps/thunderbird.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/thunderbird.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/thunderbird.te	2008-09-12 10:59:28.000000000 -0400
 @@ -8,3 +8,7 @@
  
  type thunderbird_exec_t;
@@ -5652,7 +5621,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.if serefpolicy-3.5.8/policy/modules/apps/tvtime.if
 --- nsaserefpolicy/policy/modules/apps/tvtime.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/tvtime.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/tvtime.if	2008-09-12 10:59:28.000000000 -0400
 @@ -35,6 +35,7 @@
  template(`tvtime_per_role_template',`
  	gen_require(`
@@ -5722,7 +5691,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	ps_process_pattern($2,$1_tvtime_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.te serefpolicy-3.5.8/policy/modules/apps/tvtime.te
 --- nsaserefpolicy/policy/modules/apps/tvtime.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/tvtime.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/tvtime.te	2008-09-12 10:59:28.000000000 -0400
 @@ -11,3 +11,9 @@
  
  type tvtime_dir_t;
@@ -5735,7 +5704,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +files_tmp_file(user_tvtime_tmp_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.fc serefpolicy-3.5.8/policy/modules/apps/uml.fc
 --- nsaserefpolicy/policy/modules/apps/uml.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/uml.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/uml.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # HOME_DIR/
@@ -5747,7 +5716,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # /usr
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.5.8/policy/modules/apps/vmware.fc
 --- nsaserefpolicy/policy/modules/apps/vmware.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/vmware.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/vmware.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,9 +1,9 @@
  #
  # HOME_DIR/
@@ -5808,7 +5777,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/lib/vmware-tools/sbin64/vmware.*	--	gen_context(system_u:object_r:vmware_host_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.if serefpolicy-3.5.8/policy/modules/apps/vmware.if
 --- nsaserefpolicy/policy/modules/apps/vmware.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/vmware.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/vmware.if	2008-09-12 10:59:28.000000000 -0400
 @@ -47,11 +47,8 @@
  	domain_entry_file($1_vmware_t, vmware_exec_t)
  	role $3 types $1_vmware_t;
@@ -5840,7 +5809,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	manage_dirs_pattern($1_vmware_t, $1_vmware_tmp_t, $1_vmware_tmp_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.5.8/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/vmware.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/vmware.te	2008-09-12 10:59:28.000000000 -0400
 @@ -10,14 +10,14 @@
  type vmware_exec_t;
  corecmd_executable_file(vmware_exec_t)
@@ -5913,7 +5882,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.5.8/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/wine.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/wine.if	2008-09-12 10:59:28.000000000 -0400
 @@ -49,3 +49,53 @@
  	role $2 types wine_t;
  	allow wine_t $3:chr_file rw_term_perms;
@@ -5970,7 +5939,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.5.8/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/wine.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/wine.te	2008-09-12 10:59:28.000000000 -0400
 @@ -9,6 +9,7 @@
  type wine_t;
  type wine_exec_t;
@@ -5999,7 +5968,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wireshark.if serefpolicy-3.5.8/policy/modules/apps/wireshark.if
 --- nsaserefpolicy/policy/modules/apps/wireshark.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/apps/wireshark.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/wireshark.if	2008-09-12 10:59:28.000000000 -0400
 @@ -134,7 +134,7 @@
  
  	sysnet_read_config($1_wireshark_t)
@@ -6011,14 +5980,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  		fs_manage_nfs_dirs($1_wireshark_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.fc serefpolicy-3.5.8/policy/modules/apps/wm.fc
 --- nsaserefpolicy/policy/modules/apps/wm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/wm.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/wm.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,3 @@
 +/usr/bin/twm		--	gen_context(system_u:object_r:wm_exec_t,s0)
 +/usr/bin/openbox	--	gen_context(system_u:object_r:wm_exec_t,s0)
 +/usr/bin/metacity	--	gen_context(system_u:object_r:wm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.if serefpolicy-3.5.8/policy/modules/apps/wm.if
 --- nsaserefpolicy/policy/modules/apps/wm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/wm.if	2008-09-12 09:29:03.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/wm.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,160 @@
 +## <summary>Window Manager.</summary>
 +
@@ -6182,7 +6151,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.te serefpolicy-3.5.8/policy/modules/apps/wm.te
 --- nsaserefpolicy/policy/modules/apps/wm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/apps/wm.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/apps/wm.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,10 @@
 +policy_module(wm,0.0.4)
 +
@@ -6196,7 +6165,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +wm_domain_template(user,xdm)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.5.8/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/corecommands.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/corecommands.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -129,6 +129,8 @@
  /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -6235,7 +6204,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.5.8/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/corecommands.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/corecommands.if	2008-09-12 10:59:28.000000000 -0400
 @@ -894,6 +894,7 @@
  
  	read_lnk_files_pattern($1, bin_t, bin_t)
@@ -6246,7 +6215,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.5.8/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2008-09-05 10:28:20.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/corenetwork.te.in	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/corenetwork.te.in	2008-09-12 10:59:28.000000000 -0400
 @@ -75,6 +75,7 @@
  network_port(aol, udp,5190,s0, tcp,5190,s0, udp,5191,s0, tcp,5191,s0, udp,5192,s0, tcp,5192,s0, udp,5193,s0, tcp,5193,s0) 
  network_port(apcupsd, tcp,3551,s0, udp,3551,s0)
@@ -6327,7 +6296,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  network_port(xfs, tcp,7100,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.5.8/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/devices.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/devices.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,7 +1,7 @@
  
  /dev			-d	gen_context(system_u:object_r:device_t,s0)
@@ -6449,7 +6418,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.5.8/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/devices.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/devices.if	2008-09-12 10:59:28.000000000 -0400
 @@ -65,7 +65,7 @@
  
  	relabelfrom_dirs_pattern($1, device_t, device_node)
@@ -6919,7 +6888,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.5.8/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/devices.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/devices.te	2008-09-12 10:59:28.000000000 -0400
 @@ -32,6 +32,12 @@
  type apm_bios_t;
  dev_node(apm_bios_t)
@@ -6987,7 +6956,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  type power_device_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.5.8/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/domain.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/domain.if	2008-09-12 10:59:28.000000000 -0400
 @@ -1247,18 +1247,34 @@
  ##	</summary>
  ## </param>
@@ -7028,7 +6997,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	all protocols (TCP, UDP, etc)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.5.8/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/domain.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/domain.te	2008-09-12 10:59:28.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -7111,7 +7080,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +dontaudit can_change_object_identity can_change_object_identity:key link;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.5.8/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/files.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/files.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -32,6 +32,7 @@
  /boot/lost\+found	-d	gen_context(system_u:object_r:lost_found_t,mls_systemhigh)
  /boot/lost\+found/.*		<<none>>
@@ -7122,7 +7091,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # /emul
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.5.8/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/files.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/files.if	2008-09-12 10:59:28.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -7460,7 +7429,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.5.8/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/files.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/files.te	2008-09-12 10:59:28.000000000 -0400
 @@ -52,11 +52,14 @@
  #
  # etc_t is the type of the system etc directories.
@@ -7499,7 +7468,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.5.8/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/filesystem.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/filesystem.if	2008-09-12 10:59:28.000000000 -0400
 @@ -535,6 +535,24 @@
  
  ########################################
@@ -7934,7 +7903,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.5.8/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/filesystem.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/filesystem.te	2008-09-12 10:59:28.000000000 -0400
 @@ -21,7 +21,6 @@
  
  # Use xattrs for the following filesystem types.
@@ -7965,7 +7934,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.5.8/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/kernel.if	2008-09-11 16:44:22.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/kernel.if	2008-09-12 10:59:28.000000000 -0400
 @@ -1198,6 +1198,7 @@
  	')
  
@@ -8009,7 +7978,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.5.8/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/kernel.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/kernel.te	2008-09-12 10:59:28.000000000 -0400
 @@ -63,6 +63,15 @@
  genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
  
@@ -8045,7 +8014,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	files_read_default_files(kernel_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.5.8/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/selinux.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/selinux.if	2008-09-12 10:59:28.000000000 -0400
 @@ -164,6 +164,7 @@
  		type security_t;
  	')
@@ -8166,7 +8135,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-3.5.8/policy/modules/kernel/selinux.te
 --- nsaserefpolicy/policy/modules/kernel/selinux.te	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/kernel/selinux.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/kernel/selinux.te	2008-09-12 10:59:28.000000000 -0400
 @@ -10,6 +10,7 @@
  attribute can_setenforce;
  attribute can_setsecparam;
@@ -8189,12 +8158,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  neverallow ~{ selinux_unconfined_type can_setsecparam } security_t:security setsecparam;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.fc serefpolicy-3.5.8/policy/modules/roles/guest.fc
 --- nsaserefpolicy/policy/modules/roles/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/guest.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/guest.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1 @@
 +# file contexts handled by userdomain and genhomedircon
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.if serefpolicy-3.5.8/policy/modules/roles/guest.if
 --- nsaserefpolicy/policy/modules/roles/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/guest.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/guest.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,161 @@
 +## <summary>Least privledge terminal user role</summary>
 +
@@ -8359,7 +8328,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.5.8/policy/modules/roles/guest.te
 --- nsaserefpolicy/policy/modules/roles/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/guest.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/guest.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,44 @@
 +
 +policy_module(guest, 1.0.0)
@@ -8407,12 +8376,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.fc serefpolicy-3.5.8/policy/modules/roles/logadm.fc
 --- nsaserefpolicy/policy/modules/roles/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/logadm.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/logadm.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1 @@
 +# file contexts handled by userdomain and genhomedircon
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.if serefpolicy-3.5.8/policy/modules/roles/logadm.if
 --- nsaserefpolicy/policy/modules/roles/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/logadm.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/logadm.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,44 @@
 +## <summary>Audit administrator role</summary>
 +
@@ -8460,7 +8429,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.te serefpolicy-3.5.8/policy/modules/roles/logadm.te
 --- nsaserefpolicy/policy/modules/roles/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/logadm.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/logadm.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,20 @@
 +
 +policy_module(logadm, 1.0.0)
@@ -8484,7 +8453,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t })
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.5.8/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/roles/staff.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/staff.te	2008-09-12 10:59:28.000000000 -0400
 @@ -8,23 +8,52 @@
  
  role staff_r;
@@ -8541,7 +8510,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.if serefpolicy-3.5.8/policy/modules/roles/sysadm.if
 --- nsaserefpolicy/policy/modules/roles/sysadm.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/roles/sysadm.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/sysadm.if	2008-09-12 10:59:28.000000000 -0400
 @@ -334,10 +334,10 @@
  #
  interface(`sysadm_getattr_home_dirs',`
@@ -8703,7 +8672,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ## <summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.5.8/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/roles/sysadm.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/sysadm.te	2008-09-12 10:59:28.000000000 -0400
 @@ -171,6 +171,10 @@
  ')
  
@@ -8717,7 +8686,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.if serefpolicy-3.5.8/policy/modules/roles/unprivuser.if
 --- nsaserefpolicy/policy/modules/roles/unprivuser.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/roles/unprivuser.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/unprivuser.if	2008-09-12 10:59:28.000000000 -0400
 @@ -62,6 +62,26 @@
  	files_home_filetrans($1, user_home_dir_t, dir)
  ')
@@ -9363,7 +9332,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.5.8/policy/modules/roles/unprivuser.te
 --- nsaserefpolicy/policy/modules/roles/unprivuser.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/roles/unprivuser.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/unprivuser.te	2008-09-12 10:59:28.000000000 -0400
 @@ -13,3 +13,23 @@
  
  userdom_unpriv_user_template(user)
@@ -9390,12 +9359,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.fc serefpolicy-3.5.8/policy/modules/roles/webadm.fc
 --- nsaserefpolicy/policy/modules/roles/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/webadm.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/webadm.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.if serefpolicy-3.5.8/policy/modules/roles/webadm.if
 --- nsaserefpolicy/policy/modules/roles/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/webadm.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/webadm.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,44 @@
 +## <summary>Policy for webadm role</summary>
 +
@@ -9443,7 +9412,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.te serefpolicy-3.5.8/policy/modules/roles/webadm.te
 --- nsaserefpolicy/policy/modules/roles/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/webadm.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/webadm.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,65 @@
 +
 +policy_module(webadm, 1.0.0)
@@ -9512,12 +9481,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.fc serefpolicy-3.5.8/policy/modules/roles/xguest.fc
 --- nsaserefpolicy/policy/modules/roles/xguest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/xguest.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/xguest.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1 @@
 +# file contexts handled by userdomain and genhomedircon
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.if serefpolicy-3.5.8/policy/modules/roles/xguest.if
 --- nsaserefpolicy/policy/modules/roles/xguest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/xguest.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/xguest.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,161 @@
 +## <summary>Least privledge X Windows user role</summary>
 +
@@ -9682,7 +9651,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.5.8/policy/modules/roles/xguest.te
 --- nsaserefpolicy/policy/modules/roles/xguest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/roles/xguest.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/roles/xguest.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,83 @@
 +
 +policy_module(xguest, 1.0.0)
@@ -9769,7 +9738,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.if serefpolicy-3.5.8/policy/modules/services/aide.if
 --- nsaserefpolicy/policy/modules/services/aide.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/aide.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/aide.if	2008-09-12 10:59:28.000000000 -0400
 @@ -70,9 +70,11 @@
  	allow $1 aide_t:process { ptrace signal_perms };
  	ps_process_pattern($1, aide_t)
@@ -9786,7 +9755,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.fc serefpolicy-3.5.8/policy/modules/services/amavis.fc
 --- nsaserefpolicy/policy/modules/services/amavis.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/amavis.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/amavis.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,8 +1,9 @@
  
  /etc/amavis\.conf		--	gen_context(system_u:object_r:amavis_etc_t,s0)
@@ -9806,7 +9775,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/amavis	--	gen_context(system_u:object_r:amavis_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.if serefpolicy-3.5.8/policy/modules/services/amavis.if
 --- nsaserefpolicy/policy/modules/services/amavis.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/amavis.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/amavis.if	2008-09-12 10:59:28.000000000 -0400
 @@ -189,6 +189,25 @@
  
  ########################################
@@ -9878,7 +9847,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.5.8/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/amavis.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/amavis.te	2008-09-12 10:59:28.000000000 -0400
 @@ -13,7 +13,7 @@
  
  # configuration files
@@ -9909,7 +9878,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  read_files_pattern(amavis_t, amavis_etc_t, amavis_etc_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.5.8/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/apache.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/apache.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,10 +1,10 @@
 -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_ROLE_content_t,s0)
 +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
@@ -10000,7 +9969,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/httpd	--	gen_context(system_u:object_r:httpd_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.5.8/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/apache.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/apache.if	2008-09-12 10:59:28.000000000 -0400
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -10671,7 +10640,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.5.8/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/apache.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/apache.te	2008-09-12 10:59:28.000000000 -0400
 @@ -20,6 +20,8 @@
  # Declarations
  #
@@ -11302,7 +11271,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +manage_lnk_files_pattern(httpd_t,httpdcontent,httpd_rw_content)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-3.5.8/policy/modules/services/apcupsd.fc
 --- nsaserefpolicy/policy/modules/services/apcupsd.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/apcupsd.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/apcupsd.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,3 +1,5 @@
 +/etc/rc\.d/init\.d/apcupsd	--	gen_context(system_u:object_r:apcupsd_script_exec_t,s0)
 +
@@ -11311,7 +11280,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-3.5.8/policy/modules/services/apcupsd.if
 --- nsaserefpolicy/policy/modules/services/apcupsd.if	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/apcupsd.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/apcupsd.if	2008-09-12 10:59:28.000000000 -0400
 @@ -97,3 +97,74 @@
  
  	domtrans_pattern($1, httpd_apcupsd_cgi_script_exec_t, httpd_apcupsd_cgi_script_t)
@@ -11389,7 +11358,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-3.5.8/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/apcupsd.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/apcupsd.te	2008-09-12 10:59:28.000000000 -0400
 @@ -22,6 +22,9 @@
  type apcupsd_var_run_t;
  files_pid_file(apcupsd_var_run_t)
@@ -11421,7 +11390,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.fc serefpolicy-3.5.8/policy/modules/services/arpwatch.fc
 --- nsaserefpolicy/policy/modules/services/arpwatch.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/arpwatch.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/arpwatch.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -9,3 +9,5 @@
  #
  /var/arpwatch(/.*)?		gen_context(system_u:object_r:arpwatch_data_t,s0)
@@ -11430,7 +11399,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/arpwatch	--	gen_context(system_u:object_r:arpwatch_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.if serefpolicy-3.5.8/policy/modules/services/arpwatch.if
 --- nsaserefpolicy/policy/modules/services/arpwatch.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/arpwatch.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/arpwatch.if	2008-09-12 10:59:28.000000000 -0400
 @@ -90,3 +90,73 @@
  
  	dontaudit $1 arpwatch_t:packet_socket { read write };
@@ -11507,7 +11476,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-3.5.8/policy/modules/services/arpwatch.te
 --- nsaserefpolicy/policy/modules/services/arpwatch.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/arpwatch.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/arpwatch.te	2008-09-12 10:59:28.000000000 -0400
 @@ -19,6 +19,9 @@
  type arpwatch_var_run_t;
  files_pid_file(arpwatch_var_run_t)
@@ -11520,7 +11489,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.fc serefpolicy-3.5.8/policy/modules/services/asterisk.fc
 --- nsaserefpolicy/policy/modules/services/asterisk.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/asterisk.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/asterisk.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -6,3 +6,4 @@
  /var/log/asterisk(/.*)?		gen_context(system_u:object_r:asterisk_log_t,s0)
  /var/run/asterisk(/.*)?		gen_context(system_u:object_r:asterisk_var_run_t,s0)
@@ -11528,7 +11497,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/asterisk	--	gen_context(system_u:object_r:asterisk_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.if serefpolicy-3.5.8/policy/modules/services/asterisk.if
 --- nsaserefpolicy/policy/modules/services/asterisk.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/asterisk.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/asterisk.if	2008-09-12 10:59:28.000000000 -0400
 @@ -1 +1,83 @@
  ## <summary>Asterisk IP telephony server</summary>
 +
@@ -11615,7 +11584,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.5.8/policy/modules/services/asterisk.te
 --- nsaserefpolicy/policy/modules/services/asterisk.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/asterisk.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/asterisk.te	2008-09-12 10:59:28.000000000 -0400
 @@ -31,6 +31,9 @@
  type asterisk_var_run_t;
  files_pid_file(asterisk_var_run_t)
@@ -11628,7 +11597,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.fc serefpolicy-3.5.8/policy/modules/services/audioentropy.fc
 --- nsaserefpolicy/policy/modules/services/audioentropy.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/audioentropy.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/audioentropy.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -2,3 +2,5 @@
  # /usr
  #
@@ -11637,7 +11606,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/run/audio-entropyd\.pid	--	gen_context(system_u:object_r:entropyd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.5.8/policy/modules/services/audioentropy.te
 --- nsaserefpolicy/policy/modules/services/audioentropy.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/audioentropy.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/audioentropy.te	2008-09-12 10:59:28.000000000 -0400
 @@ -35,6 +35,7 @@
  dev_read_rand(entropyd_t)
  dev_write_rand(entropyd_t)
@@ -11648,7 +11617,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  fs_search_auto_mountpoints(entropyd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.fc serefpolicy-3.5.8/policy/modules/services/automount.fc
 --- nsaserefpolicy/policy/modules/services/automount.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/automount.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/automount.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -12,4 +12,7 @@
  # /var
  #
@@ -11660,7 +11629,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-3.5.8/policy/modules/services/automount.if
 --- nsaserefpolicy/policy/modules/services/automount.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/automount.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/automount.if	2008-09-12 10:59:28.000000000 -0400
 @@ -74,3 +74,109 @@
  
  	dontaudit $1 automount_tmp_t:dir getattr;
@@ -11773,7 +11742,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.5.8/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/automount.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/automount.te	2008-09-12 10:59:28.000000000 -0400
 @@ -20,6 +20,9 @@
  files_tmp_file(automount_tmp_t)
  files_mountpoint(automount_tmp_t)
@@ -11869,7 +11838,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.fc serefpolicy-3.5.8/policy/modules/services/avahi.fc
 --- nsaserefpolicy/policy/modules/services/avahi.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/avahi.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/avahi.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -3,3 +3,7 @@
  /usr/sbin/avahi-dnsconfd 	--	gen_context(system_u:object_r:avahi_exec_t,s0)
  
@@ -11880,7 +11849,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-3.5.8/policy/modules/services/avahi.if
 --- nsaserefpolicy/policy/modules/services/avahi.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/avahi.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/avahi.if	2008-09-12 10:59:28.000000000 -0400
 @@ -57,3 +57,64 @@
  
  	dontaudit $1 avahi_var_run_t:dir search_dir_perms;
@@ -11948,7 +11917,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.5.8/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/avahi.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/avahi.te	2008-09-12 10:59:28.000000000 -0400
 @@ -13,6 +13,9 @@
  type avahi_var_run_t;
  files_pid_file(avahi_var_run_t)
@@ -11978,7 +11947,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.5.8/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2008-09-03 10:17:00.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/bind.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/bind.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -51,3 +51,5 @@
  /var/named/chroot/var/log/named.*	--	gen_context(system_u:object_r:named_log_t,s0)
  /var/named/dynamic(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
@@ -11987,7 +11956,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/named	--	gen_context(system_u:object_r:named_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.5.8/policy/modules/services/bind.if
 --- nsaserefpolicy/policy/modules/services/bind.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/bind.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/bind.if	2008-09-12 10:59:28.000000000 -0400
 @@ -254,3 +254,86 @@
  interface(`bind_udp_chat_named',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -12077,7 +12046,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.5.8/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2008-09-03 10:17:00.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/bind.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/bind.te	2008-09-12 10:59:28.000000000 -0400
 @@ -53,6 +53,9 @@
  init_system_domain(ndc_t, ndc_exec_t)
  role system_r types ndc_t;
@@ -12107,7 +12076,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  domain_use_interactive_fds(ndc_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.fc serefpolicy-3.5.8/policy/modules/services/bitlbee.fc
 --- nsaserefpolicy/policy/modules/services/bitlbee.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/bitlbee.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/bitlbee.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,3 +1,6 @@
  /usr/sbin/bitlbee	--	gen_context(system_u:object_r:bitlbee_exec_t,s0)
  /etc/bitlbee(/.*)?		gen_context(system_u:object_r:bitlbee_conf_t,s0)
@@ -12117,7 +12086,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/bitlbee	--	gen_context(system_u:object_r:bitlbee_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.if serefpolicy-3.5.8/policy/modules/services/bitlbee.if
 --- nsaserefpolicy/policy/modules/services/bitlbee.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/bitlbee.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/bitlbee.if	2008-09-12 10:59:28.000000000 -0400
 @@ -20,3 +20,70 @@
  	allow $1 bitlbee_conf_t:file { read getattr };
  ')
@@ -12191,7 +12160,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.te serefpolicy-3.5.8/policy/modules/services/bitlbee.te
 --- nsaserefpolicy/policy/modules/services/bitlbee.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/bitlbee.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/bitlbee.te	2008-09-12 10:59:28.000000000 -0400
 @@ -17,6 +17,12 @@
  type bitlbee_var_t;
  files_type(bitlbee_var_t)
@@ -12245,7 +12214,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.fc serefpolicy-3.5.8/policy/modules/services/bluetooth.fc
 --- nsaserefpolicy/policy/modules/services/bluetooth.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/bluetooth.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/bluetooth.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -22,3 +22,8 @@
  #
  /var/lib/bluetooth(/.*)?	gen_context(system_u:object_r:bluetooth_var_lib_t,s0)
@@ -12257,7 +12226,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/pand	--	gen_context(system_u:object_r:bluetooth_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.5.8/policy/modules/services/bluetooth.if
 --- nsaserefpolicy/policy/modules/services/bluetooth.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/bluetooth.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/bluetooth.if	2008-09-12 10:59:28.000000000 -0400
 @@ -226,3 +226,88 @@
  	dontaudit $1 bluetooth_helper_domain:dir search;
  	dontaudit $1 bluetooth_helper_domain:file { read getattr };
@@ -12349,7 +12318,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.5.8/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/bluetooth.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/bluetooth.te	2008-09-12 10:59:28.000000000 -0400
 @@ -32,19 +32,22 @@
  type bluetooth_var_run_t;
  files_pid_file(bluetooth_var_run_t)
@@ -12424,7 +12393,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.fc serefpolicy-3.5.8/policy/modules/services/canna.fc
 --- nsaserefpolicy/policy/modules/services/canna.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/canna.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/canna.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -20,3 +20,5 @@
  /var/run/\.iroha_unix	-d	gen_context(system_u:object_r:canna_var_run_t,s0)
  /var/run/\.iroha_unix/.* -s	gen_context(system_u:object_r:canna_var_run_t,s0)
@@ -12433,7 +12402,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/canna	--	gen_context(system_u:object_r:canna_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.if serefpolicy-3.5.8/policy/modules/services/canna.if
 --- nsaserefpolicy/policy/modules/services/canna.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/canna.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/canna.if	2008-09-12 10:59:28.000000000 -0400
 @@ -18,3 +18,74 @@
  	files_search_pids($1)
  	stream_connect_pattern($1, canna_var_run_t, canna_var_run_t,canna_t)
@@ -12511,7 +12480,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.te serefpolicy-3.5.8/policy/modules/services/canna.te
 --- nsaserefpolicy/policy/modules/services/canna.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/canna.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/canna.te	2008-09-12 10:59:28.000000000 -0400
 @@ -19,6 +19,9 @@
  type canna_var_run_t;
  files_pid_file(canna_var_run_t)
@@ -12524,7 +12493,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.5.8/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/clamav.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/clamav.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -5,16 +5,18 @@
  /usr/bin/freshclam		--	gen_context(system_u:object_r:freshclam_exec_t,s0)
  
@@ -12551,7 +12520,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/clamd-wrapper	--	gen_context(system_u:object_r:clamd_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-3.5.8/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/clamav.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/clamav.if	2008-09-12 10:59:28.000000000 -0400
 @@ -38,6 +38,27 @@
  
  ########################################
@@ -12699,7 +12668,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.5.8/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/clamav.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/clamav.te	2008-09-12 10:59:28.000000000 -0400
 @@ -13,7 +13,7 @@
  
  # configuration files
@@ -12798,7 +12767,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-3.5.8/policy/modules/services/consolekit.fc
 --- nsaserefpolicy/policy/modules/services/consolekit.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/consolekit.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/consolekit.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,3 +1,6 @@
  /usr/sbin/console-kit-daemon	--	gen_context(system_u:object_r:consolekit_exec_t,s0)
  
@@ -12808,7 +12777,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/log/ConsoleKit(/.*)?	gen_context(system_u:object_r:consolekit_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.5.8/policy/modules/services/consolekit.if
 --- nsaserefpolicy/policy/modules/services/consolekit.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/consolekit.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/consolekit.if	2008-09-12 10:59:28.000000000 -0400
 @@ -38,3 +38,24 @@
  	allow $1 consolekit_t:dbus send_msg;
  	allow consolekit_t $1:dbus send_msg;
@@ -12836,7 +12805,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.5.8/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/consolekit.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/consolekit.te	2008-09-12 10:59:28.000000000 -0400
 @@ -13,6 +13,9 @@
  type consolekit_var_run_t;
  files_pid_file(consolekit_var_run_t)
@@ -12953,23 +12922,25 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.fc serefpolicy-3.5.8/policy/modules/services/courier.fc
 --- nsaserefpolicy/policy/modules/services/courier.fc	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/courier.fc	2008-09-11 16:37:43.000000000 -0400
-@@ -21,3 +21,4 @@
- /var/run/courier(/.*)?			--	gen_context(system_u:object_r:courier_var_run_t,s0)
++++ serefpolicy-3.5.8/policy/modules/services/courier.fc	2008-09-12 16:32:00.000000000 -0400
+@@ -19,5 +19,5 @@
+ /var/lib/courier(/.*)?			--	gen_context(system_u:object_r:courier_var_lib_t,s0)
  
+ /var/run/courier(/.*)?			--	gen_context(system_u:object_r:courier_var_run_t,s0)
+-
  /var/spool/courier(/.*)?			gen_context(system_u:object_r:courier_spool_t,s0)
 +/var/spool/authdaemon(/.*)?			gen_context(system_u:object_r:courier_spool_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.5.8/policy/modules/services/courier.te
---- nsaserefpolicy/policy/modules/services/courier.te	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/courier.te	2008-09-11 16:37:43.000000000 -0400
-@@ -28,6 +28,7 @@
+--- nsaserefpolicy/policy/modules/services/courier.te	2008-09-12 10:48:05.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/courier.te	2008-09-12 16:31:05.000000000 -0400
+@@ -10,6 +10,7 @@
  
- type courier_exec_t;
- files_type(courier_exec_t)
-+mta_mailclient(courier_exec_t)
+ type courier_etc_t;
+ files_config_file(courier_etc_t)
++mta_system_content(courier_etc_t)
+ 
+ courier_domain_template(pcp)
  
- courier_domain_template(sqwebmail)
- typealias courier_sqwebmail_exec_t alias sqwebmail_cron_exec_t;
 @@ -73,6 +74,9 @@
  
  sysadm_dontaudit_search_home_dirs(courier_authdaemon_t)
@@ -12982,7 +12953,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Calendar (PCP) local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.5.8/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cron.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cron.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -17,6 +17,8 @@
  /var/run/fcron\.fifo		-s	gen_context(system_u:object_r:crond_var_run_t,s0)
  /var/run/fcron\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
@@ -12999,7 +12970,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/lib/misc(/.*)?			gen_context(system_u:object_r:system_crond_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.5.8/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cron.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cron.if	2008-09-12 16:29:28.000000000 -0400
 @@ -35,39 +35,24 @@
  #
  template(`cron_per_role_template',`
@@ -13269,35 +13240,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Read and write a cron daemon unnamed pipe.
  ## </summary>
  ## <param name="domain">
-@@ -439,7 +352,26 @@
+@@ -439,7 +352,7 @@
  
  ########################################
  ## <summary>
 -##	Read, and write cron daemon TCP sockets.
-+##	Read temporary files from cron.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`cron_read_tmp_files',`
-+	gen_require(`
-+		type crond_tmp_t;
-+	')
-+
-+	files_search_tmp($1)
-+	allow $1 crond_tmp_t:file read_file_perms;
-+')
-+
-+########################################
-+## <summary>
 +##	Dontaudit Read, and write cron daemon TCP sockets.
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -447,7 +379,7 @@
+@@ -447,7 +360,7 @@
  ##	</summary>
  ## </param>
  #
@@ -13306,7 +13258,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	gen_require(`
  		type crond_t;
  	')
-@@ -559,11 +491,14 @@
+@@ -559,11 +472,14 @@
  #
  interface(`cron_read_system_job_tmp_files',`
  	gen_require(`
@@ -13322,7 +13274,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -584,3 +519,44 @@
+@@ -584,3 +500,44 @@
  
  	dontaudit $1 system_crond_tmp_t:file append;
  ')
@@ -13369,7 +13321,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.5.8/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cron.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cron.te	2008-09-12 16:28:42.000000000 -0400
 @@ -12,14 +12,6 @@
  
  ## <desc>
@@ -13396,15 +13348,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # var/log files
  type cron_log_t;
  logging_log_file(cron_log_t)
-@@ -50,6 +46,7 @@
+@@ -50,6 +46,8 @@
  
  type crond_tmp_t;
  files_tmp_file(crond_tmp_t)
 +files_poly_parent(crond_tmp_t)
++mta_system_content(crond_tmp_t)
  
  type crond_var_run_t;
  files_pid_file(crond_var_run_t)
-@@ -71,6 +68,12 @@
+@@ -71,6 +69,12 @@
  type system_crond_tmp_t;
  files_tmp_file(system_crond_tmp_t)
  
@@ -13417,7 +13370,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ifdef(`enable_mcs',`
  	init_ranged_daemon_domain(crond_t,crond_exec_t,s0 - mcs_systemhigh)
  ')
-@@ -80,7 +83,7 @@
+@@ -80,7 +84,7 @@
  # Cron Local policy
  #
  
@@ -13426,7 +13379,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  dontaudit crond_t self:capability { sys_resource sys_tty_config };
  allow crond_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow crond_t self:process { setexec setfscreate };
-@@ -99,15 +102,14 @@
+@@ -99,15 +103,14 @@
  allow crond_t crond_var_run_t:file manage_file_perms;
  files_pid_filetrans(crond_t,crond_var_run_t,file)
  
@@ -13445,7 +13398,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  kernel_read_kernel_sysctls(crond_t)
  kernel_search_key(crond_t)
-@@ -133,6 +135,8 @@
+@@ -133,6 +136,8 @@
  corecmd_read_bin_symlinks(crond_t)
  
  domain_use_interactive_fds(crond_t)
@@ -13454,7 +13407,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  files_read_etc_files(crond_t)
  files_read_generic_spool(crond_t)
-@@ -142,13 +146,16 @@
+@@ -142,13 +147,16 @@
  files_search_default(crond_t)
  
  init_rw_utmp(crond_t)
@@ -13471,7 +13424,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  seutil_read_config(crond_t)
  seutil_read_default_contexts(crond_t)
-@@ -161,6 +168,7 @@
+@@ -161,6 +169,7 @@
  userdom_list_all_users_home_dirs(crond_t)
  
  mta_send_mail(crond_t)
@@ -13479,7 +13432,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ifdef(`distro_debian',`
  	# pam_limits is used
-@@ -180,21 +188,45 @@
+@@ -180,21 +189,45 @@
  	')
  ')
  
@@ -13526,7 +13479,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -236,6 +268,9 @@
+@@ -236,6 +269,9 @@
  allow system_crond_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_crond_t, cron_var_lib_t, file)
  
@@ -13536,7 +13489,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow system_crond_t system_cron_spool_t:file read_file_perms;
  # The entrypoint interface is not used as this is not
  # a regular entrypoint.  Since crontab files are
-@@ -267,9 +302,13 @@
+@@ -267,9 +303,13 @@
  filetrans_pattern(system_crond_t, crond_tmp_t, system_crond_tmp_t, { file lnk_file })
  files_tmp_filetrans(system_crond_t, system_crond_tmp_t, file)
  
@@ -13551,7 +13504,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  kernel_read_kernel_sysctls(system_crond_t)
  kernel_read_system_state(system_crond_t)
-@@ -323,7 +362,8 @@
+@@ -323,7 +363,8 @@
  init_read_utmp(system_crond_t)
  init_dontaudit_rw_utmp(system_crond_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -13561,7 +13514,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  auth_use_nsswitch(system_crond_t)
  
-@@ -333,6 +373,7 @@
+@@ -333,6 +374,7 @@
  libs_exec_ld_so(system_crond_t)
  
  logging_read_generic_logs(system_crond_t)
@@ -13569,7 +13522,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  logging_send_syslog_msg(system_crond_t)
  
  miscfiles_read_localization(system_crond_t)
-@@ -348,18 +389,6 @@
+@@ -348,18 +390,6 @@
  	')
  ')
  
@@ -13588,7 +13541,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
  	# Needed for certwatch
  	apache_exec_modules(system_crond_t)
-@@ -383,11 +412,20 @@
+@@ -383,11 +413,20 @@
  ')
  
  optional_policy(`
@@ -13609,7 +13562,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -415,8 +453,7 @@
+@@ -415,8 +454,7 @@
  ')
  
  optional_policy(`
@@ -13619,7 +13572,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -424,15 +461,12 @@
+@@ -424,15 +462,12 @@
  ')
  
  optional_policy(`
@@ -13642,7 +13595,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -') dnl end TODO
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.5.8/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cups.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cups.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -8,6 +8,7 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -13711,7 +13664,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/cups	--	gen_context(system_u:object_r:cups_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.5.8/policy/modules/services/cups.if
 --- nsaserefpolicy/policy/modules/services/cups.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cups.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cups.if	2008-09-12 11:41:14.000000000 -0400
 @@ -20,6 +20,30 @@
  
  ########################################
@@ -13871,7 +13824,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.5.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2008-09-03 07:59:15.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cups.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cups.te	2008-09-12 10:59:28.000000000 -0400
 @@ -48,6 +48,10 @@
  type hplip_t;
  type hplip_exec_t;
@@ -14234,7 +14187,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.fc serefpolicy-3.5.8/policy/modules/services/cvs.fc
 --- nsaserefpolicy/policy/modules/services/cvs.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cvs.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cvs.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -5,3 +5,6 @@
  
  /var/cvs(/.*)?		gen_context(system_u:object_r:cvs_data_t,s0)
@@ -14244,7 +14197,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/www/cgi-bin/cvsweb\.cgi	--	gen_context(system_u:object_r:httpd_cvs_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.if serefpolicy-3.5.8/policy/modules/services/cvs.if
 --- nsaserefpolicy/policy/modules/services/cvs.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cvs.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cvs.if	2008-09-12 10:59:28.000000000 -0400
 @@ -36,3 +36,70 @@
  
  	can_exec($1, cvs_exec_t)
@@ -14318,7 +14271,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.5.8/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cvs.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cvs.te	2008-09-12 10:59:28.000000000 -0400
 @@ -28,6 +28,9 @@
  type cvs_var_run_t;
  files_pid_file(cvs_var_run_t)
@@ -14375,7 +14328,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.fc serefpolicy-3.5.8/policy/modules/services/cyrus.fc
 --- nsaserefpolicy/policy/modules/services/cyrus.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cyrus.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cyrus.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -2,3 +2,5 @@
  /usr/lib(64)?/cyrus-imapd/cyrus-master	--	gen_context(system_u:object_r:cyrus_exec_t,s0)
  
@@ -14384,7 +14337,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/cyrus	--	gen_context(system_u:object_r:cyrus_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.if serefpolicy-3.5.8/policy/modules/services/cyrus.if
 --- nsaserefpolicy/policy/modules/services/cyrus.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cyrus.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cyrus.if	2008-09-12 10:59:28.000000000 -0400
 @@ -39,3 +39,74 @@
  	files_search_var_lib($1)
  	stream_connect_pattern($1, cyrus_var_lib_t, cyrus_var_lib_t, cyrus_t)
@@ -14462,7 +14415,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-3.5.8/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/cyrus.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/cyrus.te	2008-09-12 10:59:28.000000000 -0400
 @@ -19,6 +19,9 @@
  type cyrus_var_run_t;
  files_pid_file(cyrus_var_run_t)
@@ -14484,7 +14437,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.fc serefpolicy-3.5.8/policy/modules/services/dbus.fc
 --- nsaserefpolicy/policy/modules/services/dbus.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dbus.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dbus.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -4,6 +4,9 @@
  /usr/bin/dbus-daemon(-1)? --	gen_context(system_u:object_r:system_dbusd_exec_t,s0)
  /bin/dbus-daemon 	--	gen_context(system_u:object_r:system_dbusd_exec_t,s0)
@@ -14497,7 +14450,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.5.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dbus.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dbus.if	2008-09-12 10:59:28.000000000 -0400
 @@ -53,6 +53,7 @@
  	gen_require(`
  		type system_dbusd_exec_t, system_dbusd_t, dbusd_etc_t;
@@ -14795,7 +14748,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.5.8/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dbus.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dbus.te	2008-09-12 10:59:28.000000000 -0400
 @@ -9,9 +9,10 @@
  #
  # Delcarations
@@ -14919,7 +14872,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.if serefpolicy-3.5.8/policy/modules/services/dcc.if
 --- nsaserefpolicy/policy/modules/services/dcc.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dcc.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dcc.if	2008-09-12 10:59:28.000000000 -0400
 @@ -72,6 +72,24 @@
  
  ########################################
@@ -14947,7 +14900,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.5.8/policy/modules/services/dcc.te
 --- nsaserefpolicy/policy/modules/services/dcc.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dcc.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dcc.te	2008-09-12 10:59:28.000000000 -0400
 @@ -105,6 +105,8 @@
  files_read_etc_files(cdcc_t)
  files_read_etc_runtime_files(cdcc_t)
@@ -15119,7 +15072,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.fc serefpolicy-3.5.8/policy/modules/services/ddclient.fc
 --- nsaserefpolicy/policy/modules/services/ddclient.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ddclient.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ddclient.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -9,3 +9,5 @@
  /var/log/ddtcd\.log.*	--	gen_context(system_u:object_r:ddclient_log_t,s0)
  /var/run/ddclient\.pid	--	gen_context(system_u:object_r:ddclient_var_run_t,s0)
@@ -15128,7 +15081,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.if serefpolicy-3.5.8/policy/modules/services/ddclient.if
 --- nsaserefpolicy/policy/modules/services/ddclient.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ddclient.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ddclient.if	2008-09-12 10:59:28.000000000 -0400
 @@ -18,3 +18,81 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, ddclient_exec_t, ddclient_t)
@@ -15213,7 +15166,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.te serefpolicy-3.5.8/policy/modules/services/ddclient.te
 --- nsaserefpolicy/policy/modules/services/ddclient.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ddclient.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ddclient.te	2008-09-12 10:59:28.000000000 -0400
 @@ -11,7 +11,7 @@
  init_daemon_domain(ddclient_t, ddclient_exec_t)
  
@@ -15235,7 +15188,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Declarations
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.fc serefpolicy-3.5.8/policy/modules/services/dhcp.fc
 --- nsaserefpolicy/policy/modules/services/dhcp.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dhcp.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dhcp.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -5,3 +5,6 @@
  /var/lib/dhcp(3)?/dhcpd\.leases.* --	gen_context(system_u:object_r:dhcpd_state_t,s0)
  
@@ -15245,7 +15198,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.5.8/policy/modules/services/dhcp.if
 --- nsaserefpolicy/policy/modules/services/dhcp.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dhcp.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dhcp.if	2008-09-12 10:59:28.000000000 -0400
 @@ -19,3 +19,71 @@
  	sysnet_search_dhcp_state($1)
  	allow $1 dhcpd_state_t:file setattr;
@@ -15320,7 +15273,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.5.8/policy/modules/services/dhcp.te
 --- nsaserefpolicy/policy/modules/services/dhcp.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dhcp.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dhcp.te	2008-09-12 10:59:28.000000000 -0400
 @@ -19,18 +19,20 @@
  type dhcpd_var_run_t;
  files_pid_file(dhcpd_var_run_t)
@@ -15386,7 +15339,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.fc serefpolicy-3.5.8/policy/modules/services/dictd.fc
 --- nsaserefpolicy/policy/modules/services/dictd.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dictd.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dictd.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -4,3 +4,6 @@
  /usr/sbin/dictd		--	gen_context(system_u:object_r:dictd_exec_t,s0)
  
@@ -15396,7 +15349,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/dictd	--	gen_context(system_u:object_r:dictd_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.if serefpolicy-3.5.8/policy/modules/services/dictd.if
 --- nsaserefpolicy/policy/modules/services/dictd.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dictd.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dictd.if	2008-09-12 10:59:28.000000000 -0400
 @@ -14,3 +14,73 @@
  interface(`dictd_tcp_connect',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -15473,7 +15426,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.te serefpolicy-3.5.8/policy/modules/services/dictd.te
 --- nsaserefpolicy/policy/modules/services/dictd.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dictd.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dictd.te	2008-09-12 10:59:28.000000000 -0400
 @@ -16,6 +16,12 @@
  type dictd_var_lib_t alias var_lib_dictd_t;
  files_type(dictd_var_lib_t)
@@ -15499,7 +15452,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.fc serefpolicy-3.5.8/policy/modules/services/dnsmasq.fc
 --- nsaserefpolicy/policy/modules/services/dnsmasq.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dnsmasq.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dnsmasq.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,4 +1,7 @@
  /usr/sbin/dnsmasq		--	gen_context(system_u:object_r:dnsmasq_exec_t,s0)
  
@@ -15510,7 +15463,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/dnsmasq	--	gen_context(system_u:object_r:dnsmasq_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.if serefpolicy-3.5.8/policy/modules/services/dnsmasq.if
 --- nsaserefpolicy/policy/modules/services/dnsmasq.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dnsmasq.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dnsmasq.if	2008-09-12 10:59:28.000000000 -0400
 @@ -1 +1,125 @@
  ## <summary>dnsmasq DNS forwarder and DHCP server</summary>
 +
@@ -15639,7 +15592,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.5.8/policy/modules/services/dnsmasq.te
 --- nsaserefpolicy/policy/modules/services/dnsmasq.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dnsmasq.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dnsmasq.te	2008-09-12 10:59:28.000000000 -0400
 @@ -16,6 +16,9 @@
  type dnsmasq_var_run_t;
  files_pid_file(dnsmasq_var_run_t)
@@ -15687,7 +15640,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.5.8/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dovecot.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dovecot.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -17,23 +17,24 @@
  
  ifdef(`distro_debian', `
@@ -15720,7 +15673,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/dovecot	--	gen_context(system_u:object_r:dovecot_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-3.5.8/policy/modules/services/dovecot.if
 --- nsaserefpolicy/policy/modules/services/dovecot.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dovecot.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dovecot.if	2008-09-12 10:59:28.000000000 -0400
 @@ -21,7 +21,46 @@
  
  ########################################
@@ -15861,7 +15814,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.5.8/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/dovecot.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/dovecot.te	2008-09-12 10:59:28.000000000 -0400
 @@ -15,6 +15,12 @@
  domain_entry_file(dovecot_auth_t, dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -16027,7 +15980,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-3.5.8/policy/modules/services/exim.if
 --- nsaserefpolicy/policy/modules/services/exim.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/exim.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/exim.if	2008-09-12 10:59:28.000000000 -0400
 @@ -97,6 +97,26 @@
  
  ########################################
@@ -16081,7 +16034,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.5.8/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/exim.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/exim.te	2008-09-12 10:59:28.000000000 -0400
 @@ -21,9 +21,20 @@
  ## </desc>
  gen_tunable(exim_manage_user_files, false)
@@ -16257,7 +16210,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.5.8/policy/modules/services/fail2ban.if
 --- nsaserefpolicy/policy/modules/services/fail2ban.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/fail2ban.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/fail2ban.if	2008-09-12 10:59:28.000000000 -0400
 @@ -78,3 +78,67 @@
  	files_search_pids($1)
  	allow $1 fail2ban_var_run_t:file read_file_perms;
@@ -16328,7 +16281,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.if serefpolicy-3.5.8/policy/modules/services/fetchmail.if
 --- nsaserefpolicy/policy/modules/services/fetchmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/fetchmail.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/fetchmail.if	2008-09-12 10:59:28.000000000 -0400
 @@ -21,10 +21,10 @@
  	ps_process_pattern($1, fetchmail_t)
  
@@ -16345,7 +16298,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.5.8/policy/modules/services/fetchmail.te
 --- nsaserefpolicy/policy/modules/services/fetchmail.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/fetchmail.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/fetchmail.te	2008-09-12 10:59:28.000000000 -0400
 @@ -91,6 +91,10 @@
  ')
  
@@ -16359,7 +16312,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.fc serefpolicy-3.5.8/policy/modules/services/ftp.fc
 --- nsaserefpolicy/policy/modules/services/ftp.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ftp.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ftp.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -27,3 +27,6 @@
  /var/log/vsftpd.*	--	gen_context(system_u:object_r:xferlog_t,s0)
  /var/log/xferlog.*	--	gen_context(system_u:object_r:xferlog_t,s0)
@@ -16369,7 +16322,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/proftpd	--	gen_context(system_u:object_r:ftp_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-3.5.8/policy/modules/services/ftp.if
 --- nsaserefpolicy/policy/modules/services/ftp.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ftp.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ftp.if	2008-09-12 10:59:28.000000000 -0400
 @@ -28,11 +28,13 @@
  		type ftpd_t;
  	')
@@ -16486,7 +16439,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.5.8/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ftp.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ftp.te	2008-09-12 10:59:28.000000000 -0400
 @@ -75,6 +75,9 @@
  type xferlog_t;
  logging_log_file(xferlog_t)
@@ -16567,13 +16520,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.fc serefpolicy-3.5.8/policy/modules/services/gamin.fc
 --- nsaserefpolicy/policy/modules/services/gamin.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/gamin.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/gamin.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,2 @@
 +
 +/usr/libexec/gam_server	--	gen_context(system_u:object_r:gamin_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.if serefpolicy-3.5.8/policy/modules/services/gamin.if
 --- nsaserefpolicy/policy/modules/services/gamin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/gamin.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/gamin.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,57 @@
 +
 +## <summary>policy for gamin</summary>
@@ -16634,7 +16587,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.te serefpolicy-3.5.8/policy/modules/services/gamin.te
 --- nsaserefpolicy/policy/modules/services/gamin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/gamin.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/gamin.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,39 @@
 +policy_module(gamin, 1.0.0)
 +
@@ -16677,14 +16630,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.fc serefpolicy-3.5.8/policy/modules/services/gnomeclock.fc
 --- nsaserefpolicy/policy/modules/services/gnomeclock.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/gnomeclock.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/gnomeclock.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,3 @@
 +
 +/usr/libexec/gnome-clock-applet-mechanism	--	gen_context(system_u:object_r:gnomeclock_exec_t,s0)
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.if serefpolicy-3.5.8/policy/modules/services/gnomeclock.if
 --- nsaserefpolicy/policy/modules/services/gnomeclock.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/gnomeclock.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/gnomeclock.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,75 @@
 +
 +## <summary>policy for gnomeclock</summary>
@@ -16763,7 +16716,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.te serefpolicy-3.5.8/policy/modules/services/gnomeclock.te
 --- nsaserefpolicy/policy/modules/services/gnomeclock.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/gnomeclock.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/gnomeclock.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,55 @@
 +policy_module(gnomeclock, 1.0.0)
 +########################################
@@ -16822,7 +16775,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.5.8/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/hal.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/hal.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -9,6 +9,7 @@
  /usr/libexec/hal-system-sonypic	 	--	gen_context(system_u:object_r:hald_sonypic_exec_t,s0)
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
@@ -16833,7 +16786,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.5.8/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/hal.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/hal.if	2008-09-12 10:59:28.000000000 -0400
 @@ -302,3 +302,42 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -16879,7 +16832,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.5.8/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/hal.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/hal.te	2008-09-12 10:59:28.000000000 -0400
 @@ -49,6 +49,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -16990,7 +16943,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +cron_read_system_job_lib_files(hald_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.fc serefpolicy-3.5.8/policy/modules/services/inetd.fc
 --- nsaserefpolicy/policy/modules/services/inetd.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/inetd.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/inetd.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,6 +1,8 @@
  
  /usr/sbin/identd	--	gen_context(system_u:object_r:inetd_child_exec_t,s0)
@@ -17002,7 +16955,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/sbin/xinetd	--	gen_context(system_u:object_r:inetd_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.fc serefpolicy-3.5.8/policy/modules/services/inn.fc
 --- nsaserefpolicy/policy/modules/services/inn.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/inn.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/inn.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -64,3 +64,5 @@
  /var/run/news(/.*)?	 		gen_context(system_u:object_r:innd_var_run_t,s0)
  
@@ -17011,7 +16964,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/innd		--	gen_context(system_u:object_r:innd_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.if serefpolicy-3.5.8/policy/modules/services/inn.if
 --- nsaserefpolicy/policy/modules/services/inn.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/inn.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/inn.if	2008-09-12 10:59:28.000000000 -0400
 @@ -54,8 +54,7 @@
  	')
  
@@ -17105,7 +17058,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-3.5.8/policy/modules/services/inn.te
 --- nsaserefpolicy/policy/modules/services/inn.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/inn.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/inn.te	2008-09-12 10:59:28.000000000 -0400
 @@ -22,7 +22,10 @@
  files_pid_file(innd_var_run_t)
  
@@ -17120,7 +17073,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.fc serefpolicy-3.5.8/policy/modules/services/jabber.fc
 --- nsaserefpolicy/policy/modules/services/jabber.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/jabber.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/jabber.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -2,3 +2,4 @@
  
  /var/lib/jabber(/.*)?		gen_context(system_u:object_r:jabberd_var_lib_t,s0)
@@ -17128,7 +17081,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/jabber	--	gen_context(system_u:object_r:jabber_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.if serefpolicy-3.5.8/policy/modules/services/jabber.if
 --- nsaserefpolicy/policy/modules/services/jabber.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/jabber.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/jabber.if	2008-09-12 10:59:28.000000000 -0400
 @@ -13,3 +13,73 @@
  interface(`jabber_tcp_connect',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -17205,7 +17158,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.te serefpolicy-3.5.8/policy/modules/services/jabber.te
 --- nsaserefpolicy/policy/modules/services/jabber.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/jabber.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/jabber.te	2008-09-12 10:59:28.000000000 -0400
 @@ -19,6 +19,9 @@
  type jabberd_var_run_t;
  files_pid_file(jabberd_var_run_t)
@@ -17218,7 +17171,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-3.5.8/policy/modules/services/kerberos.fc
 --- nsaserefpolicy/policy/modules/services/kerberos.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/kerberos.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/kerberos.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -7,12 +7,21 @@
  
  /usr/(local/)?(kerberos/)?sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
@@ -17243,7 +17196,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/krb5kdc	--	gen_context(system_u:object_r:kerberos_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.5.8/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/kerberos.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/kerberos.if	2008-09-12 10:59:28.000000000 -0400
 @@ -23,6 +23,25 @@
  
  ########################################
@@ -17527,7 +17480,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.5.8/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/kerberos.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/kerberos.te	2008-09-12 10:59:28.000000000 -0400
 @@ -16,6 +16,7 @@
  type kadmind_t;
  type kadmind_exec_t;
@@ -17725,14 +17678,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +kerberos_use(kpropd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.fc serefpolicy-3.5.8/policy/modules/services/kerneloops.fc
 --- nsaserefpolicy/policy/modules/services/kerneloops.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/kerneloops.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/kerneloops.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1 +1,3 @@
  /usr/sbin/kerneloops	--	gen_context(system_u:object_r:kerneloops_exec_t,s0)
 +
 +/etc/rc\.d/init\.d/kerneloops	--	gen_context(system_u:object_r:kerneloops_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.if serefpolicy-3.5.8/policy/modules/services/kerneloops.if
 --- nsaserefpolicy/policy/modules/services/kerneloops.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/kerneloops.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/kerneloops.if	2008-09-12 10:59:28.000000000 -0400
 @@ -21,6 +21,24 @@
  
  ########################################
@@ -17792,7 +17745,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.5.8/policy/modules/services/kerneloops.te
 --- nsaserefpolicy/policy/modules/services/kerneloops.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/kerneloops.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/kerneloops.te	2008-09-12 10:59:28.000000000 -0400
 @@ -10,13 +10,16 @@
  type kerneloops_exec_t;
  init_daemon_domain(kerneloops_t, kerneloops_exec_t)
@@ -17822,7 +17775,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corenet_tcp_sendrecv_all_if(kerneloops_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-3.5.8/policy/modules/services/ldap.fc
 --- nsaserefpolicy/policy/modules/services/ldap.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ldap.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ldap.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -14,3 +14,5 @@
  /var/run/openldap(/.*)?		gen_context(system_u:object_r:slapd_var_run_t,s0)
  /var/run/slapd\.args	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
@@ -17831,7 +17784,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/ldap	--	gen_context(system_u:object_r:ldap_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.if serefpolicy-3.5.8/policy/modules/services/ldap.if
 --- nsaserefpolicy/policy/modules/services/ldap.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ldap.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ldap.if	2008-09-12 10:59:28.000000000 -0400
 @@ -73,3 +73,80 @@
  	allow $1 slapd_var_run_t:sock_file write;
  	allow $1 slapd_t:unix_stream_socket connectto;
@@ -17915,7 +17868,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-3.5.8/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ldap.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ldap.te	2008-09-12 10:59:28.000000000 -0400
 @@ -31,6 +31,9 @@
  type slapd_var_run_t;
  files_pid_file(slapd_var_run_t)
@@ -17937,7 +17890,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.fc serefpolicy-3.5.8/policy/modules/services/lpd.fc
 --- nsaserefpolicy/policy/modules/services/lpd.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/lpd.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/lpd.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -22,11 +22,14 @@
  /usr/sbin/lpinfo	--	gen_context(system_u:object_r:lpr_exec_t,s0)
  /usr/sbin/lpmove	--	gen_context(system_u:object_r:lpr_exec_t,s0)
@@ -17955,7 +17908,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/lprng(/.*)?		gen_context(system_u:object_r:lpd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.5.8/policy/modules/services/mailman.fc
 --- nsaserefpolicy/policy/modules/services/mailman.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mailman.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mailman.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -31,3 +31,4 @@
  /var/lock/mailman(/.*)?			gen_context(system_u:object_r:mailman_lock_t,s0)
  /var/spool/mailman(/.*)?		gen_context(system_u:object_r:mailman_data_t,s0)
@@ -17963,7 +17916,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/lib/mailman/mail/mailman --	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-3.5.8/policy/modules/services/mailman.if
 --- nsaserefpolicy/policy/modules/services/mailman.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mailman.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mailman.if	2008-09-12 10:59:28.000000000 -0400
 @@ -211,6 +211,7 @@
  		type mailman_data_t;
  	')
@@ -18000,7 +17953,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.5.8/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mailman.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mailman.te	2008-09-12 10:59:28.000000000 -0400
 @@ -53,10 +53,9 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -18052,13 +18005,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.fc serefpolicy-3.5.8/policy/modules/services/mailscanner.fc
 --- nsaserefpolicy/policy/modules/services/mailscanner.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/mailscanner.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mailscanner.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,2 @@
 +/var/spool/MailScanner(/.*)?	gen_context(system_u:object_r:mailscanner_spool_t,s0)
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.if serefpolicy-3.5.8/policy/modules/services/mailscanner.if
 --- nsaserefpolicy/policy/modules/services/mailscanner.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/mailscanner.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mailscanner.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,59 @@
 +## <summary>Anti-Virus and Anti-Spam Filter</summary>
 +
@@ -18121,7 +18074,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.te serefpolicy-3.5.8/policy/modules/services/mailscanner.te
 --- nsaserefpolicy/policy/modules/services/mailscanner.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/mailscanner.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mailscanner.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,5 @@
 +
 +policy_module(mailscanner, 1.0.0)
@@ -18130,7 +18083,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +files_type(mailscanner_spool_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.fc serefpolicy-3.5.8/policy/modules/services/memcached.fc
 --- nsaserefpolicy/policy/modules/services/memcached.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/memcached.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/memcached.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,5 @@
 +
 +/usr/bin/memcached	--	gen_context(system_u:object_r:memcached_exec_t,s0)
@@ -18139,7 +18092,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/run/memcached(/.*)?			gen_context(system_u:object_r:memcached_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.if serefpolicy-3.5.8/policy/modules/services/memcached.if
 --- nsaserefpolicy/policy/modules/services/memcached.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/memcached.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/memcached.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,125 @@
 +
 +## <summary>high-performance memory object caching system</summary>
@@ -18268,7 +18221,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.te serefpolicy-3.5.8/policy/modules/services/memcached.te
 --- nsaserefpolicy/policy/modules/services/memcached.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/memcached.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/memcached.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,52 @@
 +policy_module(memcached,1.0.0)
 +
@@ -18323,17 +18276,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +permissive memcached_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.5.8/policy/modules/services/mta.fc
---- nsaserefpolicy/policy/modules/services/mta.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mta.fc	2008-09-11 16:37:43.000000000 -0400
-@@ -11,6 +11,7 @@
- /usr/lib(64)?/sendmail	--	gen_context(system_u:object_r:sendmail_exec_t,s0)
- 
- /usr/sbin/rmail		--	gen_context(system_u:object_r:sendmail_exec_t,s0)
-+/bin/mail		--	gen_context(system_u:object_r:sendmail_exec_t,s0)
- /usr/sbin/sendmail\.postfix --	gen_context(system_u:object_r:sendmail_exec_t,s0)
- /usr/sbin/sendmail(\.sendmail)? -- gen_context(system_u:object_r:sendmail_exec_t,s0)
- 
-@@ -21,7 +22,3 @@
+--- nsaserefpolicy/policy/modules/services/mta.fc	2008-09-12 10:48:05.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mta.fc	2008-09-12 10:59:28.000000000 -0400
+@@ -22,7 +22,3 @@
  /var/spool/imap(/.*)?		gen_context(system_u:object_r:mail_spool_t,s0)
  /var/spool/(client)?mqueue(/.*)? gen_context(system_u:object_r:mqueue_spool_t,s0)
  /var/spool/mail(/.*)?		gen_context(system_u:object_r:mail_spool_t,s0)
@@ -18342,8 +18287,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -#/var/spool/postfix(/.*)?	gen_context(system_u:object_r:mail_spool_t,s0)
 -#')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.5.8/policy/modules/services/mta.if
---- nsaserefpolicy/policy/modules/services/mta.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mta.if	2008-09-11 16:37:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/mta.if	2008-09-12 10:48:05.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mta.if	2008-09-12 16:31:11.000000000 -0400
 @@ -133,6 +133,15 @@
  		sendmail_create_log($1_mail_t)
  	')
@@ -18390,50 +18335,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	optional_policy(`
  		allow $1_mail_t self:capability dac_override;
  
-@@ -311,6 +325,42 @@
- 
- ########################################
- ## <summary>
-+##	Make the specified type usable for a mta_send_mail.
-+## </summary>
-+## <param name="type">
-+##	<summary>
-+##	Type to be used as a mail client.
-+##	</summary>
-+## </param>
-+#
-+interface(`mta_mailclient',`
-+	gen_require(`
-+		attribute mailclient_exec_type;
-+	')
-+
-+	typeattribute $1 mailclient_exec_type;
-+')
-+
-+########################################
-+## <summary>
-+##	Make the specified type readable for a system_mail_t
-+## </summary>
-+## <param name="type">
-+##	<summary>
-+##	Type to be used as a mail client.
-+##	</summary>
-+## </param>
-+#
-+interface(`mta_mailcontent',`
-+	gen_require(`
-+		attribute mailcontent_type;
-+	')
-+
-+	typeattribute $1 mailcontent_type;
-+')
-+
-+########################################
-+## <summary>
- ##	Modified mailserver interface for
- ##	sendmail daemon use.
- ## </summary>
-@@ -385,11 +435,13 @@
+@@ -423,11 +437,13 @@
  	allow $1 mail_spool_t:dir list_dir_perms;
  	create_files_pattern($1, mail_spool_t, mail_spool_t)
  	read_files_pattern($1, mail_spool_t, mail_spool_t)
@@ -18447,7 +18349,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  
  	optional_policy(`
-@@ -424,6 +476,7 @@
+@@ -462,6 +478,7 @@
  		# apache should set close-on-exec
  		apache_dontaudit_rw_stream_sockets($1)
  		apache_dontaudit_rw_sys_script_stream_sockets($1)
@@ -18455,29 +18357,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  ')
  
-@@ -440,16 +493,13 @@
- interface(`mta_send_mail',`
- 	gen_require(`
- 		attribute mta_user_agent;
--		type system_mail_t, sendmail_exec_t;
-+		type system_mail_t;
-+		attribute mailclient_exec_type;
- 	')
- 
--	allow $1 sendmail_exec_t:lnk_file read_lnk_file_perms;
--	domain_auto_trans($1, sendmail_exec_t, system_mail_t)
--
--	allow $1 system_mail_t:fd use;
--	allow system_mail_t $1:fd use;
--	allow system_mail_t $1:fifo_file rw_file_perms;
--	allow system_mail_t $1:process sigchld;
-+	allow $1 mailclient_exec_type:lnk_file read_lnk_file_perms;
-+	domtrans_pattern($1, mailclient_exec_type, system_mail_t)
-+	allow system_mail_t mailclient_exec_type:file entrypoint;
- 
- 	allow mta_user_agent $1:fd use;
- 	allow mta_user_agent $1:process sigchld;
-@@ -588,6 +638,25 @@
+@@ -622,6 +639,25 @@
  	files_search_etc($1)
  	allow $1 etc_aliases_t:file { rw_file_perms setattr };
  ')
@@ -18503,7 +18383,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  #######################################
  ## <summary>
-@@ -839,6 +908,25 @@
+@@ -873,6 +909,25 @@
  
  ########################################
  ## <summary>
@@ -18530,46 +18410,23 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	mail queue files.
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.5.8/policy/modules/services/mta.te
---- nsaserefpolicy/policy/modules/services/mta.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mta.te	2008-09-11 16:37:43.000000000 -0400
-@@ -6,6 +6,8 @@
- # Declarations
- #
- 
-+attribute mailcontent_type;
-+attribute mailclient_exec_type;
- attribute mta_user_agent;
- attribute mailserver_delivery;
- attribute mailserver_domain;
-@@ -20,13 +22,14 @@
- files_config_file(etc_mail_t)
- 
- type mqueue_spool_t;
--files_type(mqueue_spool_t)
-+files_mountpoint(mqueue_spool_t)
- 
- type mail_spool_t;
--files_type(mail_spool_t)
-+files_mountpoint(mail_spool_t)
- 
- type sendmail_exec_t;
- application_executable_file(sendmail_exec_t)
-+mta_mailclient(sendmail_exec_t)
- 
- mta_base_mail_template(system)
- role system_r types system_mail_t;
-@@ -37,30 +40,48 @@
+--- nsaserefpolicy/policy/modules/services/mta.te	2008-09-12 10:48:05.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mta.te	2008-09-12 16:31:16.000000000 -0400
+@@ -39,34 +39,50 @@
  #
  
  # newalias required this, not sure if it is needed in 'if' file
 -allow system_mail_t self:capability { dac_override };
 +allow system_mail_t self:capability { dac_override fowner };
 +allow system_mail_t self:fifo_file rw_fifo_file_perms;
-+
-+can_exec(system_mail_t, mailclient_exec_type)
  
  read_files_pattern(system_mail_t, etc_mail_t, etc_mail_t)
 +read_files_pattern(system_mail_t, mailcontent_type, mailcontent_type)
+ 
+ allow system_mail_t mta_exec_type:file entrypoint;
+ 
+-allow system_mail_t mailcontent_type:file read_file_perms;
++can_exec(system_mail_t, mailclient_exec_type)
 +
 +files_read_all_tmp_files(system_mail_t)
  
@@ -18608,25 +18465,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -73,7 +94,17 @@
- 
+@@ -80,6 +96,13 @@
  optional_policy(`
  	cron_read_system_job_tmp_files(system_mail_t)
-+	cron_read_tmp_files(system_mail_t)
  	cron_dontaudit_write_pipes(system_mail_t)
-+	cron_dontaudit_write_system_job_tmp_files(system_mail_t)
 +	cron_rw_system_stream_sockets(system_mail_t)
 +')
 +
 +optional_policy(`
-+	courier_read_config(system_mail_t)
 +	courier_manage_spool_dirs(system_mail_t)
 +	courier_manage_spool_files(system_mail_t)
 +	courier_rw_spool_pipes(system_mail_t)
  ')
  
  optional_policy(`
-@@ -81,6 +112,11 @@
+@@ -87,6 +110,11 @@
  ')
  
  optional_policy(`
@@ -18638,7 +18491,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	logrotate_read_tmp_files(system_mail_t)
  ')
  
-@@ -113,10 +149,6 @@
+@@ -119,10 +147,6 @@
  		# compatability for old default main.cf
  		postfix_config_filetrans(system_mail_t, etc_aliases_t, { dir file lnk_file sock_file fifo_file })
  	')
@@ -18649,7 +18502,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -136,11 +168,40 @@
+@@ -142,11 +166,40 @@
  ')
  
  optional_policy(`
@@ -18693,7 +18546,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	arpwatch_search_data(mailserver_delivery)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.fc serefpolicy-3.5.8/policy/modules/services/munin.fc
 --- nsaserefpolicy/policy/modules/services/munin.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/munin.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/munin.fc	2008-09-12 16:35:22.000000000 -0400
 @@ -6,6 +6,9 @@
  /usr/share/munin/plugins/.*	--	gen_context(system_u:object_r:munin_exec_t,s0)
  
@@ -18708,7 +18561,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/munin-node	--	gen_context(system_u:object_r:munin_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.if serefpolicy-3.5.8/policy/modules/services/munin.if
 --- nsaserefpolicy/policy/modules/services/munin.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/munin.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/munin.if	2008-09-12 10:59:28.000000000 -0400
 @@ -80,3 +80,105 @@
  
  	dontaudit $1 munin_var_lib_t:dir search_dir_perms;
@@ -18817,7 +18670,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.te serefpolicy-3.5.8/policy/modules/services/munin.te
 --- nsaserefpolicy/policy/modules/services/munin.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/munin.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/munin.te	2008-09-12 10:59:28.000000000 -0400
 @@ -25,26 +25,33 @@
  type munin_var_run_t alias lrrd_var_run_t;
  files_pid_file(munin_var_run_t)
@@ -18945,7 +18798,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +manage_files_pattern(munin_t, httpd_munin_content_t, httpd_munin_content_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.fc serefpolicy-3.5.8/policy/modules/services/mysql.fc
 --- nsaserefpolicy/policy/modules/services/mysql.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mysql.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mysql.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -22,3 +22,5 @@
  /var/log/mysql.*	--	gen_context(system_u:object_r:mysqld_log_t,s0)
  
@@ -18954,7 +18807,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/mysqld	--	gen_context(system_u:object_r:mysqld_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.5.8/policy/modules/services/mysql.if
 --- nsaserefpolicy/policy/modules/services/mysql.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mysql.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mysql.if	2008-09-12 10:59:28.000000000 -0400
 @@ -53,9 +53,11 @@
  interface(`mysql_stream_connect',`
  	gen_require(`
@@ -19041,7 +18894,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.5.8/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/mysql.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/mysql.te	2008-09-12 10:59:28.000000000 -0400
 @@ -25,6 +25,9 @@
  type mysqld_tmp_t;
  files_tmp_file(mysqld_tmp_t)
@@ -19072,7 +18925,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.5.8/policy/modules/services/nagios.fc
 --- nsaserefpolicy/policy/modules/services/nagios.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/nagios.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/nagios.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -4,13 +4,17 @@
  /usr/bin/nagios			--	gen_context(system_u:object_r:nagios_exec_t,s0)
  /usr/bin/nrpe			--	gen_context(system_u:object_r:nrpe_exec_t,s0)
@@ -19097,7 +18950,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.5.8/policy/modules/services/nagios.if
 --- nsaserefpolicy/policy/modules/services/nagios.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/nagios.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/nagios.if	2008-09-12 10:59:28.000000000 -0400
 @@ -44,7 +44,7 @@
  
  ########################################
@@ -19205,7 +19058,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.5.8/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/nagios.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/nagios.te	2008-09-12 10:59:28.000000000 -0400
 @@ -10,10 +10,6 @@
  type nagios_exec_t;
  init_daemon_domain(nagios_t, nagios_exec_t)
@@ -19310,7 +19163,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.5.8/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2008-09-12 10:15:44.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/networkmanager.fc	2008-09-12 10:17:19.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/networkmanager.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,7 +1,11 @@
 +/etc/NetworkManager/dispatcher\.d(/.*)	gen_context(system_u:object_r:NetworkManager_script_exec_t,s0)
 +
@@ -19330,7 +19183,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/run/nm-dhclient.*			gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.5.8/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/networkmanager.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/networkmanager.if	2008-09-12 10:59:28.000000000 -0400
 @@ -118,6 +118,24 @@
  
  ########################################
@@ -19358,7 +19211,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.5.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/networkmanager.te	2008-09-12 09:34:46.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/networkmanager.te	2008-09-12 10:59:28.000000000 -0400
 @@ -29,9 +29,9 @@
  
  # networkmanager will ptrace itself if gdb is installed
@@ -19471,7 +19324,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.5.8/policy/modules/services/nis.fc
 --- nsaserefpolicy/policy/modules/services/nis.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/nis.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/nis.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -4,9 +4,14 @@
  /sbin/ypbind		--	gen_context(system_u:object_r:ypbind_exec_t,s0)
  
@@ -19489,7 +19342,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/ypxfrd	--	gen_context(system_u:object_r:nis_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.5.8/policy/modules/services/nis.if
 --- nsaserefpolicy/policy/modules/services/nis.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/nis.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/nis.if	2008-09-12 10:59:28.000000000 -0400
 @@ -28,7 +28,7 @@
  		type var_yp_t;
  	')
@@ -19628,7 +19481,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.5.8/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/nis.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/nis.te	2008-09-12 10:59:28.000000000 -0400
 @@ -44,6 +44,9 @@
  type ypxfr_exec_t;
  init_daemon_domain(ypxfr_t, ypxfr_exec_t)
@@ -19699,7 +19552,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corenet_tcp_connect_all_ports(ypxfr_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.fc serefpolicy-3.5.8/policy/modules/services/nscd.fc
 --- nsaserefpolicy/policy/modules/services/nscd.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/nscd.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/nscd.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -9,3 +9,5 @@
  /var/run/\.nscd_socket	-s	gen_context(system_u:object_r:nscd_var_run_t,s0)
  
@@ -19708,7 +19561,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/nscd	--	gen_context(system_u:object_r:nscd_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.5.8/policy/modules/services/nscd.if
 --- nsaserefpolicy/policy/modules/services/nscd.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/nscd.if	2008-09-12 09:48:59.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/nscd.if	2008-09-12 10:59:28.000000000 -0400
 @@ -70,15 +70,14 @@
  interface(`nscd_socket_use',`
  	gen_require(`
@@ -19796,7 +19649,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.5.8/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/nscd.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/nscd.te	2008-09-12 10:59:28.000000000 -0400
 @@ -23,19 +23,22 @@
  type nscd_log_t;
  logging_log_file(nscd_log_t)
@@ -19894,7 +19747,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.5.8/policy/modules/services/ntp.if
 --- nsaserefpolicy/policy/modules/services/ntp.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ntp.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ntp.if	2008-09-12 10:59:28.000000000 -0400
 @@ -53,3 +53,72 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, ntpdate_exec_t, ntpd_t)
@@ -19970,7 +19823,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.5.8/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ntp.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ntp.te	2008-09-12 10:59:28.000000000 -0400
 @@ -42,6 +42,7 @@
  dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
  allow ntpd_t self:process { signal_perms getcap setcap setsched setrlimit };
@@ -19990,7 +19843,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-3.5.8/policy/modules/services/oddjob.fc
 --- nsaserefpolicy/policy/modules/services/oddjob.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/oddjob.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/oddjob.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,4 +1,4 @@
 -/usr/lib/oddjob/mkhomedir	--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
 +/usr/lib(64)?/oddjob/mkhomedir	--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
@@ -19999,7 +19852,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-3.5.8/policy/modules/services/oddjob.if
 --- nsaserefpolicy/policy/modules/services/oddjob.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/oddjob.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/oddjob.if	2008-09-12 10:59:28.000000000 -0400
 @@ -44,6 +44,7 @@
  	')
  
@@ -20045,7 +19898,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.5.8/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/oddjob.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/oddjob.te	2008-09-12 10:59:28.000000000 -0400
 @@ -10,14 +10,21 @@
  type oddjob_exec_t;
  domain_type(oddjob_t)
@@ -20107,7 +19960,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  unprivuser_home_filetrans_home_dir(oddjob_mkhomedir_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.fc serefpolicy-3.5.8/policy/modules/services/openvpn.fc
 --- nsaserefpolicy/policy/modules/services/openvpn.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/openvpn.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/openvpn.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -11,5 +11,7 @@
  #
  # /var
@@ -20119,7 +19972,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/openvpn	--	gen_context(system_u:object_r:openvpn_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.if serefpolicy-3.5.8/policy/modules/services/openvpn.if
 --- nsaserefpolicy/policy/modules/services/openvpn.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/openvpn.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/openvpn.if	2008-09-12 10:59:28.000000000 -0400
 @@ -90,3 +90,74 @@
  	read_files_pattern($1, openvpn_etc_t, openvpn_etc_t)
  	read_lnk_files_pattern($1, openvpn_etc_t, openvpn_etc_t)
@@ -20197,7 +20050,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.5.8/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/openvpn.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/openvpn.te	2008-09-12 10:59:28.000000000 -0400
 @@ -8,7 +8,7 @@
  
  ## <desc>
@@ -20264,7 +20117,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.fc serefpolicy-3.5.8/policy/modules/services/pads.fc
 --- nsaserefpolicy/policy/modules/services/pads.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/pads.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/pads.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,12 @@
 +
 +/etc/pads-ether-codes   --      gen_context(system_u:object_r:pads_config_t, s0)
@@ -20280,7 +20133,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.if serefpolicy-3.5.8/policy/modules/services/pads.if
 --- nsaserefpolicy/policy/modules/services/pads.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/pads.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/pads.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,10 @@
 +## <summary>SELinux policy for PADS daemon.</summary>
 +## <desc>
@@ -20294,7 +20147,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.te serefpolicy-3.5.8/policy/modules/services/pads.te
 --- nsaserefpolicy/policy/modules/services/pads.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/pads.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/pads.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,66 @@
 +
 +policy_module(pads, 0.0.1) 
@@ -20364,7 +20217,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.5.8/policy/modules/services/pcscd.te
 --- nsaserefpolicy/policy/modules/services/pcscd.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/pcscd.te	2008-09-12 09:35:28.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/pcscd.te	2008-09-12 10:59:28.000000000 -0400
 @@ -10,6 +10,7 @@
  type pcscd_exec_t;
  domain_type(pcscd_t)
@@ -20390,7 +20243,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	openct_signull(pcscd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.5.8/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/pegasus.te	2008-09-11 16:44:08.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/pegasus.te	2008-09-12 10:59:28.000000000 -0400
 @@ -66,6 +66,7 @@
  kernel_read_system_state(pegasus_t)
  kernel_search_vm_sysctl(pegasus_t)
@@ -20425,7 +20278,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  userdom_dontaudit_use_unpriv_user_fds(pegasus_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.fc serefpolicy-3.5.8/policy/modules/services/polkit.fc
 --- nsaserefpolicy/policy/modules/services/polkit.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/polkit.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/polkit.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,9 @@
 +
 +/usr/libexec/polkit-read-auth-helper	--	gen_context(system_u:object_r:polkit_auth_exec_t,s0)
@@ -20438,7 +20291,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/lib/PolicyKit-public(/.*)?			gen_context(system_u:object_r:polkit_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.5.8/policy/modules/services/polkit.if
 --- nsaserefpolicy/policy/modules/services/polkit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/polkit.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/polkit.if	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,212 @@
 +
 +## <summary>policy for polkit_auth</summary>
@@ -20654,7 +20507,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.te serefpolicy-3.5.8/policy/modules/services/polkit.te
 --- nsaserefpolicy/policy/modules/services/polkit.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.8/policy/modules/services/polkit.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/polkit.te	2008-09-12 10:59:28.000000000 -0400
 @@ -0,0 +1,231 @@
 +policy_module(polkit_auth, 1.0.0)
 +
@@ -20889,7 +20742,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portmap.te serefpolicy-3.5.8/policy/modules/services/portmap.te
 --- nsaserefpolicy/policy/modules/services/portmap.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/portmap.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/portmap.te	2008-09-12 10:59:28.000000000 -0400
 @@ -41,6 +41,7 @@
  manage_files_pattern(portmap_t, portmap_var_run_t, portmap_var_run_t)
  files_pid_filetrans(portmap_t, portmap_var_run_t, file)
@@ -20900,7 +20753,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  kernel_read_proc_symlinks(portmap_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.5.8/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postfix.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postfix.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -29,12 +29,10 @@
  /usr/lib/postfix/smtpd	--	gen_context(system_u:object_r:postfix_smtpd_exec_t,s0)
  /usr/lib/postfix/bounce	--	gen_context(system_u:object_r:postfix_bounce_exec_t,s0)
@@ -20927,7 +20780,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/spool/postfix/pid/.*	gen_context(system_u:object_r:postfix_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.5.8/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postfix.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postfix.if	2008-09-12 10:59:28.000000000 -0400
 @@ -211,9 +211,8 @@
  		type postfix_etc_t;
  	')
@@ -21027,7 +20880,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.5.8/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postfix.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postfix.te	2008-09-12 10:59:28.000000000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -21293,7 +21146,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corecmd_exec_bin(postfix_virtual_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.fc serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.fc
 --- nsaserefpolicy/policy/modules/services/postfixpolicyd.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -3,3 +3,5 @@
  /usr/sbin/policyd		--	gen_context(system_u:object_r:postfix_policyd_exec_t, s0)
  
@@ -21302,7 +21155,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/postfixpolicyd	--	gen_context(system_u:object_r:postfixpolicyd_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.if serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.if
 --- nsaserefpolicy/policy/modules/services/postfixpolicyd.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.if	2008-09-12 10:59:28.000000000 -0400
 @@ -1 +1,68 @@
  ## <summary>Postfix policy server</summary>
 +
@@ -21374,7 +21227,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.te serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.te
 --- nsaserefpolicy/policy/modules/services/postfixpolicyd.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.te	2008-09-12 10:59:28.000000000 -0400
 @@ -16,6 +16,9 @@
  type postfix_policyd_var_run_t;
  files_pid_file(postfix_policyd_var_run_t)
@@ -21387,7 +21240,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Local Policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.5.8/policy/modules/services/postgresql.fc
 --- nsaserefpolicy/policy/modules/services/postgresql.fc	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postgresql.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postgresql.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -28,13 +28,13 @@
  /var/lib/postgres(ql)?(/.*)? 		gen_context(system_u:object_r:postgresql_db_t,s0)
  
@@ -21411,7 +21264,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/postgresql	--	gen_context(system_u:object_r:postgresql_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.5.8/policy/modules/services/postgresql.if
 --- nsaserefpolicy/policy/modules/services/postgresql.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postgresql.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postgresql.if	2008-09-12 10:59:28.000000000 -0400
 @@ -372,3 +372,70 @@
  
  	typeattribute $1 sepgsql_unconfined_type;
@@ -21485,7 +21338,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.5.8/policy/modules/services/postgresql.te
 --- nsaserefpolicy/policy/modules/services/postgresql.te	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postgresql.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postgresql.te	2008-09-12 10:59:28.000000000 -0400
 @@ -44,6 +44,9 @@
  type postgresql_var_run_t;
  files_pid_file(postgresql_var_run_t)
@@ -21525,7 +21378,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow sepgsql_unconfined_type sepgsql_blob_type:db_blob *;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-3.5.8/policy/modules/services/postgrey.fc
 --- nsaserefpolicy/policy/modules/services/postgrey.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postgrey.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postgrey.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -7,3 +7,7 @@
  
  /var/run/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_run_t,s0)
@@ -21536,7 +21389,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/spool/postfix/postgrey(/.*)?	gen_context(system_u:object_r:postgrey_spool_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-3.5.8/policy/modules/services/postgrey.if
 --- nsaserefpolicy/policy/modules/services/postgrey.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postgrey.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postgrey.if	2008-09-12 10:59:28.000000000 -0400
 @@ -12,10 +12,80 @@
  #
  interface(`postgrey_stream_connect',`
@@ -21621,7 +21474,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-3.5.8/policy/modules/services/postgrey.te
 --- nsaserefpolicy/policy/modules/services/postgrey.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/postgrey.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/postgrey.te	2008-09-12 10:59:28.000000000 -0400
 @@ -13,26 +13,38 @@
  type postgrey_etc_t;
  files_config_file(postgrey_etc_t)
@@ -21676,7 +21529,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.fc serefpolicy-3.5.8/policy/modules/services/ppp.fc
 --- nsaserefpolicy/policy/modules/services/ppp.fc	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ppp.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ppp.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # /etc
@@ -21688,7 +21541,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /etc/ppp(/.*)?			--	gen_context(system_u:object_r:pppd_etc_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.5.8/policy/modules/services/ppp.if
 --- nsaserefpolicy/policy/modules/services/ppp.if	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ppp.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ppp.if	2008-09-12 10:59:28.000000000 -0400
 @@ -310,6 +310,24 @@
  
  ########################################
@@ -21768,7 +21621,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.5.8/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ppp.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ppp.te	2008-09-12 10:59:28.000000000 -0400
 @@ -197,6 +197,8 @@
  
  optional_policy(`
@@ -21795,7 +21648,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.fc serefpolicy-3.5.8/policy/modules/services/prelude.fc
 --- nsaserefpolicy/policy/modules/services/prelude.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/prelude.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/prelude.fc	2008-09-12 10:59:28.000000000 -0400
 @@ -5,7 +5,20 @@
  
  /var/lib/prelude-lml(/.*)?		gen_context(system_u:object_r:prelude_var_lib_t,s0)
@@ -21819,7 +21672,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.if serefpolicy-3.5.8/policy/modules/services/prelude.if
 --- nsaserefpolicy/policy/modules/services/prelude.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/prelude.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/prelude.if	2008-09-12 10:59:29.000000000 -0400
 @@ -6,7 +6,7 @@
  ## </summary>
  ## <param name="domain">
@@ -21981,7 +21834,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.5.8/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/prelude.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/prelude.te	2008-09-12 10:59:29.000000000 -0400
 @@ -13,18 +13,56 @@
  type prelude_spool_t;
  files_type(prelude_spool_t)
@@ -22221,7 +22074,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  		mysql_stream_connect(httpd_prewikka_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.fc serefpolicy-3.5.8/policy/modules/services/privoxy.fc
 --- nsaserefpolicy/policy/modules/services/privoxy.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/privoxy.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/privoxy.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,6 +1,10 @@
  
  /etc/privoxy/user\.action --	gen_context(system_u:object_r:privoxy_etc_rw_t,s0)
@@ -22235,7 +22088,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.if serefpolicy-3.5.8/policy/modules/services/privoxy.if
 --- nsaserefpolicy/policy/modules/services/privoxy.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/privoxy.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/privoxy.if	2008-09-12 10:59:29.000000000 -0400
 @@ -2,6 +2,25 @@
  
  ########################################
@@ -22292,7 +22145,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.5.8/policy/modules/services/privoxy.te
 --- nsaserefpolicy/policy/modules/services/privoxy.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/privoxy.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/privoxy.te	2008-09-12 10:59:29.000000000 -0400
 @@ -19,6 +19,9 @@
  type privoxy_var_run_t;
  files_pid_file(privoxy_var_run_t)
@@ -22313,7 +22166,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corenet_sendrecv_http_cache_server_packets(privoxy_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.fc serefpolicy-3.5.8/policy/modules/services/procmail.fc
 --- nsaserefpolicy/policy/modules/services/procmail.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/procmail.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/procmail.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,2 +1,5 @@
  
  /usr/bin/procmail	--	gen_context(system_u:object_r:procmail_exec_t,s0)
@@ -22322,7 +22175,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/log/procmail(/.*)? gen_context(system_u:object_r:procmail_log_t,s0) 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.if serefpolicy-3.5.8/policy/modules/services/procmail.if
 --- nsaserefpolicy/policy/modules/services/procmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/procmail.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/procmail.if	2008-09-12 10:59:29.000000000 -0400
 @@ -39,3 +39,41 @@
  	corecmd_search_bin($1)
  	can_exec($1, procmail_exec_t)
@@ -22367,7 +22220,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.5.8/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/procmail.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/procmail.te	2008-09-12 10:59:29.000000000 -0400
 @@ -14,6 +14,10 @@
  type procmail_tmp_t;
  files_tmp_file(procmail_tmp_t)
@@ -22447,7 +22300,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.fc serefpolicy-3.5.8/policy/modules/services/pyzor.fc
 --- nsaserefpolicy/policy/modules/services/pyzor.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/pyzor.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/pyzor.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,9 +1,12 @@
  /etc/pyzor(/.*)?		gen_context(system_u:object_r:pyzor_etc_t, s0)
  
@@ -22464,7 +22317,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/pyzord	--	gen_context(system_u:object_r:pyzord_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.5.8/policy/modules/services/pyzor.if
 --- nsaserefpolicy/policy/modules/services/pyzor.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/pyzor.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/pyzor.if	2008-09-12 10:59:29.000000000 -0400
 @@ -25,16 +25,16 @@
  #
  template(`pyzor_per_role_template',`
@@ -22570,7 +22423,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-3.5.8/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/pyzor.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/pyzor.te	2008-09-12 10:59:29.000000000 -0400
 @@ -6,6 +6,37 @@
  # Declarations
  #
@@ -22658,7 +22511,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/qmail.te serefpolicy-3.5.8/policy/modules/services/qmail.te
 --- nsaserefpolicy/policy/modules/services/qmail.te	2008-08-11 11:23:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/qmail.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/qmail.te	2008-09-12 10:59:29.000000000 -0400
 @@ -124,6 +124,10 @@
  
  qmail_domtrans_queue(qmail_local_t)
@@ -22683,7 +22536,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-3.5.8/policy/modules/services/radius.fc
 --- nsaserefpolicy/policy/modules/services/radius.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/radius.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/radius.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -20,3 +20,5 @@
  
  /var/run/radiusd(/.*)?		gen_context(system_u:object_r:radiusd_var_run_t,s0)
@@ -22692,7 +22545,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/radiusd	--	gen_context(system_u:object_r:radius_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.if serefpolicy-3.5.8/policy/modules/services/radius.if
 --- nsaserefpolicy/policy/modules/services/radius.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/radius.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/radius.if	2008-09-12 10:59:29.000000000 -0400
 @@ -16,6 +16,25 @@
  
  ########################################
@@ -22756,7 +22609,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-3.5.8/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/radius.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/radius.te	2008-09-12 10:59:29.000000000 -0400
 @@ -25,6 +25,9 @@
  type radiusd_var_run_t;
  files_pid_file(radiusd_var_run_t)
@@ -22831,7 +22684,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.fc serefpolicy-3.5.8/policy/modules/services/radvd.fc
 --- nsaserefpolicy/policy/modules/services/radvd.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/radvd.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/radvd.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -5,3 +5,4 @@
  
  /var/run/radvd\.pid	--	gen_context(system_u:object_r:radvd_var_run_t,s0)
@@ -22839,7 +22692,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/radvd	--	gen_context(system_u:object_r:radvd_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.if serefpolicy-3.5.8/policy/modules/services/radvd.if
 --- nsaserefpolicy/policy/modules/services/radvd.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/radvd.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/radvd.if	2008-09-12 10:59:29.000000000 -0400
 @@ -2,6 +2,25 @@
  
  ########################################
@@ -22892,7 +22745,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.5.8/policy/modules/services/radvd.te
 --- nsaserefpolicy/policy/modules/services/radvd.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/radvd.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/radvd.te	2008-09-12 10:59:29.000000000 -0400
 @@ -15,6 +15,9 @@
  type radvd_etc_t;
  files_config_file(radvd_etc_t)
@@ -22913,7 +22766,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.5.8/policy/modules/services/razor.fc
 --- nsaserefpolicy/policy/modules/services/razor.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/razor.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/razor.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.razor(/.*)?		gen_context(system_u:object_r:ROLE_razor_home_t,s0)
 +HOME_DIR/\.razor(/.*)?		gen_context(system_u:object_r:razor_home_t,s0)
@@ -22922,7 +22775,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.5.8/policy/modules/services/razor.if
 --- nsaserefpolicy/policy/modules/services/razor.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/razor.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/razor.if	2008-09-12 10:59:29.000000000 -0400
 @@ -137,6 +137,7 @@
  template(`razor_per_role_template',`
  	gen_require(`
@@ -23044,7 +22897,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.5.8/policy/modules/services/razor.te
 --- nsaserefpolicy/policy/modules/services/razor.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/razor.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/razor.te	2008-09-12 10:59:29.000000000 -0400
 @@ -6,21 +6,51 @@
  # Declarations
  #
@@ -23102,7 +22955,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.5.8/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ricci.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ricci.te	2008-09-12 10:59:29.000000000 -0400
 @@ -133,6 +133,8 @@
  
  dev_read_urand(ricci_t)
@@ -23167,7 +23020,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  files_manage_etc_files(ricci_modstorage_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.5.8/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rlogin.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rlogin.te	2008-09-12 10:59:29.000000000 -0400
 @@ -94,8 +94,8 @@
  remotelogin_signal(rlogind_t)
  
@@ -23181,7 +23034,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.fc serefpolicy-3.5.8/policy/modules/services/roundup.fc
 --- nsaserefpolicy/policy/modules/services/roundup.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/roundup.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/roundup.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -7,3 +7,5 @@
  # /var
  #
@@ -23190,7 +23043,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/roundup	--	gen_context(system_u:object_r:roundup_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.if serefpolicy-3.5.8/policy/modules/services/roundup.if
 --- nsaserefpolicy/policy/modules/services/roundup.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/roundup.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/roundup.if	2008-09-12 10:59:29.000000000 -0400
 @@ -1 +1,66 @@
  ## <summary>Roundup Issue Tracking System policy</summary>
 +
@@ -23260,7 +23113,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.te serefpolicy-3.5.8/policy/modules/services/roundup.te
 --- nsaserefpolicy/policy/modules/services/roundup.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/roundup.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/roundup.te	2008-09-12 10:59:29.000000000 -0400
 @@ -16,6 +16,9 @@
  type roundup_var_lib_t;
  files_type(roundup_var_lib_t)
@@ -23273,7 +23126,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.5.8/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rpc.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rpc.if	2008-09-12 10:59:29.000000000 -0400
 @@ -88,8 +88,11 @@
  	# bind to arbitary unused ports
  	corenet_tcp_bind_generic_port($1_t)
@@ -23314,7 +23167,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.5.8/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rpc.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rpc.te	2008-09-12 10:59:29.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -23374,7 +23227,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.5.8/policy/modules/services/rpcbind.fc
 --- nsaserefpolicy/policy/modules/services/rpcbind.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rpcbind.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rpcbind.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -5,3 +5,5 @@
  /var/run/rpc.statd\.pid	--	gen_context(system_u:object_r:rpcbind_var_run_t,s0)
  /var/run/rpcbind\.lock	--	gen_context(system_u:object_r:rpcbind_var_run_t,s0)
@@ -23383,7 +23236,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/rpcbind	--	gen_context(system_u:object_r:rpcbind_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.5.8/policy/modules/services/rpcbind.if
 --- nsaserefpolicy/policy/modules/services/rpcbind.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rpcbind.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rpcbind.if	2008-09-12 10:59:29.000000000 -0400
 @@ -95,3 +95,65 @@
  	manage_files_pattern($1, rpcbind_var_lib_t, rpcbind_var_lib_t)
  	files_search_var_lib($1)
@@ -23452,7 +23305,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.5.8/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rpcbind.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rpcbind.te	2008-09-12 10:59:29.000000000 -0400
 @@ -16,16 +16,21 @@
  type rpcbind_var_lib_t;
  files_type(rpcbind_var_lib_t)
@@ -23486,7 +23339,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corenet_all_recvfrom_unlabeled(rpcbind_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.5.8/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rshd.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rshd.te	2008-09-12 10:59:29.000000000 -0400
 @@ -16,7 +16,7 @@
  #
  # Local policy
@@ -23550,7 +23403,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.5.8/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rsync.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rsync.te	2008-09-12 10:59:29.000000000 -0400
 @@ -45,7 +45,7 @@
  # Local policy
  #
@@ -23562,7 +23415,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow rsync_t self:tcp_socket create_stream_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.fc serefpolicy-3.5.8/policy/modules/services/rwho.fc
 --- nsaserefpolicy/policy/modules/services/rwho.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rwho.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rwho.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -3,3 +3,5 @@
  /var/spool/rwho(/.*)?		gen_context(system_u:object_r:rwho_spool_t,s0)
  
@@ -23571,7 +23424,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/rwhod	--	gen_context(system_u:object_r:rwho_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-3.5.8/policy/modules/services/rwho.if
 --- nsaserefpolicy/policy/modules/services/rwho.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rwho.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rwho.if	2008-09-12 10:59:29.000000000 -0400
 @@ -118,6 +118,25 @@
  
  ########################################
@@ -23624,7 +23477,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.te serefpolicy-3.5.8/policy/modules/services/rwho.te
 --- nsaserefpolicy/policy/modules/services/rwho.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/rwho.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/rwho.te	2008-09-12 10:59:29.000000000 -0400
 @@ -16,6 +16,9 @@
  type rwho_spool_t;
  files_type(rwho_spool_t)
@@ -23637,7 +23490,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # rwho local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.5.8/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/samba.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/samba.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -15,6 +15,7 @@
  /usr/bin/ntlm_auth		--	gen_context(system_u:object_r:winbind_helper_exec_t,s0)
  /usr/bin/smbmount		--	gen_context(system_u:object_r:smbmount_exec_t,s0)
@@ -23660,7 +23513,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.5.8/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/samba.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/samba.if	2008-09-12 10:59:29.000000000 -0400
 @@ -33,12 +33,12 @@
  	')
  
@@ -24030,7 +23883,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.5.8/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/samba.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/samba.te	2008-09-12 10:59:29.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -24385,7 +24238,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +allow smbcontrol_t nmbd_var_run_t:file { read lock };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.fc serefpolicy-3.5.8/policy/modules/services/sasl.fc
 --- nsaserefpolicy/policy/modules/services/sasl.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/sasl.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/sasl.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -8,3 +8,5 @@
  # /var
  #
@@ -24394,7 +24247,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/sasl	--	gen_context(system_u:object_r:sasl_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.if serefpolicy-3.5.8/policy/modules/services/sasl.if
 --- nsaserefpolicy/policy/modules/services/sasl.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/sasl.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/sasl.if	2008-09-12 10:59:29.000000000 -0400
 @@ -21,6 +21,25 @@
  
  ########################################
@@ -24447,7 +24300,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.5.8/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/sasl.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/sasl.te	2008-09-12 10:59:29.000000000 -0400
 @@ -23,6 +23,9 @@
  type saslauthd_var_run_t;
  files_pid_file(saslauthd_var_run_t)
@@ -24480,7 +24333,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.5.8/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/sendmail.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/sendmail.if	2008-09-12 10:59:29.000000000 -0400
 @@ -149,3 +149,104 @@
  
  	logging_log_filetrans($1, sendmail_log_t, file)
@@ -24588,7 +24441,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.5.8/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/sendmail.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/sendmail.te	2008-09-12 10:59:29.000000000 -0400
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -24750,7 +24603,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -') dnl end TODO
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-3.5.8/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/setroubleshoot.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/setroubleshoot.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -5,3 +5,5 @@
  /var/log/setroubleshoot(/.*)?		gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
  
@@ -24759,7 +24612,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/setroubleshoot	--	gen_context(system_u:object_r:setroubleshoot_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.5.8/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/setroubleshoot.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/setroubleshoot.if	2008-09-12 10:59:29.000000000 -0400
 @@ -16,8 +16,8 @@
  	')
  
@@ -24850,7 +24703,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.5.8/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2008-08-25 09:12:31.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/setroubleshoot.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/setroubleshoot.te	2008-09-12 10:59:29.000000000 -0400
 @@ -22,13 +22,16 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
@@ -24935,7 +24788,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
          rpm_use_script_fds(setroubleshootd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.fc serefpolicy-3.5.8/policy/modules/services/smartmon.fc
 --- nsaserefpolicy/policy/modules/services/smartmon.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/smartmon.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/smartmon.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -8,3 +8,4 @@
  #
  /var/run/smartd\.pid	--	gen_context(system_u:object_r:fsdaemon_var_run_t,s0)
@@ -24943,7 +24796,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/smartd	--	gen_context(system_u:object_r:fsdaemon_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.if serefpolicy-3.5.8/policy/modules/services/smartmon.if
 --- nsaserefpolicy/policy/modules/services/smartmon.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/smartmon.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/smartmon.if	2008-09-12 10:59:29.000000000 -0400
 @@ -20,6 +20,25 @@
  
  ########################################
@@ -24996,7 +24849,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.5.8/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/smartmon.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/smartmon.te	2008-09-12 10:59:29.000000000 -0400
 @@ -16,6 +16,10 @@
  type fsdaemon_tmp_t;
  files_tmp_file(fsdaemon_tmp_t)
@@ -25038,7 +24891,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.5.8/policy/modules/services/snmp.fc
 --- nsaserefpolicy/policy/modules/services/snmp.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/snmp.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/snmp.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -17,3 +17,6 @@
  
  /var/run/snmpd		-d	gen_context(system_u:object_r:snmpd_var_run_t,s0)
@@ -25048,7 +24901,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/snmptrapd --	gen_context(system_u:object_r:snmp_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.5.8/policy/modules/services/snmp.if
 --- nsaserefpolicy/policy/modules/services/snmp.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/snmp.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/snmp.if	2008-09-12 10:59:29.000000000 -0400
 @@ -87,6 +87,25 @@
  
  ########################################
@@ -25121,7 +24974,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.5.8/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/snmp.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/snmp.te	2008-09-12 10:59:29.000000000 -0400
 @@ -18,12 +18,16 @@
  type snmpd_var_lib_t;
  files_type(snmpd_var_lib_t)
@@ -25185,7 +25038,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.fc serefpolicy-3.5.8/policy/modules/services/snort.fc
 --- nsaserefpolicy/policy/modules/services/snort.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/snort.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/snort.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -2,5 +2,10 @@
  /etc/snort(/.*)?	gen_context(system_u:object_r:snort_etc_t,s0)
  
@@ -25199,7 +25052,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/snortd	--	gen_context(system_u:object_r:snort_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.if serefpolicy-3.5.8/policy/modules/services/snort.if
 --- nsaserefpolicy/policy/modules/services/snort.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/snort.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/snort.if	2008-09-12 10:59:29.000000000 -0400
 @@ -1 +1,91 @@
  ## <summary>Snort network intrusion detection system</summary>
 +
@@ -25294,7 +25147,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.5.8/policy/modules/services/snort.te
 --- nsaserefpolicy/policy/modules/services/snort.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/snort.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/snort.te	2008-09-12 10:59:29.000000000 -0400
 @@ -10,8 +10,11 @@
  type snort_exec_t;
  init_daemon_domain(snort_t, snort_exec_t)
@@ -25354,7 +25207,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.fc serefpolicy-3.5.8/policy/modules/services/soundserver.fc
 --- nsaserefpolicy/policy/modules/services/soundserver.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/soundserver.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/soundserver.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -7,4 +7,8 @@
  /usr/sbin/yiff		--	gen_context(system_u:object_r:soundd_exec_t,s0)
  
@@ -25366,7 +25219,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/nasd	--	gen_context(system_u:object_r:soundd_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.if serefpolicy-3.5.8/policy/modules/services/soundserver.if
 --- nsaserefpolicy/policy/modules/services/soundserver.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/soundserver.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/soundserver.if	2008-09-12 10:59:29.000000000 -0400
 @@ -13,3 +13,70 @@
  interface(`soundserver_tcp_connect',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -25440,7 +25293,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.te serefpolicy-3.5.8/policy/modules/services/soundserver.te
 --- nsaserefpolicy/policy/modules/services/soundserver.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/soundserver.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/soundserver.te	2008-09-12 10:59:29.000000000 -0400
 @@ -11,7 +11,7 @@
  init_daemon_domain(soundd_t, soundd_exec_t)
  
@@ -25507,7 +25360,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.5.8/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/spamassassin.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/spamassassin.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,16 +1,27 @@
 -HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0)
 +HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamc_home_t,s0)
@@ -25541,7 +25394,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/mimedefang.*	--	gen_context(system_u:object_r:spamd_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.5.8/policy/modules/services/spamassassin.if
 --- nsaserefpolicy/policy/modules/services/spamassassin.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/spamassassin.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/spamassassin.if	2008-09-12 10:59:29.000000000 -0400
 @@ -34,10 +34,10 @@
  # cjp: when tunables are available, spamc stuff should be
  # toggled on activation of spamc, and similarly for spamd.
@@ -26106,7 +25959,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.5.8/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/spamassassin.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/spamassassin.te	2008-09-12 10:59:29.000000000 -0400
 @@ -21,8 +21,10 @@
  gen_tunable(spamd_enable_home_dirs, true)
  
@@ -26401,7 +26254,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-3.5.8/policy/modules/services/squid.fc
 --- nsaserefpolicy/policy/modules/services/squid.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/squid.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/squid.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -12,3 +12,8 @@
  /var/run/squid\.pid	--	gen_context(system_u:object_r:squid_var_run_t,s0)
  
@@ -26413,7 +26266,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-3.5.8/policy/modules/services/squid.if
 --- nsaserefpolicy/policy/modules/services/squid.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/squid.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/squid.if	2008-09-12 10:59:29.000000000 -0400
 @@ -131,3 +131,114 @@
  interface(`squid_use',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -26531,7 +26384,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.5.8/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/squid.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/squid.te	2008-09-12 10:59:29.000000000 -0400
 @@ -31,12 +31,15 @@
  type squid_var_run_t;
  files_pid_file(squid_var_run_t)
@@ -26619,7 +26472,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-3.5.8/policy/modules/services/ssh.fc
 --- nsaserefpolicy/policy/modules/services/ssh.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ssh.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ssh.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.ssh(/.*)?			gen_context(system_u:object_r:ROLE_home_ssh_t,s0)
 +HOME_DIR/\.ssh(/.*)?			gen_context(system_u:object_r:ssh_home_t,s0)
@@ -26628,7 +26481,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /etc/ssh/ssh_host_key 		--	gen_context(system_u:object_r:sshd_key_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.5.8/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ssh.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ssh.if	2008-09-12 10:59:29.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -26867,7 +26720,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.5.8/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/ssh.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/ssh.te	2008-09-12 10:59:29.000000000 -0400
 @@ -24,7 +24,7 @@
  
  # Type for the ssh-agent executable.
@@ -26930,7 +26783,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.fc serefpolicy-3.5.8/policy/modules/services/stunnel.fc
 --- nsaserefpolicy/policy/modules/services/stunnel.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/stunnel.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/stunnel.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -2,5 +2,6 @@
  /etc/stunnel(/.*)?          	gen_context(system_u:object_r:stunnel_etc_t,s0)
  
@@ -26940,7 +26793,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/stunnel(/.*)?		gen_context(system_u:object_r:stunnel_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-3.5.8/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/stunnel.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/stunnel.te	2008-09-12 10:59:29.000000000 -0400
 @@ -54,6 +54,8 @@
  kernel_read_system_state(stunnel_t)
  kernel_read_network_state(stunnel_t)
@@ -26952,7 +26805,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corenet_tcp_sendrecv_all_if(stunnel_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.5.8/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/telnet.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/telnet.te	2008-09-12 10:59:29.000000000 -0400
 @@ -89,15 +89,19 @@
  
  userdom_search_unpriv_users_home_dirs(telnetd_t)
@@ -26979,7 +26832,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.if serefpolicy-3.5.8/policy/modules/services/tftp.if
 --- nsaserefpolicy/policy/modules/services/tftp.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/tftp.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/tftp.if	2008-09-12 10:59:29.000000000 -0400
 @@ -20,10 +20,10 @@
  	allow $1 tftpd_t:process { ptrace signal_perms getattr };
  	ps_process_pattern($1, tftpd_t)
@@ -26996,7 +26849,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-3.5.8/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/tftp.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/tftp.te	2008-09-12 10:59:29.000000000 -0400
 @@ -37,7 +37,6 @@
  allow tftpd_t self:udp_socket create_socket_perms;
  allow tftpd_t self:unix_dgram_socket create_socket_perms;
@@ -27043,7 +26896,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.fc serefpolicy-3.5.8/policy/modules/services/tor.fc
 --- nsaserefpolicy/policy/modules/services/tor.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/tor.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/tor.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -6,3 +6,5 @@
  /var/lib/tor(/.*)?		gen_context(system_u:object_r:tor_var_lib_t,s0)
  /var/log/tor(/.*)?		gen_context(system_u:object_r:tor_var_log_t,s0)
@@ -27052,7 +26905,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/tor	--	gen_context(system_u:object_r:tor_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.if serefpolicy-3.5.8/policy/modules/services/tor.if
 --- nsaserefpolicy/policy/modules/services/tor.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/tor.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/tor.if	2008-09-12 10:59:29.000000000 -0400
 @@ -20,6 +20,25 @@
  
  ########################################
@@ -27114,7 +26967,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.te serefpolicy-3.5.8/policy/modules/services/tor.te
 --- nsaserefpolicy/policy/modules/services/tor.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/tor.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/tor.te	2008-09-12 10:59:29.000000000 -0400
 @@ -26,11 +26,15 @@
  type tor_var_run_t;
  files_pid_file(tor_var_run_t)
@@ -27149,7 +27002,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.if serefpolicy-3.5.8/policy/modules/services/uucp.if
 --- nsaserefpolicy/policy/modules/services/uucp.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/uucp.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/uucp.if	2008-09-12 10:59:29.000000000 -0400
 @@ -84,18 +84,18 @@
  	ps_process_pattern($1, uucpd_t)
  	        
@@ -27177,7 +27030,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.5.8/policy/modules/services/uucp.te
 --- nsaserefpolicy/policy/modules/services/uucp.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/uucp.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/uucp.te	2008-09-12 10:59:29.000000000 -0400
 @@ -116,6 +116,8 @@
  
  files_read_etc_files(uux_t)
@@ -27189,7 +27042,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.5.8/policy/modules/services/virt.fc
 --- nsaserefpolicy/policy/modules/services/virt.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/virt.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/virt.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -9,3 +9,6 @@
  /var/lib/libvirt/images(/.*)? 	gen_context(system_u:object_r:virt_image_t,s0)
  /var/log/libvirt(/.*)?		gen_context(system_u:object_r:virt_log_t,s0)
@@ -27199,7 +27052,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.5.8/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/virt.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/virt.if	2008-09-12 10:59:29.000000000 -0400
 @@ -68,7 +68,7 @@
  ##	</summary>
  ## </param>
@@ -27299,7 +27152,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	virt_manage_lib_files($1)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.5.8/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/virt.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/virt.te	2008-09-12 10:59:29.000000000 -0400
 @@ -1,6 +1,8 @@
  
  policy_module(virt, 1.0.0)
@@ -27432,7 +27285,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.5.8/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/xserver.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/xserver.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,13 +1,15 @@
  #
  # HOME_DIR
@@ -27506,7 +27359,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.5.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/xserver.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/xserver.if	2008-09-12 10:59:29.000000000 -0400
 @@ -16,6 +16,7 @@
  	gen_require(`
  		type xkb_var_lib_t, xserver_exec_t, xserver_log_t;
@@ -28680,7 +28533,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.5.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/xserver.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/xserver.te	2008-09-12 10:59:29.000000000 -0400
 @@ -8,6 +8,14 @@
  
  ## <desc>
@@ -29180,7 +29033,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.fc serefpolicy-3.5.8/policy/modules/services/zabbix.fc
 --- nsaserefpolicy/policy/modules/services/zabbix.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/zabbix.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/zabbix.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -3,3 +3,5 @@
  /var/log/zabbix(/.*)?		gen_context(system_u:object_r:zabbix_log_t,s0)
  
@@ -29189,7 +29042,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/zabbix	--	gen_context(system_u:object_r:zabbix_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.if serefpolicy-3.5.8/policy/modules/services/zabbix.if
 --- nsaserefpolicy/policy/modules/services/zabbix.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/zabbix.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/zabbix.if	2008-09-12 10:59:29.000000000 -0400
 @@ -79,6 +79,25 @@
  
  ########################################
@@ -29244,7 +29097,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.te serefpolicy-3.5.8/policy/modules/services/zabbix.te
 --- nsaserefpolicy/policy/modules/services/zabbix.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/zabbix.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/zabbix.te	2008-09-12 10:59:29.000000000 -0400
 @@ -18,6 +18,9 @@
  type zabbix_var_run_t;
  files_pid_file(zabbix_var_run_t)
@@ -29257,7 +29110,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # zabbix local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.fc serefpolicy-3.5.8/policy/modules/services/zebra.fc
 --- nsaserefpolicy/policy/modules/services/zebra.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/zebra.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/zebra.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -14,3 +14,10 @@
  /var/run/\.zebra	-s	gen_context(system_u:object_r:zebra_var_run_t,s0)
  /var/run/\.zserv	-s	gen_context(system_u:object_r:zebra_var_run_t,s0)
@@ -29271,7 +29124,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/zebra	--	gen_context(system_u:object_r:zebra_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.if serefpolicy-3.5.8/policy/modules/services/zebra.if
 --- nsaserefpolicy/policy/modules/services/zebra.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/zebra.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/zebra.if	2008-09-12 10:59:29.000000000 -0400
 @@ -24,6 +24,26 @@
  
  ########################################
@@ -29335,7 +29188,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-3.5.8/policy/modules/services/zebra.te
 --- nsaserefpolicy/policy/modules/services/zebra.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/services/zebra.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/services/zebra.te	2008-09-12 10:59:29.000000000 -0400
 @@ -30,6 +30,9 @@
  type zebra_var_run_t;
  files_pid_file(zebra_var_run_t)
@@ -29365,7 +29218,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.5.8/policy/modules/system/application.te
 --- nsaserefpolicy/policy/modules/system/application.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/application.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/application.te	2008-09-12 10:59:29.000000000 -0400
 @@ -7,6 +7,12 @@
  # Executables to be run by user
  attribute application_exec_type;
@@ -29381,7 +29234,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	ssh_rw_stream_sockets(application_domain_type)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.5.8/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/authlogin.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/authlogin.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -7,12 +7,10 @@
  /etc/passwd\.lock	--	gen_context(system_u:object_r:shadow_t,s0)
  /etc/shadow.*		--	gen_context(system_u:object_r:shadow_t,s0)
@@ -29410,7 +29263,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.5.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/authlogin.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/authlogin.if	2008-09-12 10:59:29.000000000 -0400
 @@ -56,10 +56,6 @@
  	miscfiles_read_localization($1_chkpwd_t)
  
@@ -29673,7 +29526,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.5.8/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/authlogin.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/authlogin.te	2008-09-12 10:59:29.000000000 -0400
 @@ -59,6 +59,9 @@
  type utempter_exec_t;
  application_domain(utempter_t,utempter_exec_t)
@@ -29775,7 +29628,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.5.8/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/fstools.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/fstools.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,4 +1,3 @@
 -/sbin/badblocks		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/blkid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -29791,7 +29644,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /sbin/partx		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.5.8/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2008-08-14 10:07:04.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/fstools.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/fstools.te	2008-09-12 10:59:29.000000000 -0400
 @@ -97,6 +97,10 @@
  fs_getattr_tmpfs_dirs(fsadm_t)
  fs_read_tmpfs_symlinks(fsadm_t)
@@ -29815,7 +29668,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.5.8/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/hostname.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/hostname.te	2008-09-12 10:59:29.000000000 -0400
 @@ -8,7 +8,9 @@
  
  type hostname_t;
@@ -29829,7 +29682,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-3.5.8/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/init.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/init.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -4,8 +4,7 @@
  /etc/init\.d/.*		--	gen_context(system_u:object_r:initrc_exec_t,s0)
  
@@ -29850,8 +29703,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # /var
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.5.8/policy/modules/system/init.if
---- nsaserefpolicy/policy/modules/system/init.if	2008-09-03 07:59:15.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/init.if	2008-09-11 16:37:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/init.if	2008-09-12 10:48:05.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/init.if	2008-09-12 16:21:16.000000000 -0400
 @@ -278,6 +278,27 @@
  			kernel_dontaudit_use_fds($1)
  		')
@@ -29904,7 +29757,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  ')
  
-@@ -644,23 +666,43 @@
+@@ -644,19 +666,39 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -29925,11 +29778,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	ifdef(`enable_mls',`
 -		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
 +		range_transition $1 init_script_file_type:process s0 - mls_systemhigh;
- 	')
- ')
- 
- ########################################
- ## <summary>
++	')
++')
++
++########################################
++## <summary>
 +##	Execute a file in a bin directory
 +##	in the initrc_t domain 
 +## </summary>
@@ -29942,17 +29795,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +interface(`init_bin_domtrans_spec',`
 +	gen_require(`
 +		type initrc_t;
-+	')
+ 	')
 +
 +	corecmd_bin_domtrans($1, initrc_t)
-+')
-+
-+########################################
-+## <summary>
- ##	Execute a init script in a specified domain.
- ## </summary>
- ## <desc>
-@@ -1231,6 +1273,25 @@
+ ')
+ 
+ ########################################
+@@ -1271,6 +1312,25 @@
  
  ########################################
  ## <summary>
@@ -29978,7 +29827,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Create files in a init script
  ##	temporary data directory.
  ## </summary>
-@@ -1386,7 +1447,7 @@
+@@ -1426,7 +1486,7 @@
  		type initrc_var_run_t;
  	')
  
@@ -29987,52 +29836,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -1442,3 +1503,117 @@
+@@ -1482,3 +1542,78 @@
  	')
  	corenet_udp_recvfrom_labeled($1, daemon)
  ')
 +
 +########################################
 +## <summary>
-+##	Read the process state (/proc/pid) of init.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`init_read_init_state',`
-+	gen_require(`
-+		attribute init_t;
-+	')
-+
-+	allow $1 init_t:dir search_dir_perms;
-+	allow $1 init_t:file read_file_perms;
-+	allow $1 init_t:lnk_file read_file_perms;
-+')
-+
-+########################################
-+## <summary>
-+##	Ptrace init
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+## <rolecap/>
-+#
-+interface(`init_ptrace_init_domain',`
-+	gen_require(`
-+		attribute init_t;
-+	')
-+
-+	allow $1 init_t:process ptrace;
-+')
-+
-+########################################
-+## <summary>
 +##	Transition to system_r when execute an init script
 +## </summary>
 +## <desc>
@@ -30106,8 +29916,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	')
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.5.8/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2008-09-03 07:59:15.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/init.te	2008-09-11 16:37:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/init.te	2008-09-12 10:48:05.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/init.te	2008-09-12 10:59:29.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -30332,7 +30142,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.5.8/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2008-08-11 11:23:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/ipsec.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/ipsec.te	2008-09-12 10:59:29.000000000 -0400
 @@ -55,11 +55,11 @@
  
  allow ipsec_t self:capability { net_admin dac_override dac_read_search };
@@ -30422,7 +30232,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.5.8/policy/modules/system/iscsi.te
 --- nsaserefpolicy/policy/modules/system/iscsi.te	2008-08-11 11:23:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/iscsi.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/iscsi.te	2008-09-12 10:59:29.000000000 -0400
 @@ -28,7 +28,7 @@
  # iscsid local policy
  #
@@ -30434,7 +30244,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow iscsid_t self:unix_stream_socket { create_stream_socket_perms connectto };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.5.8/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2008-08-13 15:24:56.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/libraries.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/libraries.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -66,6 +66,8 @@
  /opt/(.*/)?jre.*/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /opt/(.*/)?jre/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
@@ -30523,7 +30333,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/opt/novell/groupwise/client/lib/libgwapijni\.so\.1	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.5.8/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2008-08-13 15:24:56.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/libraries.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/libraries.te	2008-09-12 10:59:29.000000000 -0400
 @@ -52,11 +52,11 @@
  # ldconfig local policy
  #
@@ -30582,7 +30392,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-3.5.8/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/locallogin.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/locallogin.te	2008-09-12 10:59:29.000000000 -0400
 @@ -100,7 +100,6 @@
  
  auth_rw_login_records(local_login_t)
@@ -30653,7 +30463,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.5.8/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2008-08-25 09:12:31.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/logging.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/logging.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -63,3 +63,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -30663,7 +30473,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc\.d/init\.d/auditd	--	gen_context(system_u:object_r:auditd_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.5.8/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2008-09-03 14:55:50.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/logging.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/logging.if	2008-09-12 10:59:29.000000000 -0400
 @@ -281,7 +281,7 @@
  	role system_r types $1;
  
@@ -30777,7 +30587,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.5.8/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2008-09-03 10:17:00.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/logging.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/logging.te	2008-09-12 10:59:29.000000000 -0400
 @@ -72,6 +72,12 @@
  logging_log_file(var_log_t)
  files_mountpoint(var_log_t)
@@ -30809,7 +30619,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.5.8/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/lvm.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/lvm.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -55,6 +55,7 @@
  /sbin/lvs		--	gen_context(system_u:object_r:lvm_exec_t,s0)
  /sbin/lvscan		--	gen_context(system_u:object_r:lvm_exec_t,s0)
@@ -30825,7 +30635,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/run/dmevent.*		gen_context(system_u:object_r:lvm_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.5.8/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/lvm.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/lvm.te	2008-09-12 10:59:29.000000000 -0400
 @@ -13,6 +13,9 @@
  type clvmd_var_run_t;
  files_pid_file(clvmd_var_run_t)
@@ -31006,56 +30816,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	xen_append_log(lvm_t)
 +	xen_dontaudit_rw_unix_stream_sockets(lvm_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.if serefpolicy-3.5.8/policy/modules/system/modutils.if
---- nsaserefpolicy/policy/modules/system/modutils.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/modutils.if	2008-09-11 16:37:43.000000000 -0400
-@@ -66,6 +66,25 @@
- 
- ########################################
- ## <summary>
-+##	Unlink a file with the configuration options used when
-+##	loading modules.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`modutils_unlink_module_config',`
-+	gen_require(`
-+		type modules_conf_t;
-+	')
-+
-+	allow $1 modules_conf_t:file unlink;
-+')
-+
-+########################################
-+## <summary>
- ##	Unconditionally execute insmod in the insmod domain.
- ## </summary>
- ## <param name="domain">
-@@ -275,6 +294,7 @@
- 	modutils_domtrans_update_mods($1)
- 	role $2 types update_modules_t;
- 	allow update_modules_t $3:chr_file rw_term_perms;
-+	modutils_run_insmod(update_modules_t, $2, $3)
- ')
- 
- ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.5.8/policy/modules/system/modutils.te
---- nsaserefpolicy/policy/modules/system/modutils.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/modutils.te	2008-09-11 16:37:43.000000000 -0400
-@@ -22,6 +22,8 @@
- type insmod_exec_t;
- application_domain(insmod_t,insmod_exec_t)
- mls_file_write_all_levels(insmod_t)
-+mls_process_write_to_clearance(insmod_t)
-+
- role system_r types insmod_t;
- 
- type depmod_t;
-@@ -42,7 +44,7 @@
+--- nsaserefpolicy/policy/modules/system/modutils.te	2008-09-12 10:48:05.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/modutils.te	2008-09-12 10:59:29.000000000 -0400
+@@ -42,7 +42,7 @@
  # insmod local policy
  #
  
@@ -31064,7 +30828,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow insmod_t self:process { execmem sigchld sigkill sigstop signull signal };
  
  allow insmod_t self:udp_socket create_socket_perms; 
-@@ -55,6 +57,7 @@
+@@ -55,6 +55,7 @@
  
  kernel_load_module(insmod_t)
  kernel_read_system_state(insmod_t)
@@ -31072,7 +30836,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  kernel_write_proc_files(insmod_t)
  kernel_mount_debugfs(insmod_t)
  kernel_mount_kvmfs(insmod_t)
-@@ -63,6 +66,7 @@
+@@ -63,6 +64,7 @@
  kernel_read_kernel_sysctls(insmod_t)
  kernel_rw_kernel_sysctl(insmod_t)
  kernel_read_hotplug_sysctls(insmod_t)
@@ -31080,7 +30844,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  files_read_kernel_modules(insmod_t)
  # for locking: (cjp: ????)
-@@ -76,9 +80,7 @@
+@@ -76,9 +78,7 @@
  dev_read_sound(insmod_t)
  dev_write_sound(insmod_t)
  dev_rw_apm_bios(insmod_t)
@@ -31091,7 +30855,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  fs_getattr_xattr_fs(insmod_t)
  
-@@ -101,6 +103,8 @@
+@@ -101,6 +101,8 @@
  init_use_fds(insmod_t)
  init_use_script_fds(insmod_t)
  init_use_script_ptys(insmod_t)
@@ -31100,7 +30864,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  libs_use_ld_so(insmod_t)
  libs_use_shared_libs(insmod_t)
-@@ -112,17 +116,32 @@
+@@ -112,17 +114,32 @@
  
  seutil_read_file_contexts(insmod_t)
  
@@ -31135,7 +30899,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	hotplug_search_config(insmod_t)
  ')
  
-@@ -155,10 +174,12 @@
+@@ -155,10 +172,12 @@
  
  optional_policy(`
  	rpm_rw_pipes(insmod_t)
@@ -31148,7 +30912,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -185,6 +206,7 @@
+@@ -185,6 +204,7 @@
  
  files_read_kernel_symbol_table(depmod_t)
  files_read_kernel_modules(depmod_t)
@@ -31156,7 +30920,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  fs_getattr_xattr_fs(depmod_t)
  
-@@ -208,9 +230,11 @@
+@@ -208,9 +228,11 @@
  
  # Read System.map from home directories.
  files_list_home(depmod_t)
@@ -31169,7 +30933,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ifdef(`distro_ubuntu',`
  	optional_policy(`
  		unconfined_domain(depmod_t)
-@@ -219,11 +243,13 @@
+@@ -219,11 +241,13 @@
  
  optional_policy(`
  	# Read System.map from home directories.
@@ -31186,7 +30950,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.5.8/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/mount.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/mount.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,4 +1,6 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -31197,7 +30961,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/bin/fusermount		--	gen_context(system_u:object_r:mount_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.5.8/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/mount.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/mount.if	2008-09-12 10:59:29.000000000 -0400
 @@ -49,6 +49,8 @@
  	mount_domtrans($1)
  	role $2 types mount_t;
@@ -31209,7 +30973,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  		samba_run_smbmount($1, $2, $3)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.5.8/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/mount.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/mount.te	2008-09-12 16:23:16.000000000 -0400
 @@ -18,17 +18,18 @@
  init_system_domain(mount_t,mount_exec_t)
  role system_r types mount_t;
@@ -31232,7 +30996,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ########################################
  #
-@@ -36,23 +37,28 @@
+@@ -36,7 +37,8 @@
  #
  
  # setuid/setgid needed to mount cifs 
@@ -31242,14 +31006,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  allow mount_t mount_loopback_t:file read_file_perms;
  
- allow mount_t mount_tmp_t:file manage_file_perms;
- allow mount_t mount_tmp_t:dir manage_dir_perms;
-+files_tmp_filetrans(mount_t, mount_tmp_t, { file dir })
+@@ -47,12 +49,17 @@
  
- can_exec(mount_t, mount_exec_t)
+ files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir })
  
--files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir })
--
 +# In order to mount reiserfs_t
 +kernel_list_unlabeled(mount_t)
  kernel_read_system_state(mount_t)
@@ -31264,7 +31024,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  dev_rw_lvm_control(mount_t)
  dev_dontaudit_getattr_all_chr_files(mount_t)
  dev_dontaudit_getattr_memory_dev(mount_t)
-@@ -62,16 +68,18 @@
+@@ -62,16 +69,18 @@
  storage_raw_write_fixed_disk(mount_t)
  storage_raw_read_removable_device(mount_t)
  storage_raw_write_removable_device(mount_t)
@@ -31286,7 +31046,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  term_use_all_terms(mount_t)
  
-@@ -79,6 +87,7 @@
+@@ -79,6 +88,7 @@
  corecmd_exec_bin(mount_t)
  
  domain_use_interactive_fds(mount_t)
@@ -31294,7 +31054,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  files_search_all(mount_t)
  files_read_etc_files(mount_t)
-@@ -100,6 +109,8 @@
+@@ -100,6 +110,8 @@
  init_use_fds(mount_t)
  init_use_script_ptys(mount_t)
  init_dontaudit_getattr_initctl(mount_t)
@@ -31303,7 +31063,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  auth_use_nsswitch(mount_t)
  
-@@ -119,6 +130,8 @@
+@@ -119,6 +131,8 @@
  seutil_read_config(mount_t)
  
  userdom_use_all_users_fds(mount_t)
@@ -31312,7 +31072,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ifdef(`distro_redhat',`
  	optional_policy(`
-@@ -167,6 +180,8 @@
+@@ -167,6 +181,8 @@
  	fs_search_rpc(mount_t)
  
  	rpc_stub(mount_t)
@@ -31321,7 +31081,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -181,6 +196,11 @@
+@@ -181,6 +197,11 @@
  	')
  ')
  
@@ -31333,7 +31093,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # for kernel package installation
  optional_policy(`
  	rpm_rw_pipes(mount_t)
-@@ -188,6 +208,7 @@
+@@ -188,6 +209,7 @@
  
  optional_policy(`
  	samba_domtrans_smbmount(mount_t)
@@ -31341,7 +31101,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -198,4 +219,26 @@
+@@ -198,4 +220,26 @@
  optional_policy(`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
@@ -31370,7 +31130,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.5.8/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/raid.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/raid.te	2008-09-12 10:59:29.000000000 -0400
 @@ -39,6 +39,7 @@
  dev_dontaudit_getattr_generic_files(mdadm_t)
  dev_dontaudit_getattr_generic_chr_files(mdadm_t)
@@ -31381,7 +31141,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  fs_dontaudit_list_tmpfs(mdadm_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.5.8/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -38,7 +38,7 @@
  /usr/sbin/restorecond		--	gen_context(system_u:object_r:restorecond_exec_t,s0)
  /usr/sbin/run_init		--	gen_context(system_u:object_r:run_init_exec_t,s0)
@@ -31402,7 +31162,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/lib/selinux(/.*)?			gen_context(system_u:object_r:selinux_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.5.8/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.if	2008-09-12 09:56:50.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.if	2008-09-12 10:59:29.000000000 -0400
 @@ -555,6 +555,59 @@
  
  ########################################
@@ -31865,7 +31625,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.te	2008-09-12 09:54:05.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.te	2008-09-12 10:59:29.000000000 -0400
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32223,7 +31983,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.fc serefpolicy-3.5.8/policy/modules/system/setrans.fc
 --- nsaserefpolicy/policy/modules/system/setrans.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/setrans.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/setrans.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,3 +1,5 @@
 +/etc/rc\.d/init\.d/mcstrans	--	gen_context(system_u:object_r:setrans_script_exec_t,s0)
 +
@@ -32232,7 +31992,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/setrans(/.*)?	gen_context(system_u:object_r:setrans_var_run_t,mls_systemhigh)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.8/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/setrans.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/setrans.if	2008-09-12 10:59:29.000000000 -0400
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32259,7 +32019,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-3.5.8/policy/modules/system/setrans.te
 --- nsaserefpolicy/policy/modules/system/setrans.te	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/setrans.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/setrans.te	2008-09-12 10:59:29.000000000 -0400
 @@ -14,6 +14,9 @@
  files_pid_file(setrans_var_run_t)
  mls_trusted_object(setrans_var_run_t)
@@ -32272,7 +32032,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -57,3 +57,5 @@
  ifdef(`distro_gentoo',`
  /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
@@ -32281,7 +32041,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.5.8/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.if	2008-09-12 10:59:29.000000000 -0400
 @@ -553,6 +553,7 @@
  		type net_conf_t;
  	')
@@ -32362,7 +32122,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.8/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-08-11 11:23:34.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.te	2008-09-12 10:59:29.000000000 -0400
 @@ -20,6 +20,10 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32546,7 +32306,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.8/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/udev.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/udev.if	2008-09-12 10:59:29.000000000 -0400
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32602,7 +32362,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.8/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/udev.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/udev.te	2008-09-12 10:59:29.000000000 -0400
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -32660,7 +32420,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.8/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/unconfined.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -2,15 +2,11 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -32701,7 +32461,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.8/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.if	2008-09-11 16:39:09.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/unconfined.if	2008-09-12 10:59:29.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33032,7 +32792,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.8/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/unconfined.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/unconfined.te	2008-09-12 10:59:29.000000000 -0400
 @@ -1,40 +1,80 @@
  
 -policy_module(unconfined, 2.3.1)
@@ -33369,7 +33129,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +domain_ptrace_all_domains(unconfined_notrans_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.8/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -1,4 +1,5 @@
 -HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 -HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
@@ -33382,7 +33142,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.if	2008-09-12 10:59:29.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -35944,7 +35704,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.8/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/userdomain.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/userdomain.te	2008-09-12 10:59:29.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36061,7 +35821,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.8/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.fc	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.fc	2008-09-12 10:59:29.000000000 -0400
 @@ -20,6 +20,7 @@
  /var/run/xenconsoled\.pid --	gen_context(system_u:object_r:xenconsoled_var_run_t,s0)
  /var/run/xend(/.*)?		gen_context(system_u:object_r:xend_var_run_t,s0)
@@ -36072,7 +35832,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.8/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.if	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.if	2008-09-12 10:59:29.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -36116,7 +35876,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.8/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.8/policy/modules/system/xen.te	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/modules/system/xen.te	2008-09-12 10:59:29.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36355,7 +36115,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.8/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/support/file_patterns.spt	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/support/file_patterns.spt	2008-09-12 10:59:29.000000000 -0400
 @@ -537,3 +537,18 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -36377,7 +36137,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.8/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/support/obj_perm_sets.spt	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/support/obj_perm_sets.spt	2008-09-12 10:59:29.000000000 -0400
 @@ -316,3 +316,13 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -36394,7 +36154,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.8/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.8/policy/users	2008-09-11 16:37:43.000000000 -0400
++++ serefpolicy-3.5.8/policy/users	2008-09-12 10:59:29.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
diff --git a/sources b/sources
index a615848..2284fad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08cbc69d40ae75771c6201f2812a2eba  serefpolicy-3.5.7.tgz
+1b4c8999f49501d5bcfc81fb2498b2e6  serefpolicy-3.5.8.tgz