From d2127311505924220072049517fae59554ca6fe3 Mon Sep 17 00:00:00 2001
From: Josef Kubin <jkubin@fedoraproject.org>
Date: Mar 17 2008 02:59:46 +0000
Subject: A new more general rule in corecommands.fc


---

diff --git a/policy-20070501.patch b/policy-20070501.patch
index 22de377..d46b01e 100644
--- a/policy-20070501.patch
+++ b/policy-20070501.patch
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-2.6.4/man/man8/ftpd_selinux.8
 --- nsaserefpolicy/man/man8/ftpd_selinux.8	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/man/man8/ftpd_selinux.8	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/man/man8/ftpd_selinux.8	2008-03-17 03:46:49.000000000 +0100
 @@ -12,7 +12,7 @@
  .TP
  chcon -R -t public_content_t /var/ftp
@@ -12,7 +12,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-2.6.4/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/flask/access_vectors	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/flask/access_vectors	2008-03-17 03:46:49.000000000 +0100
 @@ -598,6 +598,8 @@
  	shmempwd
  	shmemgrp
@@ -43,7 +43,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors 
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classes serefpolicy-2.6.4/policy/flask/security_classes
 --- nsaserefpolicy/policy/flask/security_classes	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/flask/security_classes	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/flask/security_classes	2008-03-17 03:46:49.000000000 +0100
 @@ -97,4 +97,6 @@
  
  class dccp_socket
@@ -53,7 +53,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classe
  # FLASK
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.6.4/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/global_booleans	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/global_booleans	2008-03-17 03:46:49.000000000 +0100
 @@ -4,7 +4,6 @@
  # file should be used.
  #
@@ -72,7 +72,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans seref
  ## <p>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.6.4/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/global_tunables	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/global_tunables	2008-03-17 03:46:49.000000000 +0100
 @@ -102,12 +102,6 @@
  ## </desc>
  gen_tunable(use_samba_home_dirs,false)
@@ -101,7 +101,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables seref
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.6.4/policy/mls
 --- nsaserefpolicy/policy/mls	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/mls	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/mls	2008-03-17 03:46:49.000000000 +0100
 @@ -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
@@ -175,7 +175,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.6.4
  mlsconstrain association { polmatch }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.6.4/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/acct.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/acct.te	2008-03-17 03:46:49.000000000 +0100
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -186,7 +186,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-2.6.4/policy/modules/admin/alsa.fc
 --- nsaserefpolicy/policy/modules/admin/alsa.fc	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/alsa.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/alsa.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -1,4 +1,11 @@
  
 +/etc/alsa/asound\.state --	gen_context(system_u:object_r:alsa_etc_rw_t,s0)
@@ -201,7 +201,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc
 +/bin/alsaunmute		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.if serefpolicy-2.6.4/policy/modules/admin/alsa.if
 --- nsaserefpolicy/policy/modules/admin/alsa.if	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/alsa.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/alsa.if	2008-03-17 03:46:49.000000000 +0100
 @@ -74,3 +74,39 @@
  	read_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
  	read_lnk_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
@@ -244,7 +244,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.if
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-2.6.4/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/alsa.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/alsa.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,5 +1,5 @@
  
 -policy_module(alsa,1.1.0)
@@ -325,7 +325,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/amanda.if serefpolicy-2.6.4/policy/modules/admin/amanda.if
 --- nsaserefpolicy/policy/modules/admin/amanda.if	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/amanda.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/amanda.if	2008-03-17 03:46:49.000000000 +0100
 @@ -71,6 +71,26 @@
  
  ########################################
@@ -360,7 +360,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.6.4/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/amanda.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/amanda.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,5 +1,5 @@
  
 -policy_module(amanda,1.5.0)
@@ -489,14 +489,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.4/policy/modules/admin/amtu.fc
 --- nsaserefpolicy/policy/modules/admin/amtu.fc	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/admin/amtu.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/amtu.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,3 @@
 +
 +/usr/bin/amtu    --    gen_context(system_u:object_r:amtu_exec_t,s0)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.6.4/policy/modules/admin/amtu.if
 --- nsaserefpolicy/policy/modules/admin/amtu.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/admin/amtu.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/amtu.if	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,53 @@
 +## <summary>
 +##	abstract Machine Test Utility 
@@ -553,7 +553,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.6.4/policy/modules/admin/amtu.te
 --- nsaserefpolicy/policy/modules/admin/amtu.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/admin/amtu.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/amtu.te	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,57 @@
 +policy_module(amtu,1.0.23)
 +
@@ -614,7 +614,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.6.4/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/bootloader.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/bootloader.te	2008-03-17 03:46:49.000000000 +0100
 @@ -65,6 +65,8 @@
  files_tmp_filetrans(bootloader_t,bootloader_tmp_t,{ dir file lnk_file chr_file blk_file })
  # for tune2fs (cjp: ?)
@@ -634,7 +634,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-2.6.4/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/consoletype.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/consoletype.te	2008-03-17 03:46:49.000000000 +0100
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -679,7 +679,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/console
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.6.4/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/dmesg.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/dmesg.te	2008-03-17 03:46:49.000000000 +0100
 @@ -10,6 +10,7 @@
  	type dmesg_t;
  	type dmesg_exec_t;
@@ -690,7 +690,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.t
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.6.4/policy/modules/admin/dmidecode.te
 --- nsaserefpolicy/policy/modules/admin/dmidecode.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/dmidecode.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/dmidecode.te	2008-03-17 03:46:49.000000000 +0100
 @@ -22,6 +22,7 @@
  
  # Allow dmidecode to read /dev/mem
@@ -701,7 +701,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmideco
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.6.4/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/kudzu.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/kudzu.te	2008-03-17 03:46:49.000000000 +0100
 @@ -21,8 +21,8 @@
  # Local policy
  #
@@ -724,7 +724,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.t
  init_telinit(kudzu_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-2.6.4/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/logrotate.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/logrotate.te	2008-03-17 03:46:49.000000000 +0100
 @@ -75,6 +75,7 @@
  mls_file_read_up(logrotate_t)
  mls_file_write_down(logrotate_t)
@@ -735,7 +735,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrota
  selinux_get_enforce_mode(logrotate_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.6.4/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/logwatch.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/logwatch.te	2008-03-17 03:46:49.000000000 +0100
 @@ -30,7 +30,6 @@
  allow logwatch_t self:process signal;
  allow logwatch_t self:fifo_file rw_file_perms;
@@ -806,7 +806,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-2.6.4/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/netutils.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/netutils.te	2008-03-17 03:46:49.000000000 +0100
 @@ -31,6 +31,7 @@
  type traceroute_t;
  type traceroute_exec_t;
@@ -825,7 +825,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-2.6.4/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/prelink.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/prelink.te	2008-03-17 03:46:49.000000000 +0100
 @@ -26,7 +26,7 @@
  # Local policy
  #
@@ -873,7 +873,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.te serefpolicy-2.6.4/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/readahead.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/readahead.te	2008-03-17 03:46:49.000000000 +0100
 @@ -18,7 +18,8 @@
  # Local policy
  #
@@ -903,7 +903,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-2.6.4/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/rpm.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/rpm.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -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)
@@ -916,7 +916,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-2.6.4/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/rpm.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/rpm.if	2008-03-17 03:46:49.000000000 +0100
 @@ -211,6 +211,24 @@
  
  ########################################
@@ -1096,7 +1096,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-2.6.4/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/rpm.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/rpm.te	2008-03-17 03:46:49.000000000 +0100
 @@ -9,6 +9,8 @@
  type rpm_t;
  type rpm_exec_t;
@@ -1108,7 +1108,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-2.6.4/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/sudo.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/sudo.if	2008-03-17 03:46:49.000000000 +0100
 @@ -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;
@@ -1157,7 +1157,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-2.6.4/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/su.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/su.if	2008-03-17 03:46:49.000000000 +0100
 @@ -41,12 +41,11 @@
  
  	allow $2 $1_su_t:process signal;
@@ -1233,7 +1233,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/usermanage.if serefpolicy-2.6.4/policy/modules/admin/usermanage.if
 --- nsaserefpolicy/policy/modules/admin/usermanage.if	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/usermanage.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/usermanage.if	2008-03-17 03:46:49.000000000 +0100
 @@ -278,5 +278,5 @@
  		type crack_db_t;
  	')
@@ -1243,7 +1243,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-2.6.4/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/usermanage.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/usermanage.te	2008-03-17 03:46:49.000000000 +0100
 @@ -99,6 +99,7 @@
  dev_read_urand(chfn_t)
  
@@ -1426,7 +1426,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-2.6.4/policy/modules/admin/vbetool.te
 --- nsaserefpolicy/policy/modules/admin/vbetool.te	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/vbetool.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/vbetool.te	2008-03-17 03:46:49.000000000 +0100
 @@ -32,4 +32,5 @@
  
  optional_policy(`
@@ -1435,7 +1435,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.fc serefpolicy-2.6.4/policy/modules/admin/vpn.fc
 --- nsaserefpolicy/policy/modules/admin/vpn.fc	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/vpn.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/vpn.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -7,3 +7,5 @@
  # sbin
  #
@@ -1444,7 +1444,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.fc 
 +/var/run/vpnc(/.*)?		gen_context(system_u:object_r:vpnc_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.6.4/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/admin/vpn.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/admin/vpn.te	2008-03-17 03:46:49.000000000 +0100
 @@ -24,7 +24,7 @@
  # Local policy
  #
@@ -1476,7 +1476,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te 
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.fc serefpolicy-2.6.4/policy/modules/apps/games.fc
 --- nsaserefpolicy/policy/modules/apps/games.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/games.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/games.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -1,22 +1,16 @@
  #
  # /usr
@@ -1505,7 +1505,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-2.6.4/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/gnome.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/gnome.if	2008-03-17 03:46:49.000000000 +0100
 @@ -35,6 +35,7 @@
  template(`gnome_per_role_template',`
  	gen_require(`
@@ -1561,7 +1561,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/gpg.fc serefpolicy-2.6.4/policy/modules/apps/gpg.fc
 --- nsaserefpolicy/policy/modules/apps/gpg.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/gpg.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/gpg.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -7,6 +7,4 @@
  /usr/lib/gnupg/.*	--	gen_context(system_u:object_r:gpg_exec_t,s0)
  /usr/lib/gnupg/gpgkeys.* --	gen_context(system_u:object_r:gpg_helper_exec_t,s0)
@@ -1571,7 +1571,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc s
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.6.4/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/java.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/java.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -22,3 +22,5 @@
  /usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/local/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
@@ -1580,7 +1580,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc 
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.6.4/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/java.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/java.if	2008-03-17 03:46:49.000000000 +0100
 @@ -224,3 +224,35 @@
  		refpolicywarn(`$0($1) has no effect in strict policy.')
  	')
@@ -1619,7 +1619,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/java.te serefpolicy-2.6.4/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/java.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/java.te	2008-03-17 03:46:49.000000000 +0100
 @@ -31,4 +31,8 @@
  
  	unconfined_domain_noaudit(java_t)
@@ -1631,7 +1631,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te 
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.if serefpolicy-2.6.4/policy/modules/apps/loadkeys.if
 --- nsaserefpolicy/policy/modules/apps/loadkeys.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/loadkeys.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/loadkeys.if	2008-03-17 03:46:49.000000000 +0100
 @@ -11,16 +11,12 @@
  ## </param>
  #
@@ -1700,7 +1700,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.6.4/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/mozilla.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/mozilla.if	2008-03-17 03:46:49.000000000 +0100
 @@ -150,6 +150,7 @@
  	corenet_dontaudit_tcp_bind_generic_port($1_mozilla_t)
  
@@ -1711,7 +1711,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.
  	dev_dontaudit_rw_dri($1_mozilla_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.6.4/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/slocate.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/slocate.te	2008-03-17 03:46:49.000000000 +0100
 @@ -29,8 +29,11 @@
  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)
@@ -1742,7 +1742,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.
  libs_use_ld_so(locate_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.if serefpolicy-2.6.4/policy/modules/apps/uml.if
 --- nsaserefpolicy/policy/modules/apps/uml.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/uml.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/uml.if	2008-03-17 03:46:49.000000000 +0100
 @@ -193,33 +193,6 @@
  		nis_use_ypbind($1_uml_t)
  	')
@@ -1779,7 +1779,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.if s
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/userhelper.if serefpolicy-2.6.4/policy/modules/apps/userhelper.if
 --- nsaserefpolicy/policy/modules/apps/userhelper.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/userhelper.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/userhelper.if	2008-03-17 03:46:49.000000000 +0100
 @@ -131,6 +131,7 @@
  	term_use_all_user_ptys($1_userhelper_t)
  
@@ -1790,7 +1790,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-2.6.4/policy/modules/apps/vmware.fc
 --- nsaserefpolicy/policy/modules/apps/vmware.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/apps/vmware.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/apps/vmware.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -1,11 +1,9 @@
  #
  # HOME_DIR/
@@ -1841,7 +1841,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.f
  /opt/vmware/workstation/bin/vmnet-bridge --	gen_context(system_u:object_r:vmware_host_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc	2008-03-17 03:51:14.000000000 +0100
 @@ -7,6 +7,7 @@
  /bin/d?ash			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/bash			--	gen_context(system_u:object_r:shell_exec_t,s0)
@@ -1881,19 +1881,18 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
  #
  # /lib
  #
-@@ -131,7 +134,10 @@
+@@ -130,8 +133,8 @@
+ /usr/lib(64)?/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:bin_t,s0)
  /usr/lib(64)?/apt/methods.+	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/lib(64)?/courier(/.*)?		gen_context(system_u:object_r:bin_t,s0)
- /usr/lib(64)?/cups/cgi-bin/.*	--	gen_context(system_u:object_r:bin_t,s0)
+-/usr/lib(64)?/cups/cgi-bin/.*	--	gen_context(system_u:object_r:bin_t,s0)
 -/usr/lib(64)?/cups/filter/.*	--	gen_context(system_u:object_r:bin_t,s0)
-+/usr/lib(64)?/cups/filter(/.*)?		gen_context(system_u:object_r:bin_t,s0)
-+/usr/lib(64)?/cups/backend(/.*)? 	gen_context(system_u:object_r:bin_t,s0)
-+/usr/lib(64)?/cups/daemon(/.*)? 	gen_context(system_u:object_r:bin_t,s0)
++/usr/lib(64)?/cups(/.*)?		gen_context(system_u:object_r:bin_t,s0)
 +
  /usr/lib(64)?/cyrus-imapd/.*	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/lib(64)?/dpkg/.+		--	gen_context(system_u:object_r:bin_t,s0)
  /usr/lib(64)?/emacsen-common/.*		gen_context(system_u:object_r:bin_t,s0)
-@@ -164,6 +170,10 @@
+@@ -164,6 +167,10 @@
  /usr/libexec/openssh/sftp-server --	gen_context(system_u:object_r:bin_t,s0)
  
  /usr/local/lib(64)?/ipsec/.*	-- 	gen_context(system_u:object_r:bin_t,s0)
@@ -1904,7 +1903,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
  
  /usr/sbin/sesh			--	gen_context(system_u:object_r:shell_exec_t,s0)
  
-@@ -189,6 +199,7 @@
+@@ -189,6 +196,7 @@
  ifdef(`distro_redhat', `
  /usr/lib/.*/program(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/lib/bluetooth(/.*)?	--      gen_context(system_u:object_r:bin_t,s0)
@@ -1912,7 +1911,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
  /usr/lib64/bluetooth(/.*)?	--      gen_context(system_u:object_r:bin_t,s0)
  /usr/share/authconfig/authconfig-gtk\.py -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/authconfig/authconfig-tui\.py -- gen_context(system_u:object_r:bin_t,s0)
-@@ -220,6 +231,7 @@
+@@ -220,6 +228,7 @@
  /usr/share/system-config-network/neat-control\.py -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-nfs/nfs-export\.py -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-nfs/system-config-nfs\.py -- gen_context(system_u:object_r:bin_t,s0)
@@ -1920,7 +1919,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
  /usr/share/system-config-rootpassword/system-config-rootpassword -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-samba/system-config-samba\.py -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-securitylevel/system-config-securitylevel\.py -- gen_context(system_u:object_r:bin_t,s0)
-@@ -248,6 +260,7 @@
+@@ -248,6 +257,7 @@
  /var/ftp/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
  /usr/lib/yp/.+			--	gen_context(system_u:object_r:bin_t,s0)
@@ -1928,7 +1927,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
  
  /var/qmail/bin                  -d      gen_context(system_u:object_r:bin_t,s0)
  /var/qmail/bin(/.*)?                    gen_context(system_u:object_r:bin_t,s0)
-@@ -256,3 +269,18 @@
+@@ -256,3 +266,18 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -1949,7 +1948,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
 +/etc/apcupsd/onbattery  --    gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.6.4/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.if	2008-03-17 03:46:49.000000000 +0100
 @@ -988,3 +988,23 @@
  
  	mmap_files_pattern($1,bin_t,exec_type)
@@ -1976,7 +1975,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2008-03-17 03:46:49.000000000 +0100
 @@ -1449,6 +1449,44 @@
  
  ########################################
@@ -2086,7 +2085,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corene
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2008-03-17 03:46:49.000000000 +0100
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2159,7 +2158,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-2.6.4/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -12,6 +12,7 @@
  /dev/atibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/audio.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
@@ -2234,7 +2233,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  /lib/udev/devices	-d		gen_context(system_u:object_r:device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.6.4/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.if	2008-03-17 03:46:49.000000000 +0100
 @@ -65,7 +65,7 @@
  
  	relabelfrom_dirs_pattern($1,device_t,device_node)
@@ -2395,7 +2394,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.te serefpolicy-2.6.4/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.te	2008-03-17 03:46:49.000000000 +0100
 @@ -139,6 +139,12 @@
  #
  # Type for sound devices and mixers
@@ -2411,7 +2410,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.6.4/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/domain.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/domain.if	2008-03-17 03:46:49.000000000 +0100
 @@ -64,6 +64,7 @@
  	')
  
@@ -2467,7 +2466,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-2.6.4/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/domain.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/domain.te	2008-03-17 03:46:49.000000000 +0100
 @@ -6,6 +6,29 @@
  # Declarations
  #
@@ -2547,7 +2546,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.fc serefpolicy-2.6.4/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/files.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/files.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -45,7 +45,6 @@
  /etc			-d	gen_context(system_u:object_r:etc_t,s0)
  /etc/.*				gen_context(system_u:object_r:etc_t,s0)
@@ -2592,7 +2591,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.6.4/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2008-03-17 03:46:49.000000000 +0100
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2944,7 +2943,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-2.6.4/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/files.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/files.te	2008-03-17 03:46:49.000000000 +0100
 @@ -54,6 +54,7 @@
  files_type(etc_t)
  # compatibility aliases for removed types:
@@ -2955,7 +2954,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.
  # etc_runtime_t is the type of various
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.6.4/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.if	2008-03-17 03:46:49.000000000 +0100
 @@ -1096,6 +1096,24 @@
  
  ########################################
@@ -3091,7 +3090,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesy
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.6.4/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.te	2008-03-17 03:46:49.000000000 +0100
 @@ -43,6 +43,11 @@
  #
  # Non-persistent/pseudo filesystems
@@ -3166,7 +3165,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesy
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.6.4/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/kernel.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/kernel.if	2008-03-17 03:46:49.000000000 +0100
 @@ -108,6 +108,24 @@
  
  ########################################
@@ -3256,7 +3255,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.6.4/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/kernel.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/kernel.te	2008-03-17 03:46:49.000000000 +0100
 @@ -146,6 +146,8 @@
  type unlabeled_t;
  sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)
@@ -3285,7 +3284,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.6.4/policy/modules/kernel/mls.if
 --- nsaserefpolicy/policy/modules/kernel/mls.if	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/mls.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/mls.if	2008-03-17 03:46:49.000000000 +0100
 @@ -154,6 +154,26 @@
  ########################################
  ## <summary>
@@ -3315,7 +3314,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-2.6.4/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/mls.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/mls.te	2008-03-17 03:46:49.000000000 +0100
 @@ -18,6 +18,7 @@
  attribute mlsnetreadtoclr;
  attribute mlsnetwrite;
@@ -3335,7 +3334,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-2.6.4/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/selinux.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/selinux.if	2008-03-17 03:46:49.000000000 +0100
 @@ -51,6 +51,44 @@
  
  ########################################
@@ -3383,7 +3382,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinu
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.6.4/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/storage.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/storage.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -12,6 +12,7 @@
  /dev/cm20.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/dasd[^/]*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
@@ -3422,7 +3421,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storag
  /dev/i2o/hd[^/]*	-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-2.6.4/policy/modules/kernel/storage.if
 --- nsaserefpolicy/policy/modules/kernel/storage.if	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/storage.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/storage.if	2008-03-17 03:46:49.000000000 +0100
 @@ -100,6 +100,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -3503,7 +3502,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storag
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.te serefpolicy-2.6.4/policy/modules/kernel/storage.te
 --- nsaserefpolicy/policy/modules/kernel/storage.te	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/storage.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/storage.te	2008-03-17 03:46:49.000000000 +0100
 @@ -23,6 +23,12 @@
  neverallow ~{ fixed_disk_raw_write storage_unconfined_type } fixed_disk_device_t:{ chr_file blk_file } { append write };
  
@@ -3519,7 +3518,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.fc serefpolicy-2.6.4/policy/modules/kernel/terminal.fc
 --- nsaserefpolicy/policy/modules/kernel/terminal.fc	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/terminal.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/terminal.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -8,6 +8,7 @@
  /dev/dcbri[0-9]+	-c	gen_context(system_u:object_r:tty_device_t,s0)
  /dev/hvc.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
@@ -3530,7 +3529,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/termin
  /dev/isdn.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.6.4/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/terminal.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/terminal.if	2008-03-17 03:46:49.000000000 +0100
 @@ -278,6 +278,25 @@
  
  ########################################
@@ -3568,7 +3567,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/termin
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-2.6.4/policy/modules/kernel/terminal.te
 --- nsaserefpolicy/policy/modules/kernel/terminal.te	2007-05-07 20:51:04.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/kernel/terminal.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/kernel/terminal.te	2008-03-17 03:46:49.000000000 +0100
 @@ -28,6 +28,7 @@
  type devpts_t;
  files_mountpoint(devpts_t)
@@ -3579,7 +3578,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/termin
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.fc serefpolicy-2.6.4/policy/modules/services/aide.fc
 --- nsaserefpolicy/policy/modules/services/aide.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/aide.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/aide.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -2,5 +2,5 @@
  
  /var/lib/aide(/.*)		gen_context(system_u:object_r:aide_db_t,mls_systemhigh)
@@ -3589,7 +3588,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide
 +/var/log/aide(/.*)?		gen_context(system_u:object_r:aide_log_t,mls_systemhigh)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.te serefpolicy-2.6.4/policy/modules/services/aide.te
 --- nsaserefpolicy/policy/modules/services/aide.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/aide.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/aide.te	2008-03-17 03:46:49.000000000 +0100
 @@ -26,7 +26,7 @@
  
  allow aide_t self:capability { dac_override fowner };
@@ -3601,7 +3600,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide
  manage_files_pattern(aide_t,aide_db_t,aide_db_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.if serefpolicy-2.6.4/policy/modules/services/amavis.if
 --- nsaserefpolicy/policy/modules/services/amavis.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/amavis.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/amavis.if	2008-03-17 03:46:49.000000000 +0100
 @@ -37,7 +37,7 @@
  	')
  
@@ -3636,7 +3635,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amav
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.6.4/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/amavis.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/amavis.te	2008-03-17 03:46:49.000000000 +0100
 @@ -65,6 +65,7 @@
  # Spool Files
  manage_dirs_pattern(amavis_t,amavis_spool_t,amavis_spool_t)
@@ -3655,7 +3654,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-2.6.4/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/apache.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/apache.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -1,10 +1,5 @@
  # temporary hack till genhomedircon is fixed
 -ifdef(`targeted_policy',`
@@ -3689,7 +3688,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
 +/var/www/html/[^/]*/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.6.4/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/apache.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/apache.if	2008-03-17 03:46:49.000000000 +0100
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -3964,7 +3963,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.te serefpolicy-2.6.4/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/apache.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/apache.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,5 +1,5 @@
  
 -policy_module(apache,1.6.0)
@@ -4369,7 +4368,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-2.6.4/policy/modules/services/apcupsd.fc
 --- nsaserefpolicy/policy/modules/services/apcupsd.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/apcupsd.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/apcupsd.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -1,5 +1,11 @@
  /usr/sbin/apcupsd		--	gen_context(system_u:object_r:apcupsd_exec_t,s0)
  
@@ -4384,7 +4383,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-2.6.4/policy/modules/services/apcupsd.if
 --- nsaserefpolicy/policy/modules/services/apcupsd.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/apcupsd.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/apcupsd.if	2008-03-17 03:46:49.000000000 +0100
 @@ -79,3 +79,43 @@
  	allow $1 apcupsd_log_t:dir list_dir_perms;
  	allow $1 apcupsd_log_t:file { getattr append };
@@ -4431,7 +4430,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-2.6.4/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/apcupsd.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/apcupsd.te	2008-03-17 03:46:49.000000000 +0100
 @@ -16,6 +16,9 @@
  type apcupsd_log_t;
  logging_log_file(apcupsd_log_t)
@@ -4541,7 +4540,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-2.6.4/policy/modules/services/arpwatch.te
 --- nsaserefpolicy/policy/modules/services/arpwatch.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/arpwatch.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/arpwatch.te	2008-03-17 03:46:49.000000000 +0100
 @@ -28,7 +28,6 @@
  allow arpwatch_t self:process signal_perms;
  allow arpwatch_t self:unix_dgram_socket create_socket_perms;
@@ -4570,7 +4569,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpw
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-2.6.4/policy/modules/services/audioentropy.te
 --- nsaserefpolicy/policy/modules/services/audioentropy.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/audioentropy.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/audioentropy.te	2008-03-17 03:46:49.000000000 +0100
 @@ -18,7 +18,7 @@
  # Local policy
  #
@@ -4591,7 +4590,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.if serefpolicy-2.6.4/policy/modules/services/automount.if
 --- nsaserefpolicy/policy/modules/services/automount.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/automount.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/automount.if	2008-03-17 03:46:49.000000000 +0100
 @@ -74,3 +74,21 @@
  
  	dontaudit $1 automount_tmp_t:dir getattr;
@@ -4616,7 +4615,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/auto
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.6.4/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/automount.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/automount.te	2008-03-17 03:46:49.000000000 +0100
 @@ -69,6 +69,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -4656,7 +4655,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-2.6.4/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/avahi.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/avahi.te	2008-03-17 03:46:49.000000000 +0100
 @@ -18,7 +18,7 @@
  # Local policy
  #
@@ -4695,7 +4694,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-2.6.4/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/bind.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/bind.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -45,4 +45,7 @@
  /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)
@@ -4706,7 +4705,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-2.6.4/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/bind.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/bind.te	2008-03-17 03:46:49.000000000 +0100
 @@ -119,6 +119,10 @@
  corenet_sendrecv_rndc_server_packets(named_t)
  corenet_sendrecv_rndc_client_packets(named_t)
@@ -4748,7 +4747,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-2.6.4/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/bluetooth.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/bluetooth.te	2008-03-17 03:46:49.000000000 +0100
 @@ -139,6 +139,8 @@
  	dbus_system_bus_client_template(bluetooth,bluetooth_t)
  	dbus_connect_system_bus(bluetooth_t)
@@ -4760,7 +4759,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/blue
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-2.6.4/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/clamav.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/clamav.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -9,8 +9,10 @@
  
  /var/run/amavis(d)?/clamd\.pid	--	gen_context(system_u:object_r:clamd_var_run_t,s0)
@@ -4776,7 +4775,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clam
  /var/spool/amavisd/clamd\.sock	-s	gen_context(system_u:object_r:clamd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.6.4/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/clamav.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/clamav.te	2008-03-17 03:46:49.000000000 +0100
 @@ -74,17 +74,20 @@
  manage_files_pattern(clamd_t,clamd_var_lib_t,clamd_var_lib_t)
  
@@ -4835,7 +4834,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-2.6.4/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/consolekit.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/consolekit.te	2008-03-17 03:46:49.000000000 +0100
 @@ -10,7 +10,6 @@
  type consolekit_exec_t;
  init_daemon_domain(consolekit_t, consolekit_exec_t)
@@ -4883,7 +4882,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-2.6.4/policy/modules/services/courier.te
 --- nsaserefpolicy/policy/modules/services/courier.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/courier.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/courier.te	2008-03-17 03:46:49.000000000 +0100
 @@ -58,6 +58,7 @@
  files_getattr_tmp_dirs(courier_authdaemon_t)
  
@@ -4894,7 +4893,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-2.6.4/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/cron.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/cron.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -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)
@@ -4911,7 +4910,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
 +/var/lib/misc(/.*)?			gen_context(system_u:object_r:crond_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.6.4/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/cron.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/cron.if	2008-03-17 03:46:49.000000000 +0100
 @@ -35,6 +35,7 @@
  #
  template(`cron_per_role_template',`
@@ -5048,7 +5047,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.6.4/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/cron.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/cron.te	2008-03-17 03:46:49.000000000 +0100
 @@ -42,6 +42,9 @@
  type cron_log_t;
  logging_log_file(cron_log_t)
@@ -5268,7 +5267,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.6.4/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/cups.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/cups.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -8,17 +8,15 @@
  /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)
@@ -5319,7 +5318,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
 +/usr/local/Printer/[^/]*/inf(/.*)?      gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.6.4/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/cups.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/cups.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,5 +1,5 @@
  
 -policy_module(cups,1.6.0)
@@ -5731,7 +5730,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te.old serefpolicy-2.6.4/policy/modules/services/cups.te.old
 --- nsaserefpolicy/policy/modules/services/cups.te.old	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/cups.te.old	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/cups.te.old	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,728 @@
 +
 +policy_module(cups,1.6.0)
@@ -6463,7 +6462,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.6.4/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/cvs.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/cvs.te	2008-03-17 03:46:49.000000000 +0100
 @@ -16,6 +16,7 @@
  type cvs_t;
  type cvs_exec_t;
@@ -6490,7 +6489,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.6.4/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/cyrus.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/cyrus.te	2008-03-17 03:46:49.000000000 +0100
 @@ -145,6 +145,7 @@
  
  optional_policy(`
@@ -6501,7 +6500,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyru
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.6.4/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/dbus.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/dbus.if	2008-03-17 03:46:49.000000000 +0100
 @@ -49,6 +49,12 @@
  ## </param>
  #
@@ -6631,7 +6630,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.6.4/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/dbus.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/dbus.te	2008-03-17 03:46:49.000000000 +0100
 @@ -40,8 +40,6 @@
  # Receive notifications of policy reloads and enforcing status changes.
  allow system_dbusd_t self:netlink_selinux_socket { create bind read };
@@ -6662,7 +6661,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-2.6.4/policy/modules/services/dcc.te
 --- nsaserefpolicy/policy/modules/services/dcc.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/dcc.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/dcc.te	2008-03-17 03:46:49.000000000 +0100
 @@ -126,7 +126,7 @@
  # dcc procmail interface local policy
  #
@@ -6685,7 +6684,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-2.6.4/policy/modules/services/dhcp.te
 --- nsaserefpolicy/policy/modules/services/dhcp.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/dhcp.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/dhcp.te	2008-03-17 03:46:49.000000000 +0100
 @@ -119,6 +119,8 @@
  	dbus_system_bus_client_template(dhcpd,dhcpd_t)
  	dbus_connect_system_bus(dhcpd_t)
@@ -6697,7 +6696,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/dictd.fc serefpolicy-2.6.4/policy/modules/services/dictd.fc
 --- nsaserefpolicy/policy/modules/services/dictd.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/dictd.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/dictd.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -4,3 +4,4 @@
  /usr/sbin/dictd		--	gen_context(system_u:object_r:dictd_exec_t,s0)
  
@@ -6705,7 +6704,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dict
 +/var/run/dictd\.pid	--	gen_context(system_u:object_r:dictd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.te serefpolicy-2.6.4/policy/modules/services/dictd.te
 --- nsaserefpolicy/policy/modules/services/dictd.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/dictd.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/dictd.te	2008-03-17 03:46:49.000000000 +0100
 @@ -16,6 +16,9 @@
  type dictd_var_lib_t alias var_lib_dictd_t;
  files_type(dictd_var_lib_t)
@@ -6728,7 +6727,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dict
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/djbdns.te serefpolicy-2.6.4/policy/modules/services/djbdns.te
 --- nsaserefpolicy/policy/modules/services/djbdns.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/djbdns.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/djbdns.te	2008-03-17 03:46:49.000000000 +0100
 @@ -44,4 +44,7 @@
  libs_use_ld_so(djbdns_axfrdns_t)
  libs_use_shared_libs(djbdns_axfrdns_t)
@@ -6740,7 +6739,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/djbd
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.6.4/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/dovecot.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/dovecot.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -17,21 +17,22 @@
  
  ifdef(`distro_debian', `
@@ -6770,7 +6769,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
 +/var/spool/dovecot(/.*)?		gen_context(system_u:object_r:dovecot_spool_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-2.6.4/policy/modules/services/dovecot.if
 --- nsaserefpolicy/policy/modules/services/dovecot.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/dovecot.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/dovecot.if	2008-03-17 03:46:49.000000000 +0100
 @@ -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)
@@ -6817,7 +6816,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-2.6.4/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/dovecot.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/dovecot.te	2008-03-17 03:46:49.000000000 +0100
 @@ -15,6 +15,12 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -7003,9 +7002,9 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.fc serefpolicy-2.6.4/policy/modules/services/exim.fc
 --- nsaserefpolicy/policy/modules/services/exim.fc	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/exim.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/exim.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,16 @@
-+# $Id: policy-20070501.patch,v 1.95 2008/03/07 23:01:24 jkubin Exp $
++# $Id: policy-20070501.patch,v 1.96 2008/03/17 02:59:46 jkubin Exp $
 +# Draft SELinux refpolicy module for the Exim MTA
 +# 
 +# Devin Carraway <selinux/at/devin.com>
@@ -7023,7 +7022,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-2.6.4/policy/modules/services/exim.if
 --- nsaserefpolicy/policy/modules/services/exim.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/exim.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/exim.if	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,157 @@
 +## <summary>Exim service</summary>
 +
@@ -7184,9 +7183,9 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-2.6.4/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/exim.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/exim.te	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,231 @@
-+# $Id: policy-20070501.patch,v 1.95 2008/03/07 23:01:24 jkubin Exp $
++# $Id: policy-20070501.patch,v 1.96 2008/03/17 02:59:46 jkubin Exp $
 +# Draft SELinux refpolicy module for the Exim MTA
 +# 
 +# Devin Carraway <selinux/at/devin.com>
@@ -7419,7 +7418,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.6.4/policy/modules/services/fetchmail.te
 --- nsaserefpolicy/policy/modules/services/fetchmail.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/fetchmail.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/fetchmail.te	2008-03-17 03:46:49.000000000 +0100
 @@ -91,6 +91,10 @@
  ')
  
@@ -7433,7 +7432,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetc
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.6.4/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ftp.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ftp.te	2008-03-17 03:46:49.000000000 +0100
 @@ -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;
@@ -7497,7 +7496,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-2.6.4/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/hal.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/hal.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -2,15 +2,22 @@
  /etc/hal/device\.d/printer_remove\.hal -- 	gen_context(system_u:object_r:hald_exec_t,s0)
  /etc/hal/capability\.d/printer_update\.hal --	gen_context(system_u:object_r:hald_exec_t,s0)
@@ -7528,7 +7527,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
 +/var/run/vbe.* 	--			gen_context(system_u:object_r:hald_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.6.4/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/hal.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/hal.if	2008-03-17 03:46:49.000000000 +0100
 @@ -208,3 +208,98 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -7630,7 +7629,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-2.6.4/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/hal.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/hal.te	2008-03-17 03:46:49.000000000 +0100
 @@ -61,8 +61,6 @@
  # For backwards compatibility with older kernels
  allow hald_t self:netlink_socket create_socket_perms;
@@ -7712,7 +7711,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.6.4/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/inetd.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/inetd.te	2008-03-17 03:46:49.000000000 +0100
 @@ -135,8 +135,8 @@
  mls_fd_use_all_levels(inetd_t)
  mls_fd_share_all_levels(inetd_t)
@@ -7735,7 +7734,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.fc serefpolicy-2.6.4/policy/modules/services/kerberos.fc
 --- nsaserefpolicy/policy/modules/services/kerberos.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -16,3 +16,4 @@
  
  /var/log/krb5kdc\.log			gen_context(system_u:object_r:krb5kdc_log_t,s0)
@@ -7743,7 +7742,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-2.6.4/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.if	2008-03-17 03:46:49.000000000 +0100
 @@ -33,43 +33,10 @@
  #
  interface(`kerberos_use',`
@@ -7839,7 +7838,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-2.6.4/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2008-03-17 03:46:49.000000000 +0100
 @@ -5,6 +5,7 @@
  #
  # Declarations
@@ -7963,7 +7962,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.6.4/policy/modules/services/ktalk.te
 --- nsaserefpolicy/policy/modules/services/ktalk.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ktalk.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ktalk.te	2008-03-17 03:46:49.000000000 +0100
 @@ -49,6 +49,8 @@
  manage_files_pattern(ktalkd_t,ktalkd_var_run_t,ktalkd_var_run_t)
  files_pid_filetrans(ktalkd_t,ktalkd_var_run_t,file)
@@ -7994,7 +7993,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktal
 +term_search_ptys(ktalkd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.fc serefpolicy-2.6.4/policy/modules/services/lpd.fc
 --- nsaserefpolicy/policy/modules/services/lpd.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/lpd.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/lpd.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -29,3 +29,4 @@
  #
  /var/spool/lpd(/.*)?		gen_context(system_u:object_r:print_spool_t,s0)
@@ -8002,7 +8001,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.
 +/var/spool/cups(/.*)?		gen_context(system_u:object_r:print_spool_t,mls_systemhigh)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.6.4/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/lpd.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/lpd.if	2008-03-17 03:46:49.000000000 +0100
 @@ -317,10 +317,8 @@
  	')
  
@@ -8040,7 +8039,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.if serefpolicy-2.6.4/policy/modules/services/mailman.if
 --- nsaserefpolicy/policy/modules/services/mailman.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/mailman.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/mailman.if	2008-03-17 03:46:49.000000000 +0100
 @@ -275,6 +275,44 @@
  
  #######################################
@@ -8088,7 +8087,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-2.6.4/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/mailman.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/mailman.te	2008-03-17 03:46:49.000000000 +0100
 @@ -55,6 +55,8 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -8108,13 +8107,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-2.6.4/policy/modules/services/mailscanner.fc
 --- nsaserefpolicy/policy/modules/services/mailscanner.fc	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/mailscanner.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/mailscanner.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -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-2.6.4/policy/modules/services/mailscanner.if
 --- nsaserefpolicy/policy/modules/services/mailscanner.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/mailscanner.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/mailscanner.if	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,59 @@
 +## <summary>Anti-Virus and Anti-Spam Filter</summary>
 +
@@ -8177,7 +8176,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-2.6.4/policy/modules/services/mailscanner.te
 --- nsaserefpolicy/policy/modules/services/mailscanner.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/mailscanner.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/mailscanner.te	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,8 @@
 +
 +policy_module(mailscanner,1.0.0)
@@ -8189,7 +8188,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.6.4/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/mta.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/mta.if	2008-03-17 03:46:49.000000000 +0100
 @@ -87,6 +87,8 @@
  	# It wants to check for nscd
  	files_dontaudit_search_pids($1_mail_t)
@@ -8337,7 +8336,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  ##	Read sendmail binary.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.6.4/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/mta.te	2008-03-07 23:28:38.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/mta.te	2008-03-17 03:46:49.000000000 +0100
 @@ -6,6 +6,8 @@
  # Declarations
  #
@@ -8418,7 +8417,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.6.4/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/mysql.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/mysql.te	2008-03-17 03:46:49.000000000 +0100
 @@ -33,7 +33,8 @@
  allow mysqld_t self:capability { dac_override setgid setuid sys_resource net_bind_service };
  dontaudit mysqld_t self:capability sys_tty_config;
@@ -8431,7 +8430,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysq
  allow mysqld_t self:udp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-2.6.4/policy/modules/services/nagios.fc
 --- nsaserefpolicy/policy/modules/services/nagios.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/nagios.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/nagios.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -4,13 +4,14 @@
  /usr/bin/nagios			--	gen_context(system_u:object_r:nagios_exec_t,s0)
  /usr/bin/nrpe			--	gen_context(system_u:object_r:nrpe_exec_t,s0)
@@ -8452,7 +8451,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagi
 +/usr/lib(64)?/cgi-bin/nagios(/.+)?	gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-2.6.4/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/nagios.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/nagios.te	2008-03-17 03:46:49.000000000 +0100
 @@ -10,10 +10,6 @@
  type nagios_exec_t;
  init_daemon_domain(nagios_t,nagios_exec_t)
@@ -8574,7 +8573,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagi
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.6.4/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/networkmanager.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/networkmanager.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -1,5 +1,7 @@
  
  /usr/(s)?bin/NetworkManager	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
@@ -8585,7 +8584,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.if serefpolicy-2.6.4/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/networkmanager.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/networkmanager.if	2008-03-17 03:46:49.000000000 +0100
 @@ -78,3 +78,40 @@
  	allow $1 NetworkManager_t:dbus send_msg;
  	allow NetworkManager_t $1:dbus send_msg;
@@ -8629,7 +8628,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.6.4/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/networkmanager.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/networkmanager.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,4 +1,3 @@
 -
  policy_module(networkmanager,1.6.0)
@@ -8686,7 +8685,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-2.6.4/policy/modules/services/nis.fc
 --- nsaserefpolicy/policy/modules/services/nis.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/nis.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/nis.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -4,6 +4,7 @@
  /sbin/ypbind		--	gen_context(system_u:object_r:ypbind_exec_t,s0)
  
@@ -8697,7 +8696,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-2.6.4/policy/modules/services/nis.if
 --- nsaserefpolicy/policy/modules/services/nis.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/nis.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/nis.if	2008-03-17 03:46:49.000000000 +0100
 @@ -48,8 +48,8 @@
  	corenet_udp_bind_all_nodes($1)
  	corenet_tcp_bind_generic_port($1)
@@ -8736,7 +8735,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.6.4/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/nis.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/nis.te	2008-03-17 03:46:49.000000000 +0100
 @@ -120,6 +120,16 @@
  ')
  
@@ -8793,7 +8792,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-2.6.4/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/nscd.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/nscd.te	2008-03-17 03:46:49.000000000 +0100
 @@ -28,14 +28,14 @@
  # Local policy
  #
@@ -8857,7 +8856,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.fc serefpolicy-2.6.4/policy/modules/services/ntp.fc
 --- nsaserefpolicy/policy/modules/services/ntp.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ntp.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ntp.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -17,3 +17,8 @@
  /var/log/xntpd.*		--	gen_context(system_u:object_r:ntpd_log_t,s0)
  
@@ -8869,7 +8868,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.
 +/etc/rc\.d/init\.d/ntpd	--	gen_context(system_u:object_r:ntpd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-2.6.4/policy/modules/services/ntp.if
 --- nsaserefpolicy/policy/modules/services/ntp.if	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ntp.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ntp.if	2008-03-17 03:46:49.000000000 +0100
 @@ -53,3 +53,22 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,ntpdate_exec_t,ntpd_t)
@@ -8895,7 +8894,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.6.4/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ntp.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ntp.te	2008-03-17 03:46:49.000000000 +0100
 @@ -25,6 +25,12 @@
  type ntpdate_exec_t;
  init_system_domain(ntpd_t,ntpdate_exec_t)
@@ -8957,7 +8956,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.6.4/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/oddjob.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/oddjob.te	2008-03-17 03:46:49.000000000 +0100
 @@ -27,7 +27,7 @@
  # oddjob local policy
  #
@@ -8969,7 +8968,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddj
  allow oddjob_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.fc serefpolicy-2.6.4/policy/modules/services/openct.fc
 --- nsaserefpolicy/policy/modules/services/openct.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/openct.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/openct.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -2,6 +2,7 @@
  # /usr
  #
@@ -8980,7 +8979,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
  # /var
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.if serefpolicy-2.6.4/policy/modules/services/openct.if
 --- nsaserefpolicy/policy/modules/services/openct.if	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/openct.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/openct.if	2008-03-17 03:46:49.000000000 +0100
 @@ -1 +1,83 @@
 -## <summary>Service for handling smart card readers.</summary>
 +
@@ -9068,7 +9067,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.te serefpolicy-2.6.4/policy/modules/services/openct.te
 --- nsaserefpolicy/policy/modules/services/openct.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/openct.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/openct.te	2008-03-17 03:46:49.000000000 +0100
 @@ -21,9 +21,13 @@
  dontaudit openct_t self:capability sys_tty_config;
  allow openct_t self:process signal_perms;
@@ -9094,7 +9093,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.fc serefpolicy-2.6.4/policy/modules/services/openvpn.fc
 --- nsaserefpolicy/policy/modules/services/openvpn.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/openvpn.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/openvpn.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -11,5 +11,6 @@
  #
  # /var
@@ -9106,7 +9105,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
 +/var/log/openvpn.*\.log	--	gen_context(system_u:object_r:openvpn_var_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.if serefpolicy-2.6.4/policy/modules/services/openvpn.if
 --- nsaserefpolicy/policy/modules/services/openvpn.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/openvpn.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/openvpn.if	2008-03-17 03:46:49.000000000 +0100
 @@ -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)
@@ -9181,7 +9180,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-2.6.4/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/openvpn.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/openvpn.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,11 +1,18 @@
  
 -policy_module(openvpn,1.2.0)
@@ -9266,7 +9265,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-2.6.4/policy/modules/services/pcscd.te
 --- nsaserefpolicy/policy/modules/services/pcscd.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/pcscd.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/pcscd.te	2008-03-17 03:46:49.000000000 +0100
 @@ -21,6 +21,7 @@
  #
  
@@ -9291,7 +9290,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcsc
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.6.4/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/pegasus.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/pegasus.if	2008-03-17 03:46:49.000000000 +0100
 @@ -1 +1,19 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -9314,7 +9313,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-2.6.4/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/pegasus.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/pegasus.te	2008-03-17 03:46:49.000000000 +0100
 @@ -38,12 +38,11 @@
  allow pegasus_t self:unix_stream_socket create_stream_socket_perms;
  allow pegasus_t self:tcp_socket create_stream_socket_perms;
@@ -9364,7 +9363,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pega
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portslave.te serefpolicy-2.6.4/policy/modules/services/portslave.te
 --- nsaserefpolicy/policy/modules/services/portslave.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/portslave.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/portslave.te	2008-03-17 03:46:49.000000000 +0100
 @@ -84,6 +84,7 @@
  
  auth_rw_login_records(portslave_t)
@@ -9375,7 +9374,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-2.6.4/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/postfix.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -5,6 +5,7 @@
  /usr/libexec/postfix/cleanup --	gen_context(system_u:object_r:postfix_cleanup_exec_t,s0)
  /usr/libexec/postfix/lmtp --	gen_context(system_u:object_r:postfix_smtp_exec_t,s0)
@@ -9386,7 +9385,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  /usr/libexec/postfix/(n)?qmgr -- gen_context(system_u:object_r:postfix_qmgr_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.6.4/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/postfix.if	2008-03-17 03:46:49.000000000 +0100
 @@ -41,6 +41,7 @@
  	allow postfix_$1_t self:unix_stream_socket connectto;
  
@@ -9538,7 +9537,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-2.6.4/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/postfix.te	2008-03-17 03:46:49.000000000 +0100
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -9748,7 +9747,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/ppp.fc serefpolicy-2.6.4/policy/modules/services/ppp.fc
 --- nsaserefpolicy/policy/modules/services/ppp.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ppp.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ppp.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -25,7 +25,7 @@
  #
  # /var
@@ -9760,7 +9759,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.
  # Fix pptp sockets
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-2.6.4/policy/modules/services/ppp.if
 --- nsaserefpolicy/policy/modules/services/ppp.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ppp.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ppp.if	2008-03-17 03:46:49.000000000 +0100
 @@ -159,6 +159,25 @@
  
  ########################################
@@ -9789,7 +9788,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.6.4/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ppp.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ppp.te	2008-03-17 03:46:49.000000000 +0100
 @@ -155,7 +155,7 @@
  
  files_exec_etc_files(pppd_t)
@@ -9828,7 +9827,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.6.4/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/procmail.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/procmail.te	2008-03-17 03:46:49.000000000 +0100
 @@ -10,6 +10,7 @@
  type procmail_exec_t;
  domain_type(procmail_t)
@@ -9892,7 +9891,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.te serefpolicy-2.6.4/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/pyzor.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/pyzor.te	2008-03-17 03:46:49.000000000 +0100
 @@ -54,6 +54,11 @@
  corenet_udp_sendrecv_all_nodes(pyzor_t)
  corenet_udp_sendrecv_all_ports(pyzor_t)
@@ -9923,7 +9922,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-2.6.4/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/radius.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/radius.te	2008-03-17 03:46:49.000000000 +0100
 @@ -81,6 +81,7 @@
  
  auth_read_shadow(radiusd_t)
@@ -9950,7 +9949,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radi
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-2.6.4/policy/modules/services/radvd.te
 --- nsaserefpolicy/policy/modules/services/radvd.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/radvd.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/radvd.te	2008-03-17 03:46:49.000000000 +0100
 @@ -34,7 +34,7 @@
  files_pid_filetrans(radvd_t,radvd_var_run_t,file)
  
@@ -9962,7 +9961,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radv
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-2.6.4/policy/modules/services/rhgb.te
 --- nsaserefpolicy/policy/modules/services/rhgb.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/rhgb.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/rhgb.te	2008-03-17 03:46:49.000000000 +0100
 @@ -73,6 +73,7 @@
  fs_mount_ramfs(rhgb_t)
  fs_unmount_ramfs(rhgb_t)
@@ -9981,7 +9980,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-2.6.4/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ricci.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ricci.te	2008-03-17 03:46:49.000000000 +0100
 @@ -137,6 +137,7 @@
  files_create_boot_flag(ricci_t)
  
@@ -10003,7 +10002,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-2.6.4/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/rlogin.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/rlogin.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,5 +1,5 @@
  
 -policy_module(rlogin,1.3.0)
@@ -10054,7 +10053,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlog
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-2.6.4/policy/modules/services/rpcbind.fc
 --- nsaserefpolicy/policy/modules/services/rpcbind.fc	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/rpcbind.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/rpcbind.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,6 @@
 +
 +/sbin/rpcbind		--	gen_context(system_u:object_r:rpcbind_exec_t,s0)
@@ -10064,7 +10063,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcb
 +/var/lib/rpcbind(/.*)?			gen_context(system_u:object_r:rpcbind_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-2.6.4/policy/modules/services/rpcbind.if
 --- nsaserefpolicy/policy/modules/services/rpcbind.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/rpcbind.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/rpcbind.if	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,104 @@
 +
 +## <summary>policy for rpcbind</summary>
@@ -10172,7 +10171,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcb
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-2.6.4/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/rpcbind.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/rpcbind.te	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,83 @@
 +policy_module(rpcbind,1.0.0)
 +
@@ -10259,7 +10258,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcb
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-2.6.4/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/rpc.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/rpc.if	2008-03-17 03:46:49.000000000 +0100
 @@ -89,8 +89,11 @@
  	# bind to arbitary unused ports
  	corenet_tcp_bind_generic_port($1_t)
@@ -10300,7 +10299,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.6.4/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/rpc.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/rpc.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,5 +1,5 @@
  
 -policy_module(rpc,1.5.0)
@@ -10410,7 +10409,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.
  	userdom_list_unpriv_users_tmp(gssd_t) 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-2.6.4/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/rshd.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/rshd.te	2008-03-17 03:46:49.000000000 +0100
 @@ -11,19 +11,22 @@
  domain_subj_id_change_exemption(rshd_t)
  domain_role_change_exemption(rshd_t)
@@ -10511,7 +10510,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-2.6.4/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/rsync.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/rsync.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,5 +1,5 @@
  
 -policy_module(rsync,1.4.0)
@@ -10583,7 +10582,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsyn
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-2.6.4/policy/modules/services/rwho.if
 --- nsaserefpolicy/policy/modules/services/rwho.if	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/rwho.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/rwho.if	2008-03-17 03:46:49.000000000 +0100
 @@ -1 +1,84 @@
 -## <summary>Who is logged in on other machines?</summary>
 +
@@ -10672,7 +10671,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-2.6.4/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/samba.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/samba.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -3,6 +3,7 @@
  # /etc
  #
@@ -10701,7 +10700,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.if serefpolicy-2.6.4/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/samba.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/samba.if	2008-03-17 03:46:49.000000000 +0100
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -10938,7 +10937,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-2.6.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/samba.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/samba.te	2008-03-17 03:46:49.000000000 +0100
 @@ -16,6 +16,14 @@
  
  ## <desc>
@@ -11499,7 +11498,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-2.6.4/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/sasl.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/sasl.te	2008-03-17 03:46:49.000000000 +0100
 @@ -63,6 +63,7 @@
  selinux_compute_access_vector(saslauthd_t)
  
@@ -11530,7 +11529,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-2.6.4/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/sendmail.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/sendmail.if	2008-03-17 03:46:49.000000000 +0100
 @@ -76,6 +76,26 @@
  
  ########################################
@@ -11590,7 +11589,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te	2008-03-17 03:46:49.000000000 +0100
 @@ -28,12 +28,11 @@
  #
  
@@ -11642,7 +11641,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-2.6.4/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/smartmon.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/smartmon.te	2008-03-17 03:46:49.000000000 +0100
 @@ -60,6 +60,7 @@
  fs_search_auto_mountpoints(fsdaemon_t)
  
@@ -11653,7 +11652,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-2.6.4/policy/modules/services/snmp.fc
 --- nsaserefpolicy/policy/modules/services/snmp.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/snmp.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/snmp.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -1,11 +1,5 @@
  
  #
@@ -11668,7 +11667,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp
  /usr/sbin/snmp(trap)?d	--	gen_context(system_u:object_r:snmpd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.6.4/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/snmp.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/snmp.te	2008-03-17 03:46:49.000000000 +0100
 @@ -9,9 +9,6 @@
  type snmpd_exec_t;
  init_daemon_domain(snmpd_t,snmpd_exec_t)
@@ -11740,7 +11739,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.6.4/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/spamassassin.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/spamassassin.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -9,6 +9,10 @@
  /var/lib/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_lib_t,s0)
  
@@ -11754,7 +11753,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spam
  HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-2.6.4/policy/modules/services/spamassassin.if
 --- nsaserefpolicy/policy/modules/services/spamassassin.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/spamassassin.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/spamassassin.if	2008-03-17 03:46:49.000000000 +0100
 @@ -466,6 +466,7 @@
  	')
  
@@ -11765,7 +11764,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-2.6.4/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/spamassassin.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/spamassassin.te	2008-03-17 03:46:49.000000000 +0100
 @@ -6,14 +6,12 @@
  # Declarations
  #
@@ -11848,7 +11847,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spam
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-2.6.4/policy/modules/services/squid.fc
 --- nsaserefpolicy/policy/modules/services/squid.fc	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/squid.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/squid.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -12,3 +12,5 @@
  /var/run/squid\.pid	--	gen_context(system_u:object_r:squid_var_run_t,s0)
  
@@ -11857,7 +11856,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.if serefpolicy-2.6.4/policy/modules/services/squid.if
 --- nsaserefpolicy/policy/modules/services/squid.if	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/squid.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/squid.if	2008-03-17 03:46:49.000000000 +0100
 @@ -131,3 +131,22 @@
  interface(`squid_use',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -11883,7 +11882,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squi
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.6.4/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/squid.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/squid.te	2008-03-17 03:46:49.000000000 +0100
 @@ -91,10 +91,12 @@
  corenet_udp_bind_gopher_port(squid_t)
  corenet_tcp_bind_squid_port(squid_t)
@@ -11924,7 +11923,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-2.6.4/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ssh.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ssh.if	2008-03-17 03:46:49.000000000 +0100
 @@ -521,6 +521,7 @@
  
  	optional_policy(`
@@ -11978,7 +11977,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-2.6.4/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/ssh.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/ssh.te	2008-03-17 03:46:49.000000000 +0100
 @@ -24,11 +24,11 @@
  
  # Type for the ssh-agent executable.
@@ -12014,7 +12013,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.
  	# Relabel and access ptys created by sshd
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-2.6.4/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/telnet.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/telnet.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,5 +1,5 @@
  
 -policy_module(telnet,1.4.0)
@@ -12091,7 +12090,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/teln
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-2.6.4/policy/modules/services/tftp.fc
 --- nsaserefpolicy/policy/modules/services/tftp.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/tftp.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/tftp.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -4,3 +4,5 @@
  
  /tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
@@ -12100,7 +12099,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp
 +/var/tftp/.*			gen_context(system_u:object_r:tftpdir_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.6.4/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/tftp.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/tftp.te	2008-03-17 03:46:49.000000000 +0100
 @@ -16,6 +16,17 @@
  type tftpdir_t;
  files_type(tftpdir_t)
@@ -12156,7 +12155,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uwimap.te serefpolicy-2.6.4/policy/modules/services/uwimap.te
 --- nsaserefpolicy/policy/modules/services/uwimap.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/uwimap.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/uwimap.te	2008-03-17 03:46:49.000000000 +0100
 @@ -63,6 +63,7 @@
  fs_search_auto_mountpoints(imapd_t)
  
@@ -12167,18 +12166,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-2.6.4/policy/modules/services/w3c.fc
 --- nsaserefpolicy/policy/modules/services/w3c.fc	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/w3c.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/w3c.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -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-2.6.4/policy/modules/services/w3c.if
 --- nsaserefpolicy/policy/modules/services/w3c.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/w3c.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/w3c.if	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1 @@
 +## <summary>W3C</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-2.6.4/policy/modules/services/w3c.te
 --- nsaserefpolicy/policy/modules/services/w3c.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/services/w3c.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/w3c.te	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,14 @@
 +policy_module(w3c,1.2.1)
 +
@@ -12196,7 +12195,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/xfs.te serefpolicy-2.6.4/policy/modules/services/xfs.te
 --- nsaserefpolicy/policy/modules/services/xfs.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/xfs.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/xfs.te	2008-03-17 03:46:49.000000000 +0100
 @@ -37,6 +37,15 @@
  kernel_read_kernel_sysctls(xfs_t)
  kernel_read_system_state(xfs_t)
@@ -12215,7 +12214,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.
  dev_read_sysfs(xfs_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.6.4/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/xserver.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/xserver.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -92,10 +92,11 @@
  /var/lib/[xkw]dm(/.*)?		gen_context(system_u:object_r:xdm_var_lib_t,s0)
  /var/lib/xkb(/.*)?		gen_context(system_u:object_r:xkb_var_lib_t,s0)
@@ -12231,7 +12230,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
  /var/run/xdmctl(/.*)?		gen_context(system_u:object_r:xdm_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.6.4/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/xserver.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/xserver.if	2008-03-17 03:46:49.000000000 +0100
 @@ -83,6 +83,8 @@
  	manage_files_pattern($1_xserver_t,xserver_log_t,xserver_log_t)
  	logging_log_filetrans($1_xserver_t,xserver_log_t,file)
@@ -12275,7 +12274,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-2.6.4/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-05-07 20:50:57.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/services/xserver.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/services/xserver.te	2008-03-17 03:46:49.000000000 +0100
 @@ -228,6 +228,7 @@
  files_read_usr_files(xdm_t)
  # Poweroff wants to create the /poweroff file when run from xdm
@@ -12297,12 +12296,12 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
  # perhaps define derived types.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.fc serefpolicy-2.6.4/policy/modules/system/application.fc
 --- nsaserefpolicy/policy/modules/system/application.fc	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/system/application.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/application.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1 @@
 +# No application file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.if serefpolicy-2.6.4/policy/modules/system/application.if
 --- nsaserefpolicy/policy/modules/system/application.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/system/application.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/application.if	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,104 @@
 +## <summary>Policy for application domains</summary>
 +
@@ -12410,7 +12409,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-2.6.4/policy/modules/system/application.te
 --- nsaserefpolicy/policy/modules/system/application.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/system/application.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/application.te	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,14 @@
 +
 +policy_module(application,1.0.0)
@@ -12428,7 +12427,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-2.6.4/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -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)
@@ -12439,7 +12438,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-2.6.4/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.if	2008-03-17 03:46:49.000000000 +0100
 @@ -27,11 +27,9 @@
  	domain_type($1_chkpwd_t)
  	domain_entry_file($1_chkpwd_t,chkpwd_exec_t)
@@ -12764,7 +12763,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-2.6.4/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2008-03-17 03:46:49.000000000 +0100
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -12870,13 +12869,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
 +logging_send_syslog_msg(updpwd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.fc serefpolicy-2.6.4/policy/modules/system/brctl.fc
 --- nsaserefpolicy/policy/modules/system/brctl.fc	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/system/brctl.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/brctl.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,2 @@
 +
 +/usr/sbin/brctl		--	gen_context(system_u:object_r:brctl_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.if serefpolicy-2.6.4/policy/modules/system/brctl.if
 --- nsaserefpolicy/policy/modules/system/brctl.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/system/brctl.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/brctl.if	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,24 @@
 +
 +## <summary>policy for brctl</summary>
@@ -12904,7 +12903,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.te serefpolicy-2.6.4/policy/modules/system/brctl.te
 --- nsaserefpolicy/policy/modules/system/brctl.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/system/brctl.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/brctl.te	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,51 @@
 +policy_module(brctl,1.0.0)
 +
@@ -12959,7 +12958,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/clock.te serefpolicy-2.6.4/policy/modules/system/clock.te
 --- nsaserefpolicy/policy/modules/system/clock.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/clock.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/clock.te	2008-03-17 03:46:49.000000000 +0100
 @@ -26,8 +26,6 @@
  allow hwclock_t self:process signal_perms;
  allow hwclock_t self:fifo_file { getattr read write };
@@ -12985,7 +12984,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/clock.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.6.4/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/fstools.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/fstools.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -19,7 +19,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)
@@ -12996,7 +12995,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-2.6.4/policy/modules/system/fstools.if
 --- nsaserefpolicy/policy/modules/system/fstools.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/fstools.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/fstools.if	2008-03-17 03:46:49.000000000 +0100
 @@ -124,3 +124,40 @@
  
  	allow $1 swapfile_t:file getattr;
@@ -13040,7 +13039,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-2.6.4/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/fstools.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/fstools.te	2008-03-17 03:46:49.000000000 +0100
 @@ -9,6 +9,7 @@
  type fsadm_t;
  type fsadm_exec_t;
@@ -13083,7 +13082,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.fc serefpolicy-2.6.4/policy/modules/system/fusermount.fc
 --- nsaserefpolicy/policy/modules/system/fusermount.fc	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/system/fusermount.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/fusermount.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,6 @@
 +# fusermount executable will have:
 +# label: system_u:object_r:fusermount_exec_t
@@ -13093,7 +13092,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-2.6.4/policy/modules/system/fusermount.if
 --- nsaserefpolicy/policy/modules/system/fusermount.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/system/fusermount.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/fusermount.if	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,41 @@
 +## <summary>policy for fusermount</summary>
 +
@@ -13139,7 +13138,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-2.6.4/policy/modules/system/fusermount.te
 --- nsaserefpolicy/policy/modules/system/fusermount.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-2.6.4/policy/modules/system/fusermount.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/fusermount.te	2008-03-17 03:46:49.000000000 +0100
 @@ -0,0 +1,48 @@
 +policy_module(fusermount,1.0.0)
 +
@@ -13191,7 +13190,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-2.6.4/policy/modules/system/getty.te
 --- nsaserefpolicy/policy/modules/system/getty.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/getty.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/getty.te	2008-03-17 03:46:49.000000000 +0100
 @@ -33,7 +33,8 @@
  #
  
@@ -13204,7 +13203,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-2.6.4/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/hostname.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/hostname.te	2008-03-17 03:46:49.000000000 +0100
 @@ -8,8 +8,12 @@
  
  type hostname_t;
@@ -13233,7 +13232,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.fc serefpolicy-2.6.4/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/init.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/init.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -9,15 +9,13 @@
  
  /etc/rc\.d/init\.d/.*	--	gen_context(system_u:object_r:initrc_exec_t,s0)
@@ -13254,7 +13253,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.f
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.6.4/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/init.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/init.if	2008-03-17 03:46:49.000000000 +0100
 @@ -194,11 +194,14 @@
  	gen_require(`
  		type initrc_t;
@@ -13503,7 +13502,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-2.6.4/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/init.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/init.te	2008-03-17 03:46:49.000000000 +0100
 @@ -10,13 +10,20 @@
  # Declarations
  #
@@ -13631,7 +13630,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-2.6.4/policy/modules/system/ipsec.if
 --- nsaserefpolicy/policy/modules/system/ipsec.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/ipsec.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/ipsec.if	2008-03-17 03:46:49.000000000 +0100
 @@ -114,6 +114,26 @@
  
  ########################################
@@ -13661,7 +13660,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-2.6.4/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/ipsec.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/ipsec.te	2008-03-17 03:46:49.000000000 +0100
 @@ -289,6 +289,7 @@
  allow racoon_t self:netlink_selinux_socket { bind create read };
  allow racoon_t self:udp_socket create_socket_perms;
@@ -13672,7 +13671,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-2.6.4/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/iptables.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/iptables.te	2008-03-17 03:46:49.000000000 +0100
 @@ -36,6 +36,8 @@
  allow iptables_t iptables_tmp_t:file manage_file_perms;
  files_tmp_filetrans(iptables_t, iptables_tmp_t, { file dir })
@@ -13722,7 +13721,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptabl
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-2.6.4/policy/modules/system/iscsi.te
 --- nsaserefpolicy/policy/modules/system/iscsi.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/iscsi.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/iscsi.te	2008-03-17 03:46:49.000000000 +0100
 @@ -67,6 +67,8 @@
  
  files_read_etc_files(iscsid_t)
@@ -13734,7 +13733,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.6.4/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/libraries.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/libraries.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -9,6 +9,8 @@
  /emul/ia32-linux/lib/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
  /emul/ia32-linux/lib(/.*)?/ld-[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:ld_so_t,s0)
@@ -13799,7 +13798,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
 +/opt/Adobe/Reader8/Reader/intellinux/plug_ins/.*\.api	 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.6.4/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/libraries.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/libraries.te	2008-03-17 03:46:49.000000000 +0100
 @@ -55,14 +55,15 @@
  # ldconfig local policy
  #
@@ -13856,7 +13855,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.6.4/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/locallogin.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/locallogin.te	2008-03-17 03:46:49.000000000 +0100
 @@ -48,6 +48,8 @@
  allow local_login_t self:msgq create_msgq_perms;
  allow local_login_t self:msg { send receive };
@@ -13904,7 +13903,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locall
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.6.4/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/logging.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/logging.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -43,3 +43,5 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -13913,7 +13912,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-2.6.4/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/logging.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/logging.if	2008-03-17 03:46:49.000000000 +0100
 @@ -223,6 +223,25 @@
  
  ########################################
@@ -14108,7 +14107,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-2.6.4/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/logging.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/logging.te	2008-03-17 03:46:49.000000000 +0100
 @@ -7,10 +7,15 @@
  #
  
@@ -14219,7 +14218,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-2.6.4/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/lvm.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/lvm.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -15,6 +15,7 @@
  #
  /etc/lvm(/.*)?			gen_context(system_u:object_r:lvm_etc_t,s0)
@@ -14230,7 +14229,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-2.6.4/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/lvm.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/lvm.te	2008-03-17 03:46:49.000000000 +0100
 @@ -16,6 +16,7 @@
  type lvm_t;
  type lvm_exec_t;
@@ -14311,7 +14310,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/modutils.te serefpolicy-2.6.4/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/modutils.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/modutils.te	2008-03-17 03:46:49.000000000 +0100
 @@ -43,7 +43,7 @@
  # insmod local policy
  #
@@ -14383,7 +14382,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/moduti
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-2.6.4/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/mount.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/mount.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -1,4 +1,2 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -14391,7 +14390,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 -/usr/bin/fusermount		--	gen_context(system_u:object_r:mount_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.6.4/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/mount.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/mount.te	2008-03-17 03:46:49.000000000 +0100
 @@ -9,6 +9,13 @@
  ifdef(`targeted_policy',`
  ## <desc>
@@ -14559,7 +14558,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-2.6.4/policy/modules/system/netlabel.te
 --- nsaserefpolicy/policy/modules/system/netlabel.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/netlabel.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/netlabel.te	2008-03-17 03:46:49.000000000 +0100
 @@ -20,6 +20,10 @@
  allow netlabel_mgmt_t self:capability net_admin;
  allow netlabel_mgmt_t self:netlink_socket create_socket_perms;
@@ -14573,7 +14572,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-2.6.4/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/raid.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/raid.te	2008-03-17 03:46:49.000000000 +0100
 @@ -19,7 +19,7 @@
  # Local policy
  #
@@ -14601,7 +14600,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.t
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.6.4/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -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)
@@ -14612,7 +14611,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-2.6.4/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.if	2008-03-17 03:46:49.000000000 +0100
 @@ -445,6 +445,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -14678,7 +14677,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.4/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te	2008-03-17 03:46:49.000000000 +0100
 @@ -1,10 +1,8 @@
  
  policy_module(selinuxutil,1.5.0)
@@ -14921,7 +14920,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-2.6.4/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.if	2008-03-17 03:46:49.000000000 +0100
 @@ -520,6 +520,9 @@
  
  	files_search_etc($1)
@@ -14934,7 +14933,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-2.6.4/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.te	2008-03-17 03:46:49.000000000 +0100
 @@ -45,7 +45,7 @@
  dontaudit dhcpc_t self:capability sys_tty_config;
  # for access("/etc/bashrc", X_OK) on Red Hat
@@ -14984,7 +14983,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnet
  allow ifconfig_t self:udp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.6.4/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/udev.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/udev.te	2008-03-17 03:46:49.000000000 +0100
 @@ -18,11 +18,6 @@
  type udev_etc_t alias etc_udev_t;
  files_config_file(udev_etc_t)
@@ -15120,7 +15119,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.fc serefpolicy-2.6.4/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/unconfined.fc	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/unconfined.fc	2008-03-17 03:46:49.000000000 +0100
 @@ -10,4 +10,5 @@
  /usr/bin/valgrind 		--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -15129,7 +15128,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.if serefpolicy-2.6.4/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/unconfined.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/unconfined.if	2008-03-17 03:46:49.000000000 +0100
 @@ -18,7 +18,7 @@
  	')
  
@@ -15233,7 +15232,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-2.6.4/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2008-03-17 03:46:49.000000000 +0100
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -15335,7 +15334,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
  		dbus_stub(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.6.4/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/userdomain.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/userdomain.if	2008-03-17 03:46:49.000000000 +0100
 @@ -114,6 +114,22 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -15922,7 +15921,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-2.6.4/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/userdomain.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/userdomain.te	2008-03-17 03:46:49.000000000 +0100
 @@ -15,7 +15,6 @@
  # Declarations
  #
@@ -16120,7 +16119,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.if serefpolicy-2.6.4/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2007-05-07 20:51:01.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/xen.if	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/xen.if	2008-03-17 03:46:49.000000000 +0100
 @@ -72,12 +72,34 @@
  	')
  
@@ -16205,7 +16204,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.6.4/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-05-07 20:51:02.000000000 +0200
-+++ serefpolicy-2.6.4/policy/modules/system/xen.te	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/modules/system/xen.te	2008-03-17 03:46:49.000000000 +0100
 @@ -25,6 +25,10 @@
  domain_type(xend_t)
  init_daemon_domain(xend_t, xend_exec_t)
@@ -16349,7 +16348,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_patterns.spt serefpolicy-2.6.4/policy/support/misc_patterns.spt
 --- nsaserefpolicy/policy/support/misc_patterns.spt	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/support/misc_patterns.spt	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/support/misc_patterns.spt	2008-03-17 03:46:49.000000000 +0100
 @@ -41,11 +41,6 @@
  #
  # Other process permissions
@@ -16364,7 +16363,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_patterns
  	allow $1 $2:{ file lnk_file } { read getattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.6.4/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/policy/support/obj_perm_sets.spt	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/policy/support/obj_perm_sets.spt	2008-03-17 03:46:49.000000000 +0100
 @@ -203,7 +203,6 @@
  define(`add_entry_dir_perms',`{ getattr search lock ioctl write add_name }')
  define(`del_entry_dir_perms',`{ getattr search lock ioctl write remove_name }')
@@ -16398,7 +16397,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.6.4/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-07 20:51:05.000000000 +0200
-+++ serefpolicy-2.6.4/Rules.modular	2008-03-07 23:27:34.000000000 +0100
++++ serefpolicy-2.6.4/Rules.modular	2008-03-17 03:46:49.000000000 +0100
 @@ -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