From 35e7f77feaf59b2e22fdec01363ef2a6a18bf2c3 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Jul 06 2007 19:09:19 +0000
Subject: - Allow prelink to read kernel sysctls


---

diff --git a/policy-20070703.patch b/policy-20070703.patch
index 5a9e6fe..253e075 100644
--- a/policy-20070703.patch
+++ b/policy-20070703.patch
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/guest_u_default_contexts serefpolicy-3.0.2/config/appconfig-strict-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-strict-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/config/appconfig-strict-mls/guest_u_default_contexts	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/config/appconfig-strict-mls/guest_u_default_contexts	2007-07-03 14:38:10.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
@@ -8,7 +8,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/staff_u_default_contexts serefpolicy-3.0.2/config/appconfig-strict-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-strict-mls/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/config/appconfig-strict-mls/staff_u_default_contexts	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/config/appconfig-strict-mls/staff_u_default_contexts	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,9 @@
 +system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 +system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -21,7 +21,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/user_u_default_contexts serefpolicy-3.0.2/config/appconfig-strict-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-strict-mls/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/config/appconfig-strict-mls/user_u_default_contexts	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/config/appconfig-strict-mls/user_u_default_contexts	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	user_r:user_t:s0
 +system_r:remote_login_t:s0	user_r:user_t:s0
@@ -32,7 +32,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/
 +user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/default_type serefpolicy-3.0.2/config/appconfig-targeted-mcs/default_type
 --- nsaserefpolicy/config/appconfig-targeted-mcs/default_type	2007-05-25 09:09:09.000000000 -0400
-+++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/default_type	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/default_type	2007-07-03 14:38:10.000000000 -0400
 @@ -1 +1,4 @@
  system_r:unconfined_t
 +sysadm_r:sysadm_t
@@ -40,7 +40,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mc
 +user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/guest_u_default_contexts serefpolicy-3.0.2/config/appconfig-targeted-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-targeted-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/guest_u_default_contexts	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/guest_u_default_contexts	2007-07-03 14:38:10.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
@@ -48,20 +48,20 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mc
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/initrc_context serefpolicy-3.0.2/config/appconfig-targeted-mcs/initrc_context
 --- nsaserefpolicy/config/appconfig-targeted-mcs/initrc_context	2007-05-25 09:09:09.000000000 -0400
-+++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/initrc_context	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/initrc_context	2007-07-03 14:38:10.000000000 -0400
 @@ -1 +1 @@
 -user_u:system_r:initrc_t:s0
 +system_u:system_r:initrc_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/seusers serefpolicy-3.0.2/config/appconfig-targeted-mcs/seusers
 --- nsaserefpolicy/config/appconfig-targeted-mcs/seusers	2007-05-31 15:35:39.000000000 -0400
-+++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/seusers	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/seusers	2007-07-03 14:38:10.000000000 -0400
 @@ -1,2 +1,2 @@
  root:root:s0-mcs_systemhigh
 -__default__:user_u:s0
 +__default__:system_u:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/staff_u_default_contexts serefpolicy-3.0.2/config/appconfig-targeted-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-targeted-mcs/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/staff_u_default_contexts	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/staff_u_default_contexts	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,9 @@
 +system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 +system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -74,7 +74,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mc
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/user_u_default_contexts serefpolicy-3.0.2/config/appconfig-targeted-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-targeted-mcs/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/user_u_default_contexts	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/config/appconfig-targeted-mcs/user_u_default_contexts	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
 +system_r:remote_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
@@ -85,7 +85,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mc
 +user_r:user_sudo_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.0.2/Makefile
 --- nsaserefpolicy/Makefile	2007-05-29 13:53:56.000000000 -0400
-+++ serefpolicy-3.0.2/Makefile	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/Makefile	2007-07-03 14:38:10.000000000 -0400
 @@ -158,8 +158,18 @@
  headerdir = $(modpkgdir)/include
  docsdir = $(prefix)/share/doc/$(PKGNAME)
@@ -117,7 +117,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.0.2/M
  	CHECKMODULE += -M
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.0.2/man/man8/ftpd_selinux.8
 --- nsaserefpolicy/man/man8/ftpd_selinux.8	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.2/man/man8/ftpd_selinux.8	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/man/man8/ftpd_selinux.8	2007-07-03 14:38:10.000000000 -0400
 @@ -12,7 +12,7 @@
  .TP
  chcon -R -t public_content_t /var/ftp
@@ -129,7 +129,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 sere
  .TP
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.0.2/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/flask/access_vectors	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/policy/flask/access_vectors	2007-07-03 14:38:10.000000000 -0400
 @@ -598,6 +598,8 @@
  	shmempwd
  	shmemgrp
@@ -150,7 +150,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors 
  class key
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.0.2/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/global_tunables	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/policy/global_tunables	2007-07-03 14:38:10.000000000 -0400
 @@ -133,3 +133,10 @@
  ## </desc>
  gen_tunable(write_untrusted_content,false)
@@ -164,7 +164,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables seref
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.0.2/policy/mls
 --- nsaserefpolicy/policy/mls	2007-07-03 07:06:36.000000000 -0400
-+++ serefpolicy-3.0.2/policy/mls	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/policy/mls	2007-07-03 14:38:10.000000000 -0400
 @@ -89,12 +89,14 @@
  mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
  	(( l1 eq l2 ) or
@@ -249,7 +249,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.0.2
  mlsconstrain association { polmatch }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-3.0.2/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/acct.te	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/acct.te	2007-07-03 14:38:10.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -260,7 +260,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te
  logging_log_file(acct_data_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-3.0.2/policy/modules/admin/alsa.fc
 --- nsaserefpolicy/policy/modules/admin/alsa.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/alsa.fc	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/alsa.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -1,4 +1,7 @@
  
  /etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
@@ -271,7 +271,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc
 +/sbin/alsactl 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.0.2/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/alsa.te	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/alsa.te	2007-07-03 14:38:10.000000000 -0400
 @@ -20,20 +20,24 @@
  # Local policy
  #
@@ -317,7 +317,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.0.2/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/anaconda.te	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/anaconda.te	2007-07-03 14:38:10.000000000 -0400
 @@ -37,10 +37,6 @@
  userdom_generic_user_home_dir_filetrans_generic_user_home_content(anaconda_t,{ dir file lnk_file fifo_file sock_file })
  
@@ -331,7 +331,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anacond
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-3.0.2/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/bootloader.te	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/bootloader.te	2007-07-03 14:38:10.000000000 -0400
 @@ -182,6 +182,7 @@
  
  optional_policy(`
@@ -342,7 +342,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloa
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.0.2/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/consoletype.te	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/consoletype.te	2007-07-03 14:38:10.000000000 -0400
 @@ -8,12 +8,21 @@
  
  type consoletype_t;
@@ -389,7 +389,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/console
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-3.0.2/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/kudzu.te	2007-07-03 13:08:19.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/kudzu.te	2007-07-03 14:38:10.000000000 -0400
 @@ -21,8 +21,8 @@
  # Local policy
  #
@@ -428,7 +428,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.t
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.0.2/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/logrotate.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/logrotate.te	2007-07-03 14:38:10.000000000 -0400
 @@ -75,11 +75,13 @@
  mls_file_read_up(logrotate_t)
  mls_file_write_down(logrotate_t)
@@ -469,7 +469,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrota
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.0.2/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/logwatch.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/logwatch.te	2007-07-03 14:38:10.000000000 -0400
 @@ -30,7 +30,6 @@
  allow logwatch_t self:process signal;
  allow logwatch_t self:fifo_file rw_file_perms;
@@ -522,7 +522,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatc
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.0.2/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2007-07-03 07:06:36.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/netutils.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/netutils.te	2007-07-03 14:38:10.000000000 -0400
 @@ -29,6 +29,7 @@
  type traceroute_t;
  type traceroute_exec_t;
@@ -533,7 +533,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutil
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.0.2/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/prelink.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/prelink.te	2007-07-06 11:23:32.000000000 -0400
 @@ -26,7 +26,7 @@
  # Local policy
  #
@@ -543,7 +543,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink
  allow prelink_t self:process { execheap execmem execstack signal };
  allow prelink_t self:fifo_file rw_fifo_file_perms;
  
-@@ -65,6 +65,8 @@
+@@ -49,8 +49,7 @@
+ allow prelink_t prelink_object:file { manage_file_perms execute relabelto relabelfrom };
+ 
+ kernel_read_system_state(prelink_t)
+-kernel_dontaudit_search_kernel_sysctl(prelink_t)
+-kernel_dontaudit_search_sysctl(prelink_t)
++kernel_read_kernel_sysctls(prelink_t)
+ 
+ corecmd_manage_all_executables(prelink_t)
+ corecmd_relabel_all_executables(prelink_t)
+@@ -65,6 +64,8 @@
  files_read_etc_files(prelink_t)
  files_read_etc_runtime_files(prelink_t)
  files_dontaudit_read_all_symlinks(prelink_t)
@@ -552,7 +562,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink
  
  fs_getattr_xattr_fs(prelink_t)
  
-@@ -84,6 +86,13 @@
+@@ -84,6 +85,13 @@
  
  miscfiles_read_localization(prelink_t)
  
@@ -568,7 +578,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.fc serefpolicy-3.0.2/policy/modules/admin/readahead.fc
 --- nsaserefpolicy/policy/modules/admin/readahead.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/readahead.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/readahead.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -2,3 +2,4 @@
  # /usr
  #
@@ -576,7 +586,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahe
 +/etc/readahead.d(/.*)?		gen_context(system_u:object_r:readahead_etc_rw_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.if serefpolicy-3.0.2/policy/modules/admin/readahead.if
 --- nsaserefpolicy/policy/modules/admin/readahead.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/readahead.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/readahead.if	2007-07-03 14:38:10.000000000 -0400
 @@ -1 +1,20 @@
  ## <summary>Readahead, read files into page cache for improved performance</summary>
 +
@@ -600,7 +610,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahe
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.0.2/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/readahead.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/readahead.te	2007-07-03 14:38:10.000000000 -0400
 @@ -13,14 +13,20 @@
  type readahead_var_run_t;
  files_pid_file(readahead_var_run_t)
@@ -642,7 +652,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahe
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.0.2/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/rpm.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/rpm.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -21,6 +21,9 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -655,7 +665,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc 
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.0.2/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/rpm.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/rpm.if	2007-07-03 14:38:10.000000000 -0400
 @@ -210,6 +210,24 @@
  
  ########################################
@@ -780,7 +790,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if 
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.0.2/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2007-07-03 07:06:36.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/rpm.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/rpm.te	2007-07-03 14:38:10.000000000 -0400
 @@ -9,6 +9,8 @@
  type rpm_t;
  type rpm_exec_t;
@@ -792,7 +802,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te 
  domain_system_change_exemption(rpm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.0.2/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/sudo.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/sudo.if	2007-07-03 14:38:10.000000000 -0400
 @@ -69,7 +69,6 @@
  	allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_sudo_t self:unix_dgram_socket sendto;
@@ -841,7 +851,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.0.2/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/su.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/su.if	2007-07-03 14:38:10.000000000 -0400
 @@ -41,12 +41,11 @@
  
  	allow $2 $1_su_t:process signal;
@@ -936,7 +946,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if s
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.if serefpolicy-3.0.2/policy/modules/admin/tmpreaper.if
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/tmpreaper.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/tmpreaper.if	2007-07-03 14:38:10.000000000 -0400
 @@ -2,6 +2,25 @@
  
  ########################################
@@ -965,7 +975,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreap
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-3.0.2/policy/modules/admin/usermanage.if
 --- nsaserefpolicy/policy/modules/admin/usermanage.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/usermanage.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/usermanage.if	2007-07-03 14:38:10.000000000 -0400
 @@ -278,5 +278,5 @@
  		type crack_db_t;
  	')
@@ -975,7 +985,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/userman
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.0.2/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/usermanage.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/usermanage.te	2007-07-03 14:38:10.000000000 -0400
 @@ -99,6 +99,7 @@
  dev_read_urand(chfn_t)
  
@@ -1119,7 +1129,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/userman
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.0.2/policy/modules/admin/vbetool.te
 --- nsaserefpolicy/policy/modules/admin/vbetool.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/admin/vbetool.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/admin/vbetool.te	2007-07-03 14:38:10.000000000 -0400
 @@ -32,4 +32,5 @@
  
  optional_policy(`
@@ -1128,7 +1138,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.if serefpolicy-3.0.2/policy/modules/apps/ada.if
 --- nsaserefpolicy/policy/modules/apps/ada.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/ada.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/ada.if	2007-07-03 14:38:10.000000000 -0400
 @@ -18,3 +18,34 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, ada_exec_t, ada_t)
@@ -1166,7 +1176,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.if s
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.fc serefpolicy-3.0.2/policy/modules/apps/games.fc
 --- nsaserefpolicy/policy/modules/apps/games.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/games.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/games.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -1,22 +1,16 @@
  #
  # /usr
@@ -1195,7 +1205,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.fc
  /usr/bin/gataxx		--	gen_context(system_u:object_r:games_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.0.2/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/gnome.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/gnome.if	2007-07-03 14:38:10.000000000 -0400
 @@ -35,6 +35,7 @@
  template(`gnome_per_role_template',`
  	gen_require(`
@@ -1257,7 +1267,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if
  ##	This is a templated interface, and should only
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.2/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-07-03 07:05:43.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/java.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/java.if	2007-07-03 14:38:10.000000000 -0400
 @@ -221,3 +221,66 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, java_exec_t, java_t)
@@ -1327,7 +1337,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if 
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-3.0.2/policy/modules/apps/loadkeys.te
 --- nsaserefpolicy/policy/modules/apps/loadkeys.te	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/loadkeys.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/loadkeys.te	2007-07-03 14:38:10.000000000 -0400
 @@ -40,3 +40,8 @@
  locallogin_use_fds(loadkeys_t)
  
@@ -1339,7 +1349,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.0.2/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/mono.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/mono.if	2007-07-03 14:38:10.000000000 -0400
 @@ -18,3 +18,52 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, mono_exec_t, mono_t)
@@ -1395,7 +1405,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if 
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.0.2/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2007-07-03 07:05:43.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/mozilla.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/mozilla.if	2007-07-03 14:38:10.000000000 -0400
 @@ -53,6 +53,14 @@
  	type $1_mozilla_tmpfs_t;
  	files_tmpfs_file($1_mozilla_tmpfs_t)
@@ -1675,7 +1685,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.0.2/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2007-07-03 07:05:43.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/mozilla.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/mozilla.te	2007-07-03 14:38:10.000000000 -0400
 @@ -6,13 +6,6 @@
  # Declarations
  #
@@ -1692,7 +1702,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-3.0.2/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2007-06-15 14:54:31.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/slocate.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/slocate.te	2007-07-03 14:38:10.000000000 -0400
 @@ -29,6 +29,8 @@
  manage_dirs_pattern(locate_t,locate_var_lib_t,locate_var_lib_t)
  manage_files_pattern(locate_t,locate_var_lib_t,locate_var_lib_t)
@@ -1704,7 +1714,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/userhelper.if serefpolicy-3.0.2/policy/modules/apps/userhelper.if
 --- nsaserefpolicy/policy/modules/apps/userhelper.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/userhelper.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/userhelper.if	2007-07-03 14:38:10.000000000 -0400
 @@ -131,6 +131,7 @@
  	term_use_all_user_ptys($1_userhelper_t)
  
@@ -1715,7 +1725,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/userhelp
  	auth_search_pam_console_data($1_userhelper_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.0.2/policy/modules/apps/vmware.fc
 --- nsaserefpolicy/policy/modules/apps/vmware.fc	2007-07-03 07:05:43.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/vmware.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/vmware.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -23,6 +23,7 @@
  /usr/bin/vmware-smbd		--	gen_context(system_u:object_r:vmware_host_exec_t,s0)
  /usr/bin/vmware-smbpasswd	--	gen_context(system_u:object_r:vmware_host_exec_t,s0)
@@ -1726,7 +1736,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.f
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.0.2/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2007-07-03 07:05:43.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/vmware.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/vmware.te	2007-07-03 14:38:10.000000000 -0400
 @@ -29,7 +29,7 @@
  
  allow vmware_host_t self:capability { setuid net_raw };
@@ -1747,7 +1757,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.t
  corenet_sendrecv_all_server_packets(vmware_host_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.0.2/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/apps/wine.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/apps/wine.if	2007-07-03 14:38:10.000000000 -0400
 @@ -18,3 +18,34 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, wine_exec_t, wine_t)
@@ -1785,7 +1795,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if 
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.2/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/corecommands.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/corecommands.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -1808,7 +1818,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
  /usr/share/system-config-securitylevel/system-config-securitylevel\.py -- gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.0.2/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/corenetwork.te.in	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/corenetwork.te.in	2007-07-03 14:38:10.000000000 -0400
 @@ -55,6 +55,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -1869,7 +1879,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corene
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.0.2/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-06-15 14:54:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/devices.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/devices.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -127,3 +127,7 @@
  /var/named/chroot/dev/random -c	gen_context(system_u:object_r:random_device_t,s0)
  /var/named/chroot/dev/zero -c	gen_context(system_u:object_r:zero_device_t,s0)
@@ -1880,7 +1890,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.0.2/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2007-06-15 14:54:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/devices.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/devices.if	2007-07-03 14:38:10.000000000 -0400
 @@ -2803,6 +2803,24 @@
  
  ########################################
@@ -1908,7 +1918,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.0.2/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/domain.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/domain.if	2007-07-03 14:38:10.000000000 -0400
 @@ -45,6 +45,11 @@
  	# start with basic domain
  	domain_base_type($1)
@@ -1952,7 +1962,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.0.2/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/domain.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/domain.te	2007-07-03 14:38:10.000000000 -0400
 @@ -6,6 +6,29 @@
  # Declarations
  #
@@ -2011,7 +2021,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.2/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/files.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/files.if	2007-07-03 14:38:10.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2190,7 +2200,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.0.2/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/kernel.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/kernel.if	2007-07-03 14:38:10.000000000 -0400
 @@ -1848,6 +1848,27 @@
  
  ########################################
@@ -2221,7 +2231,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.0.2/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/kernel.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/kernel.te	2007-07-03 14:38:10.000000000 -0400
 @@ -275,6 +275,7 @@
  
  optional_policy(`
@@ -2232,7 +2242,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-3.0.2/policy/modules/kernel/mls.if
 --- nsaserefpolicy/policy/modules/kernel/mls.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/mls.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/mls.if	2007-07-03 14:38:10.000000000 -0400
 @@ -154,6 +154,26 @@
  ########################################
  ## <summary>
@@ -2262,7 +2272,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-3.0.2/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/mls.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/mls.te	2007-07-03 14:38:10.000000000 -0400
 @@ -18,6 +18,7 @@
  attribute mlsnetreadtoclr;
  attribute mlsnetwrite;
@@ -2282,7 +2292,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te
  attribute privrangetrans;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.0.2/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/selinux.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/selinux.if	2007-07-03 14:38:10.000000000 -0400
 @@ -32,20 +32,21 @@
  
  ########################################
@@ -2351,9 +2361,20 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinu
  	allow $1 security_t:dir list_dir_perms;
  	allow $1 security_t:file { getattr read };
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.0.2/policy/modules/kernel/storage.fc
+--- nsaserefpolicy/policy/modules/kernel/storage.fc	2007-06-15 14:54:30.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/storage.fc	2007-07-06 10:28:48.000000000 -0400
+@@ -23,6 +23,7 @@
+ /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ /dev/lvm		-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ /dev/mcdx?		-b	gen_context(system_u:object_r:removable_device_t,s0)
++/dev/megadev.*		-c	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/mmcblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.0.2/policy/modules/kernel/storage.if
 --- nsaserefpolicy/policy/modules/kernel/storage.if	2007-06-15 14:54:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/storage.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/storage.if	2007-07-03 14:38:10.000000000 -0400
 @@ -100,6 +100,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -2372,7 +2393,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storag
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-3.0.2/policy/modules/kernel/terminal.te
 --- nsaserefpolicy/policy/modules/kernel/terminal.te	2007-06-15 14:54:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/kernel/terminal.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/kernel/terminal.te	2007-07-03 14:38:10.000000000 -0400
 @@ -28,9 +28,15 @@
  type devpts_t;
  files_mountpoint(devpts_t)
@@ -2402,7 +2423,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/termin
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.0.2/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2007-07-03 07:06:26.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/amavis.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/amavis.te	2007-07-03 14:38:10.000000000 -0400
 @@ -166,6 +166,7 @@
  
  optional_policy(`
@@ -2413,7 +2434,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amav
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.0.2/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/apache.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/apache.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -16,7 +16,6 @@
  
  /usr/lib/apache-ssl/.+		--	gen_context(system_u:object_r:httpd_exec_t,s0)
@@ -2436,7 +2457,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.0.2/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/apache.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/apache.if	2007-07-06 13:03:21.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -2574,7 +2595,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  ')
  
  ########################################
-@@ -1002,3 +978,140 @@
+@@ -1002,3 +978,158 @@
  
  	allow $1 httpd_sys_script_t:dir search_dir_perms;
  ')
@@ -2715,9 +2736,27 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
 +	allow $1 httpd_bugzilla_content_t:dir search_dir_perms;
 +')
 +
++########################################
++## <summary>
++##	Do not audit attempts to read and write Apache
++##	bugzill script unix domain stream sockets.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`apache_dontaudit_rw_bugzilla_script_stream_sockets',`
++	gen_require(`
++		type httpd_bugzilla_script_t;
++	')
++
++	dontaudit $1 httpd_bugzilla_script_t:unix_stream_socket { read write };
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.0.2/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/apache.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/apache.te	2007-07-03 14:38:10.000000000 -0400
 @@ -47,6 +47,13 @@
  ## Allow http daemon to tcp connect
  ## </p>
@@ -3049,7 +3088,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-3.0.2/policy/modules/services/apcupsd.fc
 --- nsaserefpolicy/policy/modules/services/apcupsd.fc	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/apcupsd.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/apcupsd.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -3,3 +3,8 @@
  /var/log/apcupsd\.events.*	--	gen_context(system_u:object_r:apcupsd_log_t,s0)
  
@@ -3061,7 +3100,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
 +/var/www/apcupsd/upsstats.cgi		--	gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-3.0.2/policy/modules/services/apcupsd.if
 --- nsaserefpolicy/policy/modules/services/apcupsd.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/apcupsd.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/apcupsd.if	2007-07-03 14:38:10.000000000 -0400
 @@ -79,3 +79,25 @@
  	allow $1 apcupsd_log_t:dir list_dir_perms;
  	allow $1 apcupsd_log_t:file { getattr append };
@@ -3090,7 +3129,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-3.0.2/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/apcupsd.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/apcupsd.te	2007-07-06 12:56:13.000000000 -0400
 @@ -16,6 +16,9 @@
  type apcupsd_log_t;
  logging_log_file(apcupsd_log_t)
@@ -3105,7 +3144,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
  # apcupsd local policy
  #
  
-+allow apcupsd_t self:capability sys_tty_config;
++allow apcupsd_t self:capability { dac_override setgid sys_tty_config };
  allow apcupsd_t self:process signal;
  allow apcupsd_t self:fifo_file rw_file_perms;
  allow apcupsd_t self:unix_stream_socket create_stream_socket_perms;
@@ -3189,7 +3228,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.0.2/policy/modules/services/audioentropy.te
 --- nsaserefpolicy/policy/modules/services/audioentropy.te	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/audioentropy.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/audioentropy.te	2007-07-03 14:38:10.000000000 -0400
 @@ -18,7 +18,7 @@
  # Local policy
  #
@@ -3210,7 +3249,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audi
  fs_getattr_all_fs(entropyd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.0.2/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/automount.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/automount.te	2007-07-03 14:38:10.000000000 -0400
 @@ -69,6 +69,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -3240,7 +3279,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/auto
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.0.2/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/avahi.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/avahi.te	2007-07-03 14:38:10.000000000 -0400
 @@ -57,6 +57,7 @@
  
  fs_getattr_all_fs(avahi_t)
@@ -3251,7 +3290,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avah
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.0.2/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/bind.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/bind.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -45,4 +45,6 @@
  /var/named/chroot/var/named/slaves(/.*)? gen_context(system_u:object_r:named_cache_t,s0)
  /var/named/chroot/var/named/data(/.*)? gen_context(system_u:object_r:named_cache_t,s0)
@@ -3261,7 +3300,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.0.2/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2007-07-03 07:06:26.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/bind.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/bind.te	2007-07-03 14:38:10.000000000 -0400
 @@ -119,6 +119,11 @@
  corenet_sendrecv_dns_client_packets(named_t)
  corenet_sendrecv_rndc_server_packets(named_t)
@@ -3284,7 +3323,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind
  fs_getattr_xattr_fs(ndc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.0.2/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/bluetooth.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/bluetooth.te	2007-07-03 14:38:10.000000000 -0400
 @@ -134,6 +134,7 @@
  	dbus_system_bus_client_template(bluetooth,bluetooth_t)
  	dbus_connect_system_bus(bluetooth_t)
@@ -3346,7 +3385,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/blue
 +')	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.0.2/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/clamav.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/clamav.te	2007-07-03 14:38:10.000000000 -0400
 @@ -208,9 +208,12 @@
  files_tmp_filetrans(clamscan_t,clamscan_tmp_t,{ file dir })
  
@@ -3371,7 +3410,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clam
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.0.2/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/consolekit.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/consolekit.te	2007-07-03 14:38:10.000000000 -0400
 @@ -10,7 +10,6 @@
  type consolekit_exec_t;
  init_daemon_domain(consolekit_t, consolekit_exec_t)
@@ -3432,7 +3471,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cons
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.0.2/policy/modules/services/courier.te
 --- nsaserefpolicy/policy/modules/services/courier.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/courier.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/courier.te	2007-07-03 14:38:10.000000000 -0400
 @@ -58,6 +58,7 @@
  files_getattr_tmp_dirs(courier_authdaemon_t)
  
@@ -3443,7 +3482,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cour
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.0.2/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/cron.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/cron.fc	2007-07-03 14:38:10.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)
@@ -3460,7 +3499,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
 +/var/lib/misc(/.*)?			gen_context(system_u:object_r:system_crond_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.0.2/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/cron.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/cron.if	2007-07-03 14:38:10.000000000 -0400
 @@ -35,6 +35,7 @@
  #
  template(`cron_per_role_template',`
@@ -3584,7 +3623,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
  		# fcron wants an instant update of a crontab change for the administrator
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.0.2/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/cron.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/cron.te	2007-07-03 14:38:10.000000000 -0400
 @@ -50,6 +50,7 @@
  
  type crond_tmp_t;
@@ -3812,7 +3851,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.0.2/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/cups.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/cups.fc	2007-07-06 10:56:38.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)
@@ -3821,9 +3860,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
  /etc/cups/certs		-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  
+@@ -52,3 +53,4 @@
+ /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
+ 
+ /var/spool/cups(/.*)?		gen_context(system_u:object_r:print_spool_t,mls_systemhigh)
++/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,mls_systemhigh)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.2/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/cups.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/cups.te	2007-07-03 14:38:10.000000000 -0400
 @@ -81,12 +81,11 @@
  # /usr/lib/cups/backend/serial needs sys_admin(?!)
  allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config };
@@ -3959,7 +4003,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
  fs_search_auto_mountpoints(hplip_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.0.2/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/cvs.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/cvs.te	2007-07-03 14:38:10.000000000 -0400
 @@ -16,6 +16,7 @@
  type cvs_t;
  type cvs_exec_t;
@@ -3986,7 +4030,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.2/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/dbus.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/dbus.if	2007-07-03 14:38:10.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -4101,7 +4145,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.0.2/policy/modules/services/dhcp.te
 --- nsaserefpolicy/policy/modules/services/dhcp.te	2007-07-03 07:06:26.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/dhcp.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/dhcp.te	2007-07-03 14:38:10.000000000 -0400
 @@ -114,6 +114,8 @@
  	dbus_system_bus_client_template(dhcpd,dhcpd_t)
  	dbus_connect_system_bus(dhcpd_t)
@@ -4113,7 +4157,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.0.2/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/dovecot.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/dovecot.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -17,10 +17,12 @@
  
  ifdef(`distro_debian', `
@@ -4129,7 +4173,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-3.0.2/policy/modules/services/dovecot.if
 --- nsaserefpolicy/policy/modules/services/dovecot.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/dovecot.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/dovecot.if	2007-07-03 14:38:10.000000000 -0400
 @@ -18,3 +18,43 @@
  	manage_files_pattern($1,dovecot_spool_t,dovecot_spool_t)
  	manage_lnk_files_pattern($1,dovecot_spool_t,dovecot_spool_t)
@@ -4176,7 +4220,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.0.2/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/dovecot.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/dovecot.te	2007-07-03 14:38:10.000000000 -0400
 @@ -15,6 +15,12 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -4318,7 +4362,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.0.2/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-07-03 07:06:26.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/ftp.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/ftp.te	2007-07-03 14:38:10.000000000 -0400
 @@ -88,6 +88,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -4362,7 +4406,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.
  tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.0.2/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/hal.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/hal.fc	2007-07-06 09:27:30.000000000 -0400
 @@ -8,9 +8,14 @@
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
  
@@ -4380,7 +4424,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.0.2/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/hal.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/hal.if	2007-07-03 14:38:10.000000000 -0400
 @@ -208,3 +208,98 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -4482,7 +4526,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.0.2/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-07-03 07:06:26.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/hal.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/hal.te	2007-07-03 14:38:10.000000000 -0400
 @@ -22,6 +22,12 @@
  type hald_log_t;
  files_type(hald_log_t)
@@ -4588,7 +4632,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
 +dev_rw_input_dev(hald_keymap_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.0.2/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-07-03 07:06:26.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/inetd.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/inetd.te	2007-07-03 14:38:10.000000000 -0400
 @@ -80,16 +80,21 @@
  corenet_udp_bind_comsat_port(inetd_t)
  corenet_tcp_bind_dbskkd_port(inetd_t)
@@ -4644,7 +4688,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inet
  manage_dirs_pattern(inetd_child_t,inetd_child_tmp_t,inetd_child_tmp_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.2/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/kerberos.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/kerberos.if	2007-07-03 14:38:10.000000000 -0400
 @@ -33,44 +33,10 @@
  #
  interface(`kerberos_use',`
@@ -4694,7 +4738,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.0.2/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/kerberos.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/kerberos.te	2007-07-03 14:38:10.000000000 -0400
 @@ -5,6 +5,7 @@
  #
  # Declarations
@@ -4777,7 +4821,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-3.0.2/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/lpd.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/lpd.if	2007-07-03 14:38:10.000000000 -0400
 @@ -395,3 +395,22 @@
  
  	domtrans_pattern($2, lpr_exec_t, $1_lpr_t)
@@ -4803,7 +4847,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.0.2/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/mailman.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/mailman.te	2007-07-03 14:38:10.000000000 -0400
 @@ -96,6 +96,7 @@
  kernel_read_proc_symlinks(mailman_queue_t)
  
@@ -4814,13 +4858,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.fc serefpolicy-3.0.2/policy/modules/services/mailscanner.fc
 --- nsaserefpolicy/policy/modules/services/mailscanner.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/services/mailscanner.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/mailscanner.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,2 @@
 +/var/spool/MailScanner(/.*)?	gen_context(system_u:object_r:mailscanner_spool_t,s0)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.if serefpolicy-3.0.2/policy/modules/services/mailscanner.if
 --- nsaserefpolicy/policy/modules/services/mailscanner.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/services/mailscanner.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/mailscanner.if	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,59 @@
 +## <summary>Anti-Virus and Anti-Spam Filter</summary>
 +
@@ -4883,7 +4927,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.te serefpolicy-3.0.2/policy/modules/services/mailscanner.te
 --- nsaserefpolicy/policy/modules/services/mailscanner.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/services/mailscanner.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/mailscanner.te	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,5 @@
 +
 +policy_module(mailscanner,1.0.0)
@@ -4892,7 +4936,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
 +files_type(mailscanner_spool_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.0.2/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/mta.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/mta.if	2007-07-03 14:38:10.000000000 -0400
 @@ -393,6 +393,7 @@
  	allow $1 mail_spool_t:dir list_dir_perms;
  	create_files_pattern($1,mail_spool_t,mail_spool_t)
@@ -4903,7 +4947,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.0.2/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/mta.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/mta.te	2007-07-06 13:03:48.000000000 -0400
 @@ -27,6 +27,7 @@
  
  type sendmail_exec_t;
@@ -4912,7 +4956,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  
  mta_base_mail_template(system)
  role system_r types system_mail_t;
-@@ -52,9 +53,37 @@
+@@ -52,15 +53,44 @@
  userdom_use_sysadm_terms(system_mail_t)
  userdom_dontaudit_search_sysadm_home_dirs(system_mail_t)
  
@@ -4950,9 +4994,16 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  
  	# apache should set close-on-exec
  	apache_dontaudit_append_log(system_mail_t)
+ 	apache_dontaudit_rw_stream_sockets(system_mail_t)
+ 	apache_dontaudit_rw_tcp_sockets(system_mail_t)
+ 	apache_dontaudit_rw_sys_script_stream_sockets(system_mail_t)
++	apache_dontaudit_rw_bugzilla_script_stream_sockets(system_mail_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.0.2/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/networkmanager.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/networkmanager.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -1,5 +1,6 @@
  
  /usr/(s)?bin/NetworkManager	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
@@ -4962,7 +5013,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
  /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.2/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/networkmanager.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/networkmanager.te	2007-07-03 14:38:10.000000000 -0400
 @@ -41,6 +41,8 @@
  kernel_read_kernel_sysctls(NetworkManager_t)
  kernel_load_module(NetworkManager_t)
@@ -5002,7 +5053,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.0.2/policy/modules/services/nis.fc
 --- nsaserefpolicy/policy/modules/services/nis.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/nis.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/nis.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -4,6 +4,7 @@
  /sbin/ypbind		--	gen_context(system_u:object_r:ypbind_exec_t,s0)
  
@@ -5013,7 +5064,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
  /usr/sbin/rpc\.ypxfrd	--	gen_context(system_u:object_r:ypxfr_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.0.2/policy/modules/services/nis.if
 --- nsaserefpolicy/policy/modules/services/nis.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/nis.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/nis.if	2007-07-03 14:38:10.000000000 -0400
 @@ -49,8 +49,8 @@
  	corenet_udp_bind_all_nodes($1)
  	corenet_tcp_bind_generic_port($1)
@@ -5027,7 +5078,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
  	corenet_tcp_connect_portmap_port($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.0.2/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/nis.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/nis.te	2007-07-06 11:32:10.000000000 -0400
 @@ -113,6 +113,14 @@
  userdom_dontaudit_use_unpriv_user_fds(ypbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(ypbind_t)
@@ -5082,7 +5133,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
  corenet_tcp_connect_all_ports(ypxfr_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.0.2/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2007-07-03 07:06:26.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/nscd.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/nscd.te	2007-07-03 14:38:10.000000000 -0400
 @@ -28,14 +28,14 @@
  # Local policy
  #
@@ -5133,7 +5184,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.0.2/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/ntp.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/ntp.te	2007-07-03 14:38:10.000000000 -0400
 @@ -126,6 +126,10 @@
  ')
  
@@ -5147,7 +5198,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.if serefpolicy-3.0.2/policy/modules/services/openvpn.if
 --- nsaserefpolicy/policy/modules/services/openvpn.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/openvpn.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/openvpn.if	2007-07-03 14:38:10.000000000 -0400
 @@ -22,3 +22,71 @@
  	read_files_pattern($1,openvpn_etc_t,openvpn_etc_t)
  	read_lnk_files_pattern($1,openvpn_etc_t,openvpn_etc_t)
@@ -5222,7 +5273,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.0.2/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/openvpn.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/openvpn.te	2007-07-03 14:38:10.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -5282,7 +5333,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-3.0.2/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/pegasus.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/pegasus.if	2007-07-03 14:38:10.000000000 -0400
 @@ -1 +1,19 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -5305,7 +5356,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pega
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.0.2/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/pegasus.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/pegasus.te	2007-07-03 14:38:10.000000000 -0400
 @@ -95,13 +95,13 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -5347,7 +5398,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pega
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portslave.te serefpolicy-3.0.2/policy/modules/services/portslave.te
 --- nsaserefpolicy/policy/modules/services/portslave.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/portslave.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/portslave.te	2007-07-03 14:38:10.000000000 -0400
 @@ -85,6 +85,7 @@
  
  auth_rw_login_records(portslave_t)
@@ -5358,7 +5409,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/port
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.0.2/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/postfix.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/postfix.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -14,6 +14,7 @@
  /usr/libexec/postfix/smtpd --	gen_context(system_u:object_r:postfix_smtpd_exec_t,s0)
  /usr/libexec/postfix/bounce --	gen_context(system_u:object_r:postfix_bounce_exec_t,s0)
@@ -5369,7 +5420,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  /usr/lib/postfix/cleanup --	gen_context(system_u:object_r:postfix_cleanup_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.0.2/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/postfix.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/postfix.if	2007-07-03 14:38:10.000000000 -0400
 @@ -118,6 +118,8 @@
  	allow postfix_$1_t self:udp_socket create_socket_perms;
  
@@ -5485,7 +5536,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.0.2/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/postfix.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/postfix.te	2007-07-06 11:46:07.000000000 -0400
 @@ -84,6 +84,12 @@
  type postfix_var_run_t;
  files_pid_file(postfix_var_run_t)
@@ -5499,20 +5550,19 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  ########################################
  #
  # Postfix master process local policy
-@@ -170,6 +176,12 @@
+@@ -169,6 +175,11 @@
+ 
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
- 
 +term_dontaudit_search_ptys(postfix_master_t)
 +
 +optional_policy(`
 +	auth_use_nsswitch(postfix_master_t)
 +')
-+
+ 
  optional_policy(`
  	cyrus_stream_connect(postfix_master_t)
- ')
-@@ -180,6 +192,10 @@
+@@ -180,9 +191,17 @@
  ')
  
  optional_policy(`
@@ -5523,7 +5573,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  	nis_use_ypbind(postfix_master_t)
  ')
  
-@@ -378,7 +394,7 @@
++optional_policy(`
++	sendmail_signal(postfix_master_t)
++')
++
+ ###########################################################
+ #
+ # Partially converted rules.  THESE ARE ONLY TEMPORARY
+@@ -378,7 +397,7 @@
  # Postfix pipe local policy
  #
  
@@ -5532,7 +5589,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  
  write_sock_files_pattern(postfix_pipe_t,postfix_private_t,postfix_private_t)
  
-@@ -387,6 +403,10 @@
+@@ -387,6 +406,10 @@
  rw_files_pattern(postfix_pipe_t,postfix_spool_t,postfix_spool_t)
  
  optional_policy(`
@@ -5543,7 +5600,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  	procmail_domtrans(postfix_pipe_t)
  ')
  
-@@ -427,6 +447,11 @@
+@@ -427,6 +450,11 @@
  	cron_system_entry(postfix_postdrop_t, postfix_postdrop_exec_t)
  ')
  
@@ -5555,7 +5612,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  optional_policy(`
  	ppp_use_fds(postfix_postqueue_t)
  	ppp_sigchld(postfix_postqueue_t)
-@@ -506,8 +531,6 @@
+@@ -506,8 +534,6 @@
  # Postfix smtp delivery local policy
  #
  
@@ -5564,7 +5621,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  # connect to master process
  stream_connect_pattern(postfix_smtp_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
  
-@@ -515,6 +538,8 @@
+@@ -515,6 +541,8 @@
  
  allow postfix_smtp_t postfix_spool_t:file rw_file_perms;
  
@@ -5573,7 +5630,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  optional_policy(`
  	cyrus_stream_connect(postfix_smtp_t)
  ')
-@@ -539,9 +564,45 @@
+@@ -539,9 +567,45 @@
  mta_read_aliases(postfix_smtpd_t)
  
  optional_policy(`
@@ -5621,7 +5678,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
 +mta_manage_spool(postfix_virtual_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.0.2/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/procmail.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/procmail.te	2007-07-03 14:38:10.000000000 -0400
 @@ -10,6 +10,7 @@
  type procmail_exec_t;
  domain_type(procmail_t)
@@ -5659,7 +5716,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/proc
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.0.2/policy/modules/services/pyzor.if
 --- nsaserefpolicy/policy/modules/services/pyzor.if	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/pyzor.if	2007-07-03 14:03:52.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/pyzor.if	2007-07-03 14:38:10.000000000 -0400
 @@ -25,16 +25,16 @@
  #
  template(`pyzor_per_role_template',`
@@ -5684,7 +5741,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzo
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-3.0.2/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/pyzor.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/pyzor.te	2007-07-03 14:38:10.000000000 -0400
 @@ -71,6 +71,11 @@
  
  userdom_dontaudit_search_sysadm_home_dirs(pyzor_t)
@@ -5710,7 +5767,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzo
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-3.0.2/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/radius.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/radius.te	2007-07-03 14:38:10.000000000 -0400
 @@ -82,6 +82,7 @@
  
  auth_read_shadow(radiusd_t)
@@ -5721,7 +5778,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radi
  corecmd_exec_shell(radiusd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-3.0.2/policy/modules/services/rhgb.te
 --- nsaserefpolicy/policy/modules/services/rhgb.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/rhgb.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/rhgb.te	2007-07-03 14:38:10.000000000 -0400
 @@ -109,6 +109,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(rhgb_t)
@@ -5732,7 +5789,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb
  xserver_kill_xdm_xserver(rhgb_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.0.2/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/ricci.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/ricci.te	2007-07-03 14:38:10.000000000 -0400
 @@ -138,6 +138,7 @@
  files_create_boot_flag(ricci_t)
  
@@ -5762,7 +5819,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricc
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.2/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/rlogin.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/rlogin.te	2007-07-03 14:38:10.000000000 -0400
 @@ -65,6 +65,7 @@
  fs_search_auto_mountpoints(rlogind_t)
  
@@ -5773,7 +5830,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlog
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.0.2/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/rpc.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/rpc.if	2007-07-03 14:38:10.000000000 -0400
 @@ -81,6 +81,7 @@
  	corenet_tcp_bind_all_nodes($1_t)
  	corenet_udp_bind_all_nodes($1_t)
@@ -5797,7 +5854,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.
  	fs_search_auto_mountpoints($1_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.0.2/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/rpc.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/rpc.te	2007-07-03 14:38:10.000000000 -0400
 @@ -76,9 +76,11 @@
  miscfiles_read_certs(rpcd_t)
  
@@ -5842,7 +5899,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.
  	userdom_read_unpriv_users_tmp_files(gssd_t) 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.0.2/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/rshd.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/rshd.te	2007-07-03 14:38:10.000000000 -0400
 @@ -45,6 +45,7 @@
  selinux_compute_user_contexts(rshd_t)
  
@@ -5860,7 +5917,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.0.2/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/rsync.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/rsync.te	2007-07-03 14:38:10.000000000 -0400
 @@ -17,6 +17,7 @@
  type rsync_t;
  type rsync_exec_t;
@@ -5871,7 +5928,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsyn
  type rsync_data_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.fc serefpolicy-3.0.2/policy/modules/services/rwho.fc
 --- nsaserefpolicy/policy/modules/services/rwho.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/rwho.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/rwho.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -1,3 +1,4 @@
  /usr/sbin/rwhod		--	gen_context(system_u:object_r:rwho_exec_t,s0)
  
@@ -5879,7 +5936,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho
 +/var/log/rwhod(/.*)?		gen_context(system_u:object_r:rwho_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-3.0.2/policy/modules/services/rwho.if
 --- nsaserefpolicy/policy/modules/services/rwho.if	2007-06-15 14:54:33.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/rwho.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/rwho.if	2007-07-03 14:38:10.000000000 -0400
 @@ -72,6 +72,47 @@
  		type rwho_spool_t;
  	')
@@ -5931,7 +5988,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.te serefpolicy-3.0.2/policy/modules/services/rwho.te
 --- nsaserefpolicy/policy/modules/services/rwho.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/rwho.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/rwho.te	2007-07-03 14:38:10.000000000 -0400
 @@ -10,10 +10,12 @@
  type rwho_exec_t;
  init_daemon_domain(rwho_t, rwho_exec_t)
@@ -5959,7 +6016,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho
  corenet_all_recvfrom_unlabeled(rwho_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.0.2/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/samba.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/samba.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -30,6 +30,8 @@
  /var/lib/samba(/.*)?			gen_context(system_u:object_r:samba_var_t,s0)
  /var/lib/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
@@ -5971,7 +6028,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  /var/run/samba/brlock\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.0.2/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/samba.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/samba.if	2007-07-03 14:38:10.000000000 -0400
 @@ -349,6 +349,7 @@
  	files_search_var($1)
  	files_search_var_lib($1)
@@ -6035,7 +6092,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.0.2/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/samba.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/samba.te	2007-07-06 12:02:56.000000000 -0400
 @@ -190,6 +190,8 @@
  
  miscfiles_read_localization(samba_net_t) 
@@ -6095,7 +6152,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  
  optional_policy(`
  	nis_use_ypbind(smbmount_t)
-@@ -628,6 +641,7 @@
+@@ -622,17 +635,20 @@
+ 
+ dev_read_urand(swat_t)
+ 
++files_list_var_lib(swat_t)
+ files_read_etc_files(swat_t)
+ files_search_home(swat_t)
+ files_read_usr_files(swat_t)
  fs_getattr_xattr_fs(swat_t)
  
  auth_domtrans_chk_passwd(swat_t)
@@ -6103,7 +6167,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  
  libs_use_ld_so(swat_t)
  libs_use_shared_libs(swat_t)
-@@ -672,7 +686,6 @@
+ 
+ logging_send_syslog_msg(swat_t)
++logging_send_audit_msgs(swat_t)
+ logging_search_logs(swat_t)
+ 
+ miscfiles_read_localization(swat_t)
+@@ -672,7 +688,6 @@
  allow winbind_t self:fifo_file { read write };
  allow winbind_t self:unix_dgram_socket create_socket_perms;
  allow winbind_t self:unix_stream_socket create_stream_socket_perms;
@@ -6111,7 +6181,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  allow winbind_t self:tcp_socket create_stream_socket_perms;
  allow winbind_t self:udp_socket create_socket_perms;
  
-@@ -709,6 +722,8 @@
+@@ -709,6 +724,8 @@
  manage_sock_files_pattern(winbind_t,winbind_var_run_t,winbind_var_run_t)
  files_pid_filetrans(winbind_t,winbind_var_run_t,file)
  
@@ -6120,7 +6190,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  kernel_read_kernel_sysctls(winbind_t)
  kernel_list_proc(winbind_t)
  kernel_read_proc_symlinks(winbind_t)
-@@ -733,7 +748,9 @@
+@@ -733,7 +750,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -6130,7 +6200,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -746,9 +763,6 @@
+@@ -746,9 +765,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -6140,7 +6210,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -758,10 +772,6 @@
+@@ -758,10 +774,6 @@
  ')
  
  optional_policy(`
@@ -6153,7 +6223,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.0.2/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/sasl.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/sasl.te	2007-07-03 14:38:10.000000000 -0400
 @@ -64,6 +64,7 @@
  selinux_compute_access_vector(saslauthd_t)
  
@@ -6162,9 +6232,34 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl
  auth_use_nsswitch(saslauthd_t)
  
  domain_use_interactive_fds(saslauthd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.0.2/policy/modules/services/sendmail.if
+--- nsaserefpolicy/policy/modules/services/sendmail.if	2007-05-30 11:47:29.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/sendmail.if	2007-07-06 11:45:15.000000000 -0400
+@@ -131,3 +131,21 @@
+ 
+ 	logging_log_filetrans($1,sendmail_log_t,file)
+ ')
++
++########################################
++## <summary>
++##f	allow domain to signal sendmail
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`sendmail_signal',`
++	gen_require(`
++		type sendmail_t;
++	')
++	allow $1 sendmail_t:process signal;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.0.2/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/setroubleshoot.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/setroubleshoot.if	2007-07-03 14:38:10.000000000 -0400
 @@ -19,3 +19,22 @@
  	allow $1 setroubleshoot_var_run_t:sock_file write;
  	allow $1 setroubleshootd_t:unix_stream_socket connectto;
@@ -6190,7 +6285,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setr
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.0.2/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-07-03 07:06:26.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/setroubleshoot.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/setroubleshoot.te	2007-07-03 14:38:10.000000000 -0400
 @@ -76,6 +76,9 @@
  files_getattr_all_dirs(setroubleshootd_t)
  files_getattr_all_files(setroubleshootd_t)
@@ -6203,7 +6298,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setr
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.0.2/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/smartmon.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/smartmon.te	2007-07-03 14:38:10.000000000 -0400
 @@ -61,6 +61,7 @@
  fs_search_auto_mountpoints(fsdaemon_t)
  
@@ -6214,7 +6309,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smar
  storage_raw_write_fixed_disk(fsdaemon_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.0.2/policy/modules/services/snmp.fc
 --- nsaserefpolicy/policy/modules/services/snmp.fc	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/snmp.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/snmp.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -1,3 +1,10 @@
 +
 +#
@@ -6228,7 +6323,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.0.2/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/spamassassin.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/spamassassin.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -10,3 +10,9 @@
  /var/lib/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_lib_t,s0)
  
@@ -6241,7 +6336,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spam
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.0.2/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/spamassassin.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/spamassassin.te	2007-07-03 14:38:10.000000000 -0400
 @@ -22,7 +22,7 @@
  
  # spamassassin client executable
@@ -6273,7 +6368,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spam
  kernel_read_system_state(spamd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-3.0.2/policy/modules/services/squid.fc
 --- nsaserefpolicy/policy/modules/services/squid.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/squid.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/squid.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -12,3 +12,5 @@
  /var/run/squid\.pid	--	gen_context(system_u:object_r:squid_var_run_t,s0)
  
@@ -6282,7 +6377,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squi
 +/usr/lib64/squid/cachemgr\.cgi	--	gen_context(system_u:object_r:httpd_squid_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.0.2/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/squid.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/squid.te	2007-07-03 14:38:10.000000000 -0400
 @@ -109,6 +109,8 @@
  
  fs_getattr_all_fs(squid_t)
@@ -6311,7 +6406,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squi
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.0.2/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/ssh.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/ssh.if	2007-07-03 14:38:10.000000000 -0400
 @@ -203,6 +203,7 @@
  #
  template(`ssh_per_role_template',`
@@ -6365,7 +6460,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.0.2/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/ssh.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/ssh.te	2007-07-03 14:38:10.000000000 -0400
 @@ -24,11 +24,11 @@
  
  # Type for the ssh-agent executable.
@@ -6408,7 +6503,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uwimap.te serefpolicy-3.0.2/policy/modules/services/uwimap.te
 --- nsaserefpolicy/policy/modules/services/uwimap.te	2007-07-03 07:06:26.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/uwimap.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/uwimap.te	2007-07-03 14:38:10.000000000 -0400
 @@ -64,6 +64,7 @@
  fs_search_auto_mountpoints(imapd_t)
  
@@ -6419,18 +6514,18 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uwim
  libs_use_shared_libs(imapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.fc serefpolicy-3.0.2/policy/modules/services/w3c.fc
 --- nsaserefpolicy/policy/modules/services/w3c.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/services/w3c.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/w3c.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,2 @@
 +/usr/share/w3c-markup-validator(/.*)?		gen_context(system_u:object_r:httpd_w3c_validator_content_t,s0)
 +/usr/share/w3c-markup-validator/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_w3c_validator_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.if serefpolicy-3.0.2/policy/modules/services/w3c.if
 --- nsaserefpolicy/policy/modules/services/w3c.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/services/w3c.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/w3c.if	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>W3C</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.0.2/policy/modules/services/w3c.te
 --- nsaserefpolicy/policy/modules/services/w3c.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/services/w3c.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/w3c.te	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,14 @@
 +policy_module(w3c,1.2.1)
 +
@@ -6448,7 +6543,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.
 +miscfiles_read_certs(httpd_w3c_validator_script_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.0.2/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/xserver.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/xserver.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -92,6 +92,7 @@
  /var/log/XFree86.*	--	gen_context(system_u:object_r:xserver_log_t,s0)
  /var/log/Xorg.*		--	gen_context(system_u:object_r:xserver_log_t,s0)
@@ -6459,7 +6554,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.2/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/xserver.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/xserver.if	2007-07-03 14:38:10.000000000 -0400
 @@ -353,9 +353,6 @@
  	# allow ps to show xauth
  	ps_process_pattern($2,$1_xauth_t)
@@ -6653,7 +6748,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.2/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/services/xserver.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/services/xserver.te	2007-07-03 14:38:10.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -6807,12 +6902,12 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
 -') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.fc serefpolicy-3.0.2/policy/modules/system/application.fc
 --- nsaserefpolicy/policy/modules/system/application.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/system/application.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/application.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1 @@
 +# No application file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.if serefpolicy-3.0.2/policy/modules/system/application.if
 --- nsaserefpolicy/policy/modules/system/application.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/system/application.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/application.if	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,104 @@
 +## <summary>Policy for application domains</summary>
 +
@@ -6920,7 +7015,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/applic
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.0.2/policy/modules/system/application.te
 --- nsaserefpolicy/policy/modules/system/application.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/system/application.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/application.te	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,14 @@
 +
 +policy_module(application,1.0.0)
@@ -6938,7 +7033,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/applic
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.0.2/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/authlogin.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/authlogin.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -14,6 +14,7 @@
  /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
  /sbin/unix_chkpwd	--	gen_context(system_u:object_r:chkpwd_exec_t,s0)
@@ -6949,7 +7044,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.2/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/authlogin.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/authlogin.if	2007-07-03 14:38:10.000000000 -0400
 @@ -27,7 +27,8 @@
  	domain_type($1_chkpwd_t)
  	domain_entry_file($1_chkpwd_t,chkpwd_exec_t)
@@ -7201,7 +7296,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.2/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/authlogin.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/authlogin.te	2007-07-03 14:38:10.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -7267,7 +7362,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.0.2/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/fstools.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/fstools.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -20,7 +20,6 @@
  /sbin/mkfs.*		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/mkraid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -7278,7 +7373,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
  /sbin/partx		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-3.0.2/policy/modules/system/fstools.if
 --- nsaserefpolicy/policy/modules/system/fstools.if	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/fstools.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/fstools.if	2007-07-03 14:38:10.000000000 -0400
 @@ -124,3 +124,22 @@
  
  	allow $1 swapfile_t:file getattr;
@@ -7304,7 +7399,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.0.2/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/fstools.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/fstools.te	2007-07-03 14:38:10.000000000 -0400
 @@ -9,6 +9,7 @@
  type fsadm_t;
  type fsadm_exec_t;
@@ -7315,7 +7410,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
  type fsadm_log_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.fc serefpolicy-3.0.2/policy/modules/system/fusermount.fc
 --- nsaserefpolicy/policy/modules/system/fusermount.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/system/fusermount.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/fusermount.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,6 @@
 +# fusermount executable will have:
 +# label: system_u:object_r:fusermount_exec_t
@@ -7325,7 +7420,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fuserm
 +/usr/bin/fusermount		--	gen_context(system_u:object_r:fusermount_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.if serefpolicy-3.0.2/policy/modules/system/fusermount.if
 --- nsaserefpolicy/policy/modules/system/fusermount.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/system/fusermount.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/fusermount.if	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,41 @@
 +## <summary>policy for fusermount</summary>
 +
@@ -7371,7 +7466,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fuserm
 \ No newline at end of file
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.te serefpolicy-3.0.2/policy/modules/system/fusermount.te
 --- nsaserefpolicy/policy/modules/system/fusermount.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/system/fusermount.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/fusermount.te	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,46 @@
 +policy_module(fusermount,1.0.0)
 +
@@ -7421,7 +7516,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fuserm
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-3.0.2/policy/modules/system/getty.te
 --- nsaserefpolicy/policy/modules/system/getty.te	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/getty.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/getty.te	2007-07-03 14:38:10.000000000 -0400
 @@ -33,7 +33,8 @@
  #
  
@@ -7434,7 +7529,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.
  allow getty_t self:fifo_file rw_fifo_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.0.2/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/hostname.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/hostname.te	2007-07-03 14:38:10.000000000 -0400
 @@ -8,8 +8,12 @@
  
  type hostname_t;
@@ -7463,7 +7558,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostna
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.0.2/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/init.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/init.if	2007-07-03 14:38:10.000000000 -0400
 @@ -194,11 +194,14 @@
  	gen_require(`
  		type initrc_t;
@@ -7533,7 +7628,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.i
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.2/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/init.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/init.te	2007-07-03 14:38:10.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -7648,7 +7743,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-3.0.2/policy/modules/system/ipsec.if
 --- nsaserefpolicy/policy/modules/system/ipsec.if	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/ipsec.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/ipsec.if	2007-07-03 14:38:10.000000000 -0400
 @@ -114,6 +114,26 @@
  
  ########################################
@@ -7678,7 +7773,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.0.2/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/ipsec.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/ipsec.te	2007-07-03 14:38:10.000000000 -0400
 @@ -283,6 +283,7 @@
  allow racoon_t self:netlink_selinux_socket { bind create read };
  allow racoon_t self:udp_socket create_socket_perms;
@@ -7689,7 +7784,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.
  manage_files_pattern(racoon_t,ipsec_var_run_t,ipsec_var_run_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.0.2/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/iptables.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/iptables.te	2007-07-03 14:38:10.000000000 -0400
 @@ -62,6 +62,7 @@
  init_use_script_ptys(iptables_t)
  # to allow rules to be saved on reboot:
@@ -7700,7 +7795,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptabl
  libs_use_shared_libs(iptables_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.2/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/libraries.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/libraries.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -158,8 +158,11 @@
  /usr/(local/)?.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
  /usr/(local/)?lib(64)?/wine/.+\.so  	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -7732,7 +7827,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.2/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/libraries.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/libraries.te	2007-07-06 11:56:48.000000000 -0400
 @@ -97,6 +97,11 @@
  	')
  ')
@@ -7745,16 +7840,21 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
  optional_policy(`
  	# dontaudit access to /usr/lib/apache, normal programs cannot read these libs anyway
  	apache_dontaudit_search_modules(ldconfig_t)
-@@ -107,4 +112,6 @@
+@@ -107,4 +112,11 @@
  	# and executes ldconfig on it.  If you dont allow this kernel installs 
  	# blow up.
  	rpm_manage_script_tmp_files(ldconfig_t)
 +	# smart package manager needs the following for the same reason
 +	rpm_rw_tmp_files(ldconfig_t)
++')
++
++optional_policy(`
++	# run mkinitrd as unconfined user
++	unconfined_manage_tmp_files(ldconfig_t)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-3.0.2/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/locallogin.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/locallogin.te	2007-07-03 14:38:10.000000000 -0400
 @@ -48,6 +48,8 @@
  allow local_login_t self:msgq create_msgq_perms;
  allow local_login_t self:msg { send receive };
@@ -7825,7 +7925,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locall
  # Sulogin local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.0.2/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/logging.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/logging.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -1,6 +1,6 @@
 -
  /dev/log		-s	gen_context(system_u:object_r:devlog_t,s0)
@@ -7842,7 +7942,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
 +/var/log/syslog-ng(/.*)?	--	gen_context(system_u:object_r:syslogd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.0.2/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/logging.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/logging.if	2007-07-03 14:38:10.000000000 -0400
 @@ -33,8 +33,13 @@
  ## </param>
  #
@@ -8070,7 +8170,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.0.2/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/logging.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/logging.te	2007-07-03 14:38:10.000000000 -0400
 @@ -7,10 +7,15 @@
  #
  
@@ -8202,7 +8302,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  files_dontaudit_search_isid_type_dirs(syslogd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.0.2/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/lvm.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/lvm.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -15,6 +15,7 @@
  #
  /etc/lvm(/.*)?			gen_context(system_u:object_r:lvm_etc_t,s0)
@@ -8213,7 +8313,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc
  /etc/lvm/lock(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.2/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/lvm.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/lvm.te	2007-07-03 14:38:10.000000000 -0400
 @@ -16,6 +16,7 @@
  type lvm_t;
  type lvm_exec_t;
@@ -8268,7 +8368,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-3.0.2/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/miscfiles.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/miscfiles.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -66,6 +66,7 @@
  /var/lib/texmf(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
  
@@ -8279,7 +8379,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfi
  /var/spool/texmf(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.0.2/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/modutils.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/modutils.te	2007-07-03 14:38:10.000000000 -0400
 @@ -43,7 +43,7 @@
  # insmod local policy
  #
@@ -8365,7 +8465,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/moduti
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.0.2/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/mount.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/mount.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -1,4 +1,3 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -8374,7 +8474,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 +/sbin/mount.ntfs-3g		--	gen_context(system_u:object_r:mount_ntfs_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.0.2/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/mount.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/mount.if	2007-07-03 14:38:10.000000000 -0400
 @@ -171,3 +171,40 @@
  	role $2 types unconfined_mount_t;
  	allow unconfined_mount_t $3:chr_file rw_file_perms;
@@ -8418,7 +8518,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.0.2/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/mount.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/mount.te	2007-07-03 14:38:10.000000000 -0400
 @@ -8,6 +8,13 @@
  
  ## <desc>
@@ -8559,7 +8659,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/netlabel.te serefpolicy-3.0.2/policy/modules/system/netlabel.te
 --- nsaserefpolicy/policy/modules/system/netlabel.te	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/netlabel.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/netlabel.te	2007-07-03 14:38:10.000000000 -0400
 @@ -20,6 +20,8 @@
  allow netlabel_mgmt_t self:capability net_admin;
  allow netlabel_mgmt_t self:netlink_socket create_socket_perms;
@@ -8571,7 +8671,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/netlab
  libs_use_ld_so(netlabel_mgmt_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.0.2/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/raid.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/raid.te	2007-07-03 14:38:10.000000000 -0400
 @@ -19,7 +19,7 @@
  # Local policy
  #
@@ -8583,7 +8683,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.t
  allow mdadm_t self:fifo_file rw_fifo_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.0.2/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/selinuxutil.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/selinuxutil.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -40,6 +40,7 @@
  /usr/sbin/setfiles.*		--	gen_context(system_u:object_r:setfiles_exec_t,s0)
  /usr/sbin/setsebool		--	gen_context(system_u:object_r:semanage_exec_t,s0)
@@ -8594,7 +8694,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.0.2/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/selinuxutil.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/selinuxutil.if	2007-07-03 14:38:10.000000000 -0400
 @@ -432,6 +432,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -8605,7 +8705,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.2/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/selinuxutil.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/selinuxutil.te	2007-07-03 14:38:10.000000000 -0400
 @@ -24,11 +24,9 @@
  files_type(selinux_config_t)
  
@@ -8806,7 +8906,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.0.2/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/sysnetwork.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/sysnetwork.if	2007-07-03 14:38:10.000000000 -0400
 @@ -522,6 +522,8 @@
  
  	files_search_etc($1)
@@ -8818,7 +8918,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnet
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.0.2/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/sysnetwork.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/sysnetwork.te	2007-07-03 14:38:10.000000000 -0400
 @@ -159,6 +159,10 @@
  	dbus_connect_system_bus(dhcpc_t)
  	dbus_send_system_bus(dhcpc_t)
@@ -8857,7 +8957,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnet
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.0.2/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/udev.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/udev.te	2007-07-03 14:38:10.000000000 -0400
 @@ -68,8 +68,9 @@
  allow udev_t udev_tbl_t:file manage_file_perms;
  dev_filetrans(udev_t,udev_tbl_t,file)
@@ -8948,7 +9048,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.t
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.2/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/unconfined.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/unconfined.if	2007-07-06 11:59:26.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -9000,13 +9100,33 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
  	read_files_pattern($1,{ unconfined_home_dir_t unconfined_home_t },unconfined_home_t)
  	read_lnk_files_pattern($1,{ unconfined_home_dir_t unconfined_home_t },unconfined_home_t)
  ')
-@@ -601,3 +604,111 @@
+@@ -601,3 +604,131 @@
  
  	allow $1 unconfined_tmp_t:file { getattr write append };
  ')
 +
 +########################################
 +## <summary>
++##	manage unconfined users temporary files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`unconfined_manage_tmp_files',`
++	gen_require(`
++		type unconfined_tmp_t;
++	')
++
++	files_search_tmp($1)
++	manage_files_pattern($1,unconfined_tmp_t,unconfined_tmp_t)
++	read_lnk_files_pattern($1,unconfined_tmp_t,unconfined_tmp_t)
++')
++
++########################################
++## <summary>
 +##	Allow ptrace of unconfined domain
 +## </summary>
 +## <param name="domain">
@@ -9114,7 +9234,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.2/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/unconfined.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/unconfined.te	2007-07-03 14:38:10.000000000 -0400
 @@ -5,30 +5,36 @@
  #
  # Declarations
@@ -9293,7 +9413,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
 +corecmd_exec_all_executables(unconfined_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.2/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/userdomain.if	2007-07-03 14:20:25.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/userdomain.if	2007-07-03 14:38:10.000000000 -0400
 @@ -62,6 +62,10 @@
  
  	allow $1_t $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
@@ -10029,7 +10149,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.2/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/userdomain.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/userdomain.te	2007-07-03 14:38:10.000000000 -0400
 @@ -74,6 +74,9 @@
  # users home directory contents
  attribute home_type;
@@ -10174,7 +10294,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.2/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.2/policy/modules/system/xen.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/system/xen.te	2007-07-03 14:38:10.000000000 -0400
 @@ -176,6 +176,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -10208,17 +10328,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
 +fs_read_nfs_symlinks(xend_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.2/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/users/guest.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/users/guest.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.2/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/users/guest.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/users/guest.if	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.2/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/users/guest.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/users/guest.te	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,127 @@
 +policy_module(guest,1.0.0)
 +
@@ -10349,17 +10469,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.t
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.2/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/users/logadm.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/users/logadm.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.2/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/users/logadm.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/users/logadm.if	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.2/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/users/logadm.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/users/logadm.te	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,33 @@
 +policy_module(logadm,1.0.0)
 +
@@ -10396,22 +10516,22 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.
 +files_dontaudit_getattr_all_files(logadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.2/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/users/metadata.xml	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/users/metadata.xml	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.2/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/users/webadm.fc	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/users/webadm.fc	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.2/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/users/webadm.if	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/users/webadm.if	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.2/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.2/policy/modules/users/webadm.te	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/modules/users/webadm.te	2007-07-03 14:38:10.000000000 -0400
 @@ -0,0 +1,70 @@
 +policy_module(webadm,1.0.0)
 +
@@ -10485,7 +10605,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.2/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.2/policy/support/obj_perm_sets.spt	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/support/obj_perm_sets.spt	2007-07-03 14:38:10.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`search_dir_perms',`{ getattr search }')
  define(`list_dir_perms',`{ getattr search read lock ioctl }')
@@ -10520,7 +10640,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.2/policy/users
 --- nsaserefpolicy/policy/users	2007-05-31 15:36:08.000000000 -0400
-+++ serefpolicy-3.0.2/policy/users	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/policy/users	2007-07-06 14:48:00.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -10539,9 +10659,19 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0
  gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
  gen_user(sysadm_u, sysadm, sysadm_r, s0, s0 - mls_systemhigh, mcs_allcats)
  
+@@ -36,8 +36,4 @@
+ # role should use the staff_r role instead of the user_r role when
+ # not in the sysadm_r.
+ #
+-ifdef(`direct_sysadm_daemon',`
+-	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
+-',`
+-	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
+-')
++gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.2/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.2/Rules.modular	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/Rules.modular	2007-07-03 14:38:10.000000000 -0400
 @@ -167,7 +167,7 @@
  # these have to run individually because order matters:
  	$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true
@@ -10570,7 +10700,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.
  clean:
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.0.2/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2007-05-29 13:53:56.000000000 -0400
-+++ serefpolicy-3.0.2/support/Makefile.devel	2007-07-03 13:08:20.000000000 -0400
++++ serefpolicy-3.0.2/support/Makefile.devel	2007-07-03 14:38:10.000000000 -0400
 @@ -24,7 +24,7 @@
  XMLLINT := $(BINDIR)/xmllint
  
diff --git a/selinux-policy.spec b/selinux-policy.spec
index e0401e5..5ebfb6d 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -356,6 +356,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Jul 6 2007 Dan Walsh <dwalsh@redhat.com> 3.0.2-2
+- Allow prelink to read kernel sysctls
+
 * Mon Jul 2 2007 Dan Walsh <dwalsh@redhat.com> 3.0.1-5
 - Default to user_u:system_r:unconfined_t