From 8cd496f1d6d32737142400f8b6633728cc6831e1 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: May 14 2007 18:10:58 +0000
Subject: - Update to latest from upstream


---

diff --git a/.cvsignore b/.cvsignore
index 6154046..03c8f64 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -116,3 +116,4 @@ serefpolicy-2.5.12.tgz
 serefpolicy-2.6.1.tgz
 serefpolicy-2.6.2.tgz
 serefpolicy-2.6.3.tgz
+serefpolicy-2.6.4.tgz
diff --git a/policy-20070501.patch b/policy-20070501.patch
index 54f6a57..f5963f7 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-04-02 10:58:34.000000000 -0400
-+++ serefpolicy-2.6.4/man/man8/ftpd_selinux.8	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/man/man8/ftpd_selinux.8	2007-05-08 09:59:33.000000000 -0400
 @@ -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-02-26 09:43:33.000000000 -0500
-+++ serefpolicy-2.6.4/policy/flask/access_vectors	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/flask/access_vectors	2007-05-08 09:59:33.000000000 -0400
 @@ -598,6 +598,8 @@
  	shmempwd
  	shmemgrp
@@ -33,7 +33,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors 
  class key
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.6.4/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.4/policy/global_booleans	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/global_booleans	2007-05-08 09:59:33.000000000 -0400
 @@ -4,7 +4,6 @@
  # file should be used.
  #
@@ -52,7 +52,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-03-26 16:24:14.000000000 -0400
-+++ serefpolicy-2.6.4/policy/global_tunables	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/global_tunables	2007-05-08 09:59:33.000000000 -0400
 @@ -102,12 +102,6 @@
  ## </desc>
  gen_tunable(use_samba_home_dirs,false)
@@ -81,7 +81,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-03-09 13:02:20.000000000 -0500
-+++ serefpolicy-2.6.4/policy/mls	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/mls	2007-05-08 09:59:33.000000000 -0400
 @@ -89,12 +89,14 @@
  mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
  	(( l1 eq l2 ) or
@@ -155,7 +155,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-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/acct.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/acct.te	2007-05-08 09:59:33.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -166,7 +166,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	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/admin/alsa.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/alsa.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -1,4 +1,5 @@
  
  /etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
@@ -175,14 +175,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc
  /usr/bin/ainit 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/admin/amtu.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/amtu.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/admin/amtu.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/amtu.if	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,53 @@
 +## <summary>
 +##	abstract Machine Test Utility 
@@ -239,7 +239,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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/admin/amtu.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/amtu.te	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,57 @@
 +policy_module(amtu,1.0.23)
 +
@@ -300,7 +300,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/bootloader.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/bootloader.te	2007-05-08 09:59:33.000000000 -0400
 @@ -65,6 +65,8 @@
  files_tmp_filetrans(bootloader_t,bootloader_tmp_t,{ dir file lnk_file chr_file blk_file })
  # for tune2fs (cjp: ?)
@@ -320,7 +320,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/consoletype.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/consoletype.te	2007-05-08 09:59:33.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -354,7 +354,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	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/admin/dmesg.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/dmesg.te	2007-05-08 09:59:33.000000000 -0400
 @@ -10,6 +10,7 @@
  	type dmesg_t;
  	type dmesg_exec_t;
@@ -365,7 +365,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/kudzu.te serefpolicy-2.6.4/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/kudzu.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/kudzu.te	2007-05-08 09:59:33.000000000 -0400
 @@ -21,8 +21,8 @@
  # Local policy
  #
@@ -388,7 +388,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-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/logrotate.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/logrotate.te	2007-05-08 09:59:33.000000000 -0400
 @@ -75,6 +75,7 @@
  mls_file_read_up(logrotate_t)
  mls_file_write_down(logrotate_t)
@@ -399,7 +399,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-02 15:04:46.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/logwatch.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/logwatch.te	2007-05-08 09:59:33.000000000 -0400
 @@ -63,6 +63,8 @@
  files_search_mnt(logwatch_t)
  files_dontaudit_search_home(logwatch_t)
@@ -411,7 +411,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatc
  fs_dontaudit_list_auto_mountpoints(logwatch_t)
 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-04-30 10:41:38.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/netutils.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/netutils.te	2007-05-08 09:59:33.000000000 -0400
 @@ -31,6 +31,7 @@
  type traceroute_t;
  type traceroute_exec_t;
@@ -422,7 +422,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutil
  ########################################
 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-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/admin/readahead.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/readahead.te	2007-05-08 09:59:33.000000000 -0400
 @@ -18,7 +18,8 @@
  # Local policy
  #
@@ -452,7 +452,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	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/admin/rpm.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/rpm.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -21,6 +21,9 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -465,7 +465,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-04-11 10:19:43.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/rpm.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/rpm.if	2007-05-08 09:59:33.000000000 -0400
 @@ -225,8 +225,29 @@
  		type rpm_script_tmp_t;
  	')
@@ -546,7 +546,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/rpm.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/rpm.te	2007-05-08 09:59:33.000000000 -0400
 @@ -9,6 +9,8 @@
  type rpm_t;
  type rpm_exec_t;
@@ -558,7 +558,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-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/sudo.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/sudo.if	2007-05-08 09:59:33.000000000 -0400
 @@ -69,7 +69,6 @@
  	allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_sudo_t self:unix_dgram_socket sendto;
@@ -607,7 +607,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-04-30 10:41:38.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/su.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/su.if	2007-05-08 09:59:33.000000000 -0400
 @@ -41,12 +41,11 @@
  
  	allow $2 $1_su_t:process signal;
@@ -682,7 +682,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-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/usermanage.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/usermanage.if	2007-05-08 09:59:33.000000000 -0400
 @@ -278,5 +278,5 @@
  		type crack_db_t;
  	')
@@ -692,7 +692,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/usermanage.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/usermanage.te	2007-05-08 09:59:33.000000000 -0400
 @@ -184,7 +184,7 @@
  # Groupadd local policy
  #
@@ -854,7 +854,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	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/admin/vbetool.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/vbetool.te	2007-05-08 09:59:33.000000000 -0400
 @@ -32,4 +32,5 @@
  
  optional_policy(`
@@ -863,7 +863,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool
  ')
 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-02-19 11:32:52.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/apps/gnome.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/apps/gnome.if	2007-05-08 09:59:33.000000000 -0400
 @@ -35,6 +35,7 @@
  template(`gnome_per_role_template',`
  	gen_require(`
@@ -919,7 +919,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	2006-11-16 17:15:07.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/apps/gpg.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/apps/gpg.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -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)
@@ -929,7 +929,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/loadkeys.if serefpolicy-2.6.4/policy/modules/apps/loadkeys.if
 --- nsaserefpolicy/policy/modules/apps/loadkeys.if	2007-01-02 12:57:22.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/apps/loadkeys.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/apps/loadkeys.if	2007-05-08 09:59:33.000000000 -0400
 @@ -11,16 +11,12 @@
  ## </param>
  #
@@ -998,7 +998,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-03-26 16:24:09.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/apps/mozilla.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/apps/mozilla.if	2007-05-08 09:59:33.000000000 -0400
 @@ -150,6 +150,7 @@
  	corenet_dontaudit_tcp_bind_generic_port($1_mozilla_t)
  
@@ -1009,7 +1009,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-04-30 11:25:12.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/apps/slocate.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/apps/slocate.te	2007-05-08 09:59:33.000000000 -0400
 @@ -43,7 +43,7 @@
  files_read_etc_files(locate_t)
  
@@ -1021,7 +1021,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-03-26 10:38:58.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/apps/uml.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/apps/uml.if	2007-05-08 09:59:33.000000000 -0400
 @@ -193,33 +193,6 @@
  		nis_use_ypbind($1_uml_t)
  	')
@@ -1058,7 +1058,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/kernel/corecommands.fc serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-04-11 15:52:53.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -1079,7 +1079,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
 +
 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-03-26 10:38:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.if	2007-05-08 09:59:33.000000000 -0400
 @@ -988,3 +988,23 @@
  
  	mmap_files_pattern($1,bin_t,exec_type)
@@ -1106,7 +1106,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.te.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-05-07 10:32:44.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-05-08 09:59:33.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -1157,7 +1157,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-03-01 10:01:48.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -19,6 +19,7 @@
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
@@ -1176,8 +1176,8 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  /dev/cpu/mtrr		-c	gen_context(system_u:object_r:mtrr_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-03-26 16:24:09.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.if	2007-05-07 11:27:37.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2007-05-07 14:50:42.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.if	2007-05-08 09:59:33.000000000 -0400
 @@ -2729,6 +2729,24 @@
  
  ########################################
@@ -1203,32 +1203,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  ##	Do not audit attempts to get the attributes
  ##	of a directory in the usb filesystem.
  ## </summary>
-@@ -2939,6 +2957,24 @@
- 
- ########################################
- ## <summary>
-+##	write the video4linux devices.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`dev_write_video_dev',`
-+	gen_require(`
-+		type device_t, v4l_device_t;
-+	')
-+
-+	write_chr_files_pattern($1,device_t,v4l_device_t)
-+')
-+
-+########################################
-+## <summary>
- ##	Read and write VMWare devices.
- ## </summary>
- ## <param name="domain">
-@@ -3192,3 +3228,78 @@
+@@ -3210,3 +3228,78 @@
  
  	typeattribute $1 devices_unconfined_type;
  ')
@@ -1308,8 +1283,8 @@ 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-04-23 09:35:56.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.te	2007-05-07 11:27:37.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/devices.te	2007-05-07 14:50:42.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.te	2007-05-08 09:59:33.000000000 -0400
 @@ -139,6 +139,12 @@
  #
  # Type for sound devices and mixers
@@ -1325,7 +1300,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-02-19 11:32:51.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/kernel/domain.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/domain.if	2007-05-08 09:59:33.000000000 -0400
 @@ -1254,3 +1254,21 @@
  	typeattribute $1 can_change_object_identity;
  	typeattribute $1 set_curr_context;
@@ -1350,7 +1325,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-04-23 09:35:56.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/domain.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/domain.te	2007-05-08 09:59:33.000000000 -0400
 @@ -6,6 +6,29 @@
  # Declarations
  #
@@ -1410,7 +1385,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	2006-11-16 17:15:04.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/kernel/files.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/files.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -54,6 +54,7 @@
  /etc/issue\.net		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/localtime		-l	gen_context(system_u:object_r:etc_t,s0)
@@ -1421,7 +1396,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.
  /etc/nologin.*		--	gen_context(system_u:object_r:etc_runtime_t,s0)
 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-02-26 14:17:21.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2007-05-08 09:59:33.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -1600,7 +1575,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.
 +')
 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-03-26 16:24:09.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.if	2007-05-08 09:59:33.000000000 -0400
 @@ -1096,6 +1096,24 @@
  
  ########################################
@@ -1678,7 +1653,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-04-23 09:35:56.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.te	2007-05-08 09:59:33.000000000 -0400
 @@ -54,17 +54,30 @@
  
  type capifs_t;
@@ -1725,7 +1700,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesy
  genfscon nfsd / gen_context(system_u:object_r:nfsd_fs_t,s0)
 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-02 15:04:46.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/kernel.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/kernel.if	2007-05-08 09:59:33.000000000 -0400
 @@ -1848,6 +1848,26 @@
  
  ########################################
@@ -1765,7 +1740,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-02 15:04:46.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/kernel.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/kernel.te	2007-05-08 09:59:33.000000000 -0400
 @@ -146,6 +146,8 @@
  type unlabeled_t;
  sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)
@@ -1785,7 +1760,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.6.4/policy/modules/kernel/mls.if
 --- nsaserefpolicy/policy/modules/kernel/mls.if	2006-11-16 17:15:04.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/kernel/mls.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/mls.if	2007-05-08 09:59:33.000000000 -0400
 @@ -154,6 +154,26 @@
  ########################################
  ## <summary>
@@ -1815,7 +1790,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-01-02 12:57:13.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/kernel/mls.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/mls.te	2007-05-08 09:59:33.000000000 -0400
 @@ -18,6 +18,7 @@
  attribute mlsnetreadtoclr;
  attribute mlsnetwrite;
@@ -1835,7 +1810,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-02-27 14:37:10.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/kernel/selinux.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/selinux.if	2007-05-08 09:59:33.000000000 -0400
 @@ -51,6 +51,44 @@
  
  ########################################
@@ -1883,7 +1858,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.if serefpolicy-2.6.4/policy/modules/kernel/storage.if
 --- nsaserefpolicy/policy/modules/kernel/storage.if	2007-01-02 12:57:13.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/kernel/storage.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/storage.if	2007-05-08 09:59:33.000000000 -0400
 @@ -100,6 +100,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -1902,7 +1877,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.if serefpolicy-2.6.4/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2007-02-20 16:35:52.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/kernel/terminal.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/terminal.if	2007-05-08 09:59:33.000000000 -0400
 @@ -278,6 +278,25 @@
  
  ########################################
@@ -1940,7 +1915,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-04-23 09:35:56.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/terminal.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/terminal.te	2007-05-08 09:59:33.000000000 -0400
 @@ -28,6 +28,7 @@
  type devpts_t;
  files_mountpoint(devpts_t)
@@ -1951,7 +1926,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-04-30 11:25:12.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/aide.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/aide.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -2,5 +2,5 @@
  
  /var/lib/aide(/.*)		gen_context(system_u:object_r:aide_db_t,mls_systemhigh)
@@ -1961,7 +1936,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-04-30 11:25:12.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/aide.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/aide.te	2007-05-08 09:59:33.000000000 -0400
 @@ -26,7 +26,7 @@
  
  allow aide_t self:capability { dac_override fowner };
@@ -1973,7 +1948,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-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/amavis.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/amavis.if	2007-05-08 09:59:33.000000000 -0400
 @@ -167,3 +167,22 @@
  	allow $1 amavis_var_run_t:file setattr;
  	files_search_pids($1)
@@ -1999,7 +1974,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amav
 +')
 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-02-23 16:50:01.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/apache.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apache.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -1,10 +1,5 @@
  # temporary hack till genhomedircon is fixed
 -ifdef(`targeted_policy',`
@@ -2033,7 +2008,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.6.4/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-04-02 10:58:34.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apache.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apache.if	2007-05-08 09:59:33.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -2254,7 +2229,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apache.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apache.te	2007-05-08 09:59:33.000000000 -0400
 @@ -106,6 +106,27 @@
  ## </desc>
  gen_tunable(httpd_unified,false)
@@ -2420,7 +2395,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 11:11:55.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apcupsd.fc	2007-05-07 11:45:20.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apcupsd.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -3,3 +3,8 @@
  /var/log/apcupsd\.events.*	--	gen_context(system_u:object_r:apcupsd_log_t,s0)
  
@@ -2432,7 +2407,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 11:11:55.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apcupsd.if	2007-05-07 11:45:44.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apcupsd.if	2007-05-08 09:59:33.000000000 -0400
 @@ -79,3 +79,25 @@
  	allow $1 apcupsd_log_t:dir list_dir_perms;
  	allow $1 apcupsd_log_t:file { getattr append };
@@ -2461,7 +2436,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 11:11:55.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apcupsd.te	2007-05-07 11:56:18.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apcupsd.te	2007-05-08 09:59:33.000000000 -0400
 @@ -24,6 +24,7 @@
  # apcupsd local policy
  #
@@ -2510,7 +2485,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
 +
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/automount.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/automount.te	2007-05-08 09:59:33.000000000 -0400
 @@ -69,6 +69,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -2529,7 +2504,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/auto
  domain_use_interactive_fds(automount_t)
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/bind.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/bind.te	2007-05-08 09:59:33.000000000 -0400
 @@ -236,6 +236,7 @@
  corenet_tcp_sendrecv_all_nodes(ndc_t)
  corenet_tcp_sendrecv_all_ports(ndc_t)
@@ -2540,7 +2515,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/clamav.te serefpolicy-2.6.4/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/clamav.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/clamav.te	2007-05-08 09:59:33.000000000 -0400
 @@ -126,6 +126,7 @@
  	amavis_read_lib_files(clamd_t)
  	amavis_read_spool_files(clamd_t)
@@ -2551,7 +2526,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-04 12:19:22.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/consolekit.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/consolekit.te	2007-05-08 09:59:33.000000000 -0400
 @@ -10,7 +10,6 @@
  type consolekit_exec_t;
  init_daemon_domain(consolekit_t, consolekit_exec_t)
@@ -2596,7 +2571,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cons
 +
 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	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/cron.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cron.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -45,3 +45,4 @@
  /var/spool/fcron/systab\.orig	--	gen_context(system_u:object_r:system_cron_spool_t,s0)
  /var/spool/fcron/systab		--	gen_context(system_u:object_r:system_cron_spool_t,s0)
@@ -2604,7 +2579,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-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/cron.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cron.if	2007-05-08 09:59:33.000000000 -0400
 @@ -35,6 +35,7 @@
  #
  template(`cron_per_role_template',`
@@ -2715,7 +2690,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
  		# fcron wants an instant update of a crontab change for the administrator
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.6.4/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/cron.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cron.te	2007-05-08 09:59:33.000000000 -0400
 @@ -42,6 +42,9 @@
  type cron_log_t;
  logging_log_file(cron_log_t)
@@ -2855,7 +2830,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	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/cups.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cups.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -8,6 +8,7 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -2866,7 +2841,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 serefpolicy-2.6.4/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/cups.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cups.te	2007-05-11 18:40:14.000000000 -0400
 @@ -93,8 +93,6 @@
  # generic socket here until appletalk socket is available in kernels
  allow cupsd_t self:socket create_socket_perms;
@@ -2896,7 +2871,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
  
  miscfiles_read_localization(cupsd_t)
  # invoking ghostscript needs to read fonts
-@@ -284,6 +285,10 @@
+@@ -223,6 +224,7 @@
+ 
+ sysnet_read_config(cupsd_t)
+ 
++files_dontaudit_list_home(cupsd_t)
+ userdom_dontaudit_use_unpriv_user_fds(cupsd_t)
+ userdom_dontaudit_search_all_users_home_content(cupsd_t)
+ 
+@@ -284,6 +286,10 @@
  ')
  
  optional_policy(`
@@ -2907,7 +2890,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
  	nscd_socket_use(cupsd_t)
  ')
  
-@@ -294,6 +299,10 @@
+@@ -294,6 +300,10 @@
  ')
  
  optional_policy(`
@@ -2920,7 +2903,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/cvs.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cvs.te	2007-05-08 09:59:33.000000000 -0400
 @@ -16,6 +16,7 @@
  type cvs_t;
  type cvs_exec_t;
@@ -2931,7 +2914,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.
  type cvs_data_t; # customizable
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/cyrus.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cyrus.te	2007-05-08 09:59:33.000000000 -0400
 @@ -145,6 +145,7 @@
  
  optional_policy(`
@@ -2942,7 +2925,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-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/dbus.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/dbus.if	2007-05-08 09:59:33.000000000 -0400
 @@ -49,6 +49,12 @@
  ## </param>
  #
@@ -3064,7 +3047,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/dbus.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/dbus.te	2007-05-08 09:59:33.000000000 -0400
 @@ -40,8 +40,6 @@
  # Receive notifications of policy reloads and enforcing status changes.
  allow system_dbusd_t self:netlink_selinux_socket { create bind read };
@@ -3095,7 +3078,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-2.6.4/policy/modules/services/dhcp.te
 --- nsaserefpolicy/policy/modules/services/dhcp.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/dhcp.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/dhcp.te	2007-05-08 09:59:33.000000000 -0400
 @@ -119,6 +119,8 @@
  	dbus_system_bus_client_template(dhcpd,dhcpd_t)
  	dbus_connect_system_bus(dhcpd_t)
@@ -3107,7 +3090,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/djbdns.te serefpolicy-2.6.4/policy/modules/services/djbdns.te
 --- nsaserefpolicy/policy/modules/services/djbdns.te	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/djbdns.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/djbdns.te	2007-05-08 09:59:33.000000000 -0400
 @@ -44,4 +44,7 @@
  libs_use_ld_so(djbdns_axfrdns_t)
  libs_use_shared_libs(djbdns_axfrdns_t)
@@ -3119,7 +3102,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	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/dovecot.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/dovecot.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -17,10 +17,12 @@
  
  ifdef(`distro_debian', `
@@ -3135,7 +3118,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-2.6.4/policy/modules/services/dovecot.if
 --- nsaserefpolicy/policy/modules/services/dovecot.if	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/dovecot.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/dovecot.if	2007-05-08 09:59:33.000000000 -0400
 @@ -18,3 +18,43 @@
  	manage_files_pattern($1,dovecot_spool_t,dovecot_spool_t)
  	manage_lnk_files_pattern($1,dovecot_spool_t,dovecot_spool_t)
@@ -3182,7 +3165,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 10:32:44.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/dovecot.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/dovecot.te	2007-05-08 09:59:33.000000000 -0400
 @@ -15,6 +15,12 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -3214,7 +3197,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
  
  optional_policy(`
 -	udev_read_db(dovecot_t)
-+	squid_dontaudit_search_squid_cache(dovecot_t)
++	squid_dontaudit_search_cache(dovecot_t)
  ')
  
  ########################################
@@ -3303,7 +3286,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.6.4/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/ftp.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ftp.te	2007-05-08 09:59:33.000000000 -0400
 @@ -223,10 +223,15 @@
  	userdom_manage_all_users_home_content_dirs(ftpd_t)
  	userdom_manage_all_users_home_content_files(ftpd_t)
@@ -3321,24 +3304,37 @@ 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-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/hal.fc	2007-05-07 11:27:37.000000000 -0400
-@@ -8,4 +8,12 @@
+--- nsaserefpolicy/policy/modules/services/hal.fc	2007-05-07 14:50:43.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/hal.fc	2007-05-10 16:08:49.000000000 -0400
+@@ -2,15 +2,20 @@
+ /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)
+ 
+-/usr/libexec/hal-acl-tool		--	gen_context(system_u:object_r:hald_acl_exec_t,s0)
+ /usr/libexec/hal-hotplug-map 		--	gen_context(system_u:object_r:hald_exec_t,s0)
+-/usr/libexec/hal-system-sonypic	 	--	gen_context(system_u:object_r:hald_sonypic_exec_t,s0)
+-/usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
+ 
+ /usr/sbin/hald		--			gen_context(system_u:object_r:hald_exec_t,s0)
  
+-/var/cache/hald(/.*)?				gen_context(system_u:object_r:hald_cache_t,s0)
+-
  /var/lib/hal(/.*)?				gen_context(system_u:object_r:hald_var_lib_t,s0)
  
 +/var/cache/hald(/.*)?				gen_context(system_u:object_r:hald_cache_t,s0)
 +
  /var/run/haldaemon.pid	--	 		gen_context(system_u:object_r:hald_var_run_t,s0)
++/var/run/vbestate 	--			gen_context(system_u:object_r:hald_var_run_t,s0)
 +
 +/usr/libexec/hal-acl-tool		--	gen_context(system_u:object_r:hald_acl_exec_t,s0)
 +/usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
 +/usr/libexec/hal-system-sonypic	 --	gen_context(system_u:object_r:hald_sonypic_exec_t,s0)
 +
 +/var/log/pm-suspend.log				gen_context(system_u:object_r:hald_log_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-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/hal.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/hal.if	2007-05-08 09:59:33.000000000 -0400
 @@ -208,3 +208,98 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -3439,84 +3435,18 @@ 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/hal.te	2007-05-07 11:27:37.000000000 -0400
-@@ -16,9 +16,33 @@
- type hald_var_run_t;
- files_pid_file(hald_var_run_t)
- 
-+type hald_cache_t;
-+files_pid_file(hald_cache_t)
-+
- type hald_var_lib_t;
- files_type(hald_var_lib_t)
- 
-+type hald_log_t;
-+files_type(hald_log_t)
-+
-+type hald_acl_t;
-+type hald_acl_exec_t;
-+domain_type(hald_acl_t)
-+domain_entry_file(hald_acl_t,hald_acl_exec_t)
-+role system_r types hald_acl_t;
-+
-+type hald_mac_t;
-+type hald_mac_exec_t;
-+domain_type(hald_mac_t)
-+domain_entry_file(hald_mac_t,hald_mac_exec_t)
-+role system_r types hald_mac_t;
-+
-+type hald_sonypic_t;
-+type hald_sonypic_exec_t;
-+domain_type(hald_sonypic_t)
-+domain_entry_file(hald_sonypic_t,hald_sonypic_exec_t)
-+role system_r types hald_sonypic_t;
-+
- ########################################
- #
- # Local policy
-@@ -26,7 +50,7 @@
- 
- # execute openvt which needs setuid
- allow hald_t self:capability { chown setuid setgid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio sys_tty_config };
--dontaudit hald_t self:capability sys_tty_config;
-+dontaudit hald_t self:capability {sys_ptrace sys_tty_config };
- allow hald_t self:process signal_perms;
- allow hald_t self:fifo_file rw_fifo_file_perms;
- allow hald_t self:unix_stream_socket { create_stream_socket_perms connectto };
-@@ -37,8 +61,6 @@
+--- nsaserefpolicy/policy/modules/services/hal.te	2007-05-07 14:50:43.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/hal.te	2007-05-08 09:59:33.000000000 -0400
+@@ -61,8 +61,6 @@
  # For backwards compatibility with older kernels
  allow hald_t self:netlink_socket create_socket_perms;
  
 -send_audit_msgs_pattern(hald_t)
 -
- manage_dirs_pattern(hald_t,hald_tmp_t,hald_tmp_t)
- manage_files_pattern(hald_t,hald_tmp_t,hald_tmp_t)
- files_tmp_filetrans(hald_t, hald_tmp_t, { file dir })
-@@ -48,14 +70,20 @@
- manage_files_pattern(hald_t,hald_var_lib_t,hald_var_lib_t)
- manage_sock_files_pattern(hald_t,hald_var_lib_t,hald_var_lib_t)
- 
-+# var/log files for hald
-+allow hald_t hald_log_t:file manage_file_perms;
-+logging_log_filetrans(hald_t,hald_log_t,file)
-+
- manage_files_pattern(hald_t,hald_var_run_t,hald_var_run_t)
- files_pid_filetrans(hald_t,hald_var_run_t,file)
- 
-+manage_files_pattern(hald_t,hald_cache_t,hald_cache_t)
-+
- kernel_read_system_state(hald_t)
- kernel_read_network_state(hald_t)
--kernel_read_kernel_sysctls(hald_t)
-+kernel_rw_kernel_sysctl(hald_t)
- kernel_read_fs_sysctls(hald_t)
--kernel_read_irq_sysctls(hald_t)
-+kernel_rw_irq_sysctls(hald_t)
- kernel_rw_vm_sysctls(hald_t)
- kernel_write_proc_files(hald_t)
- 
-@@ -85,9 +113,13 @@
+ manage_files_pattern(hald_t,hald_cache_t,hald_cache_t)
+ 
+ # log files for hald
+@@ -115,6 +113,9 @@
  dev_rw_power_management(hald_t)
  # hal is now execing pm-suspend
  dev_rw_sysfs(hald_t)
@@ -3526,11 +3456,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
  
  domain_use_interactive_fds(hald_t)
  domain_read_all_domains_state(hald_t)
-+domain_dontaudit_ptrace_all_domains(hald_t)
- 
- files_exec_etc_files(hald_t)
- files_read_etc_files(hald_t)
-@@ -101,9 +133,11 @@
+@@ -132,6 +133,7 @@
  files_create_boot_flag(hald_t)
  files_getattr_all_dirs(hald_t)
  files_read_kernel_img(hald_t)
@@ -3538,22 +3464,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
  
  fs_getattr_all_fs(hald_t)
  fs_search_all(hald_t)
-+fs_list_inotifyfs(hald_t)
- fs_list_auto_mountpoints(hald_t)
- files_getattr_all_mountpoints(hald_t)
- 
-@@ -128,16 +162,17 @@
- auth_use_nsswitch(hald_t)
- 
- init_domtrans_script(hald_t)
--init_write_initctl(hald_t)
- init_read_utmp(hald_t)
- #hal runs shutdown, probably need a shutdown domain
- init_rw_utmp(hald_t)
-+init_telinit(hald_t)
- 
- libs_use_ld_so(hald_t)
- libs_use_shared_libs(hald_t)
+@@ -170,6 +172,7 @@
  libs_exec_ld_so(hald_t)
  libs_exec_lib_files(hald_t)
  
@@ -3561,7 +3472,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
  logging_send_syslog_msg(hald_t)
  logging_search_logs(hald_t)
  
-@@ -148,6 +183,7 @@
+@@ -180,6 +183,7 @@
  
  seutil_read_config(hald_t)
  seutil_read_default_contexts(hald_t)
@@ -3569,123 +3480,20 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
  
  sysnet_read_config(hald_t)
  
-@@ -160,6 +196,10 @@
- ')
- 
- optional_policy(`
-+	alsa_read_rw_config(hald_t)
-+')
-+
-+optional_policy(`
- 	bootloader_domtrans(hald_t)
- ')
+@@ -301,7 +305,10 @@
+ corecmd_exec_bin(hald_acl_t)
  
-@@ -245,3 +285,102 @@
- optional_policy(`
- 	vbetool_domtrans(hald_t)
- ')
-+
-+########################################
-+#
-+# Local hald acl policy
-+#
-+
-+allow hald_acl_t self:capability { dac_override fowner };
-+allow hald_acl_t self : fifo_file read_fifo_file_perms;
-+
-+domtrans_pattern(hald_t, hald_acl_exec_t, hald_acl_t)
-+allow hald_t hald_acl_t : process signal;
-+allow hald_acl_t hald_t : unix_stream_socket connectto;
-+manage_dirs_pattern(hald_acl_t,hald_var_lib_t,hald_var_lib_t)
-+manage_files_pattern(hald_acl_t,hald_var_lib_t,hald_var_lib_t)
-+
-+corecmd_exec_bin(hald_acl_t)
-+
-+dev_getattr_all_chr_files(hald_acl_t)
+ dev_getattr_all_chr_files(hald_acl_t)
 +dev_getattr_generic_usb_dev(hald_acl_t)
 +dev_getattr_video_dev(hald_acl_t)
-+dev_setattr_video_dev(hald_acl_t)
+ dev_setattr_video_dev(hald_acl_t)
 +dev_getattr_sound_dev(hald_acl_t)
-+dev_setattr_sound_dev(hald_acl_t)
-+dev_setattr_generic_usb_dev(hald_acl_t)
-+dev_setattr_usbfs_files(hald_acl_t)
-+
-+libs_use_ld_so(hald_acl_t)
-+libs_use_shared_libs(hald_acl_t)
-+
-+files_search_var_lib(hald_acl_t)
-+files_read_usr_files(hald_acl_t)
-+files_read_etc_files(hald_acl_t)
-+
-+storage_getattr_removable_dev(hald_acl_t)
-+storage_setattr_removable_dev(hald_acl_t)
-+
-+miscfiles_read_localization(hald_acl_t)
-+
-+auth_use_nsswitch(hald_acl_t)
-+
-+ifdef(`targeted_policy',`
-+	term_dontaudit_use_console(hald_acl_t)
-+	term_dontaudit_use_generic_ptys(hald_acl_t)
-+')
-+
-+########################################
-+#
-+# Local hald mac policy
-+#
-+
-+domtrans_pattern(hald_t, hald_mac_exec_t, hald_mac_t)
-+allow hald_t hald_mac_t : process signal;
-+allow hald_mac_t hald_t : unix_stream_socket connectto;
-+
-+files_search_var_lib(hald_mac_t)
-+manage_dirs_pattern(hald_mac_t,hald_var_lib_t,hald_var_lib_t)
-+manage_files_pattern(hald_mac_t,hald_var_lib_t,hald_var_lib_t)
-+
-+libs_use_ld_so(hald_mac_t)
-+libs_use_shared_libs(hald_mac_t)
-+
-+files_read_usr_files(hald_mac_t)
-+
-+dev_write_raw_memory(hald_mac_t)
-+
-+miscfiles_read_localization(hald_mac_t)
-+
-+ifdef(`targeted_policy',`
-+	term_dontaudit_use_console(hald_mac_t)
-+	term_dontaudit_use_generic_ptys(hald_mac_t)
-+')
-+
-+########################################
-+#
-+# Local hald sonypic policy
-+#
-+
-+domtrans_pattern(hald_t, hald_sonypic_exec_t, hald_sonypic_t)
-+allow hald_t hald_sonypic_t : process signal;
-+allow hald_sonypic_t hald_t : unix_stream_socket connectto;
-+
-+dev_read_video_dev(hald_sonypic_t)
-+dev_write_video_dev(hald_sonypic_t)
-+
-+files_search_var_lib(hald_sonypic_t)
-+manage_dirs_pattern(hald_sonypic_t,hald_var_lib_t,hald_var_lib_t)
-+manage_files_pattern(hald_sonypic_t,hald_var_lib_t,hald_var_lib_t)
-+
-+libs_use_ld_so(hald_sonypic_t)
-+libs_use_shared_libs(hald_sonypic_t)
-+
-+files_read_usr_files(hald_sonypic_t)
-+
-+miscfiles_read_localization(hald_sonypic_t)
-+
-+ifdef(`targeted_policy',`
-+	term_dontaudit_use_console(hald_sonypic_t)
-+	term_dontaudit_use_generic_ptys(hald_sonypic_t)
-+')
+ dev_setattr_sound_dev(hald_acl_t)
+ dev_setattr_generic_usb_dev(hald_acl_t)
+ dev_setattr_usbfs_files(hald_acl_t)
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/inetd.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/inetd.te	2007-05-08 09:59:33.000000000 -0400
 @@ -135,8 +135,8 @@
  mls_fd_use_all_levels(inetd_t)
  mls_fd_share_all_levels(inetd_t)
@@ -3708,7 +3516,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inet
  manage_dirs_pattern(inetd_child_t,inetd_child_tmp_t,inetd_child_tmp_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-2.6.4/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-04-10 13:21:52.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.if	2007-05-08 09:59:33.000000000 -0400
 @@ -33,43 +33,10 @@
  #
  interface(`kerberos_use',`
@@ -3857,7 +3665,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2007-05-08 09:59:33.000000000 -0400
 @@ -5,6 +5,7 @@
  #
  # Declarations
@@ -3905,7 +3713,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
 +')
 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-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/mailman.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/mailman.if	2007-05-08 09:59:33.000000000 -0400
 @@ -275,6 +275,25 @@
  
  #######################################
@@ -3934,7 +3742,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/mta.if serefpolicy-2.6.4/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/mta.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/mta.if	2007-05-08 09:59:33.000000000 -0400
 @@ -847,6 +847,25 @@
  	manage_files_pattern($1,mqueue_spool_t,mqueue_spool_t)
  ')
@@ -3963,7 +3771,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/mta.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/mta.te	2007-05-08 09:59:33.000000000 -0400
 @@ -27,6 +27,7 @@
  
  type sendmail_exec_t;
@@ -3982,7 +3790,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  	apache_dontaudit_append_log(system_mail_t)
 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-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/nis.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/nis.if	2007-05-08 09:59:33.000000000 -0400
 @@ -48,8 +48,8 @@
  	corenet_udp_bind_all_nodes($1)
  	corenet_tcp_bind_generic_port($1)
@@ -3996,7 +3804,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
  	corenet_tcp_connect_portmap_port($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.6.4/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/nis.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/nis.te	2007-05-08 09:59:33.000000000 -0400
 @@ -120,6 +120,13 @@
  ')
  
@@ -4031,7 +3839,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/nscd.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/nscd.te	2007-05-08 09:59:33.000000000 -0400
 @@ -28,14 +28,14 @@
  # Local policy
  #
@@ -4072,7 +3880,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.6.4/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/ntp.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ntp.te	2007-05-08 09:59:33.000000000 -0400
 @@ -137,6 +137,10 @@
  ')
  
@@ -4086,7 +3894,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/oddjob.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/oddjob.te	2007-05-08 09:59:33.000000000 -0400
 @@ -27,7 +27,7 @@
  # oddjob local policy
  #
@@ -4098,7 +3906,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	2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/openct.fc	2007-05-07 11:27:49.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/openct.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -2,6 +2,7 @@
  # /usr
  #
@@ -4109,7 +3917,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	2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/openct.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/openct.if	2007-05-08 09:59:33.000000000 -0400
 @@ -1 +1,83 @@
 -## <summary>Service for handling smart card readers.</summary>
 +
@@ -4197,8 +4005,17 @@ 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/openct.te	2007-05-07 11:27:37.000000000 -0400
-@@ -31,6 +31,8 @@
++++ serefpolicy-2.6.4/policy/modules/services/openct.te	2007-05-14 13:25:28.000000000 -0400
+@@ -24,6 +24,8 @@
+ manage_files_pattern(openct_t,openct_var_run_t,openct_var_run_t)
+ files_pid_filetrans(openct_t,openct_var_run_t,file)
+ 
++corecmd_search_bin(openct_t)
++
+ kernel_read_kernel_sysctls(openct_t)
+ kernel_list_proc(openct_t)
+ kernel_read_proc_symlinks(openct_t)
+@@ -31,6 +33,8 @@
  dev_read_sysfs(openct_t)
  # openct asks for this
  dev_rw_usbfs(openct_t)
@@ -4207,9 +4024,20 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
  
  domain_use_interactive_fds(openct_t)
  
+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	2006-11-16 17:15:21.000000000 -0500
++++ serefpolicy-2.6.4/policy/modules/services/openvpn.fc	2007-05-14 11:26:36.000000000 -0400
+@@ -11,5 +11,5 @@
+ #
+ # /var
+ #
+-/var/log/openvpn.*	--	gen_context(system_u:object_r:openvpn_var_log_t,s0)
+-/var/run/openvpn.*	--	gen_context(system_u:object_r:openvpn_var_run_t,s0)
++/var/log/openvpn(/.*)?		gen_context(system_u:object_r:openvpn_var_log_t,s0)
++/var/run/openvpn(/.*)?		gen_context(system_u:object_r:openvpn_var_run_t,s0)
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/pcscd.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/pcscd.te	2007-05-08 09:59:33.000000000 -0400
 @@ -21,6 +21,7 @@
  #
  
@@ -4234,7 +4062,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	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/pegasus.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/pegasus.if	2007-05-08 09:59:33.000000000 -0400
 @@ -1 +1,19 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -4257,7 +4085,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/pegasus.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/pegasus.te	2007-05-08 09:59:33.000000000 -0400
 @@ -38,8 +38,6 @@
  allow pegasus_t self:unix_stream_socket create_stream_socket_perms;
  allow pegasus_t self:tcp_socket create_stream_socket_perms;
@@ -4301,7 +4129,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/postfix.if serefpolicy-2.6.4/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/postfix.if	2007-05-08 09:59:33.000000000 -0400
 @@ -122,6 +122,7 @@
  	allow postfix_$1_t postfix_master_t:unix_stream_socket { connectto rw_stream_socket_perms };
  	allow postfix_$1_t self:tcp_socket create_socket_perms;
@@ -4335,7 +4163,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/postfix.te	2007-05-08 09:59:33.000000000 -0400
 @@ -169,6 +169,8 @@
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -4447,7 +4275,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
 +
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/ppp.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ppp.te	2007-05-08 09:59:33.000000000 -0400
 @@ -155,7 +155,7 @@
  
  files_exec_etc_files(pppd_t)
@@ -4459,7 +4287,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.
  # for scripts
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/procmail.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/procmail.te	2007-05-08 09:59:33.000000000 -0400
 @@ -10,6 +10,7 @@
  type procmail_exec_t;
  domain_type(procmail_t)
@@ -4487,7 +4315,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/pyzor.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/pyzor.te	2007-05-08 09:59:33.000000000 -0400
 @@ -54,6 +54,11 @@
  corenet_udp_sendrecv_all_nodes(pyzor_t)
  corenet_udp_sendrecv_all_ports(pyzor_t)
@@ -4518,7 +4346,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/radius.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/radius.te	2007-05-08 09:59:33.000000000 -0400
 @@ -130,3 +130,7 @@
  optional_policy(`
  	udev_read_db(radiusd_t)
@@ -4529,7 +4357,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radi
 +')
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/rlogin.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/rlogin.te	2007-05-08 09:59:33.000000000 -0400
 @@ -64,6 +64,7 @@
  fs_search_auto_mountpoints(rlogind_t)
  
@@ -4540,17 +4368,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlog
  
 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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/rpcbind.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/rpcbind.fc	2007-05-09 19:47:47.000000000 -0400
 @@ -0,0 +1,6 @@
 +
 +/sbin/rpcbind		--	gen_context(system_u:object_r:rpcbind_exec_t,s0)
 +/var/run/rpcbind.lock		--	gen_context(system_u:object_r:rpcbind_var_run_t,s0)
 +/var/run/rpc.statd.pid		--	gen_context(system_u:object_r:rpcbind_var_run_t,s0)
-+/var/run/rpcbind.sock		--	gen_context(system_u:object_r:rpcbind_var_run_t,s0)
++/var/run/rpcbind.sock		-s	gen_context(system_u:object_r:rpcbind_var_run_t,s0)
 +/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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/rpcbind.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/rpcbind.if	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,104 @@
 +
 +## <summary>policy for rpcbind</summary>
@@ -4658,7 +4486,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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/rpcbind.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/rpcbind.te	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,83 @@
 +policy_module(rpcbind,1.0.0)
 +
@@ -4745,7 +4573,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-03-20 23:38:10.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/rpc.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/rpc.if	2007-05-08 09:59:33.000000000 -0400
 @@ -89,8 +89,11 @@
  	# bind to arbitary unused ports
  	corenet_tcp_bind_generic_port($1_t)
@@ -4761,7 +4589,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.
  	fs_search_auto_mountpoints($1_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.6.4/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/rpc.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/rpc.te	2007-05-08 09:59:33.000000000 -0400
 @@ -79,6 +79,7 @@
  
  optional_policy(`
@@ -4780,7 +4608,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.
  tunable_policy(`nfs_export_all_ro',`
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/rsync.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/rsync.te	2007-05-08 09:59:33.000000000 -0400
 @@ -17,6 +17,7 @@
  type rsync_t;
  type rsync_exec_t;
@@ -4791,7 +4619,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsyn
  type rsync_data_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-2.6.4/policy/modules/services/rwho.if
 --- nsaserefpolicy/policy/modules/services/rwho.if	2007-04-30 22:35:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/rwho.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/rwho.if	2007-05-08 09:59:33.000000000 -0400
 @@ -1 +1,84 @@
 -## <summary>Who is logged in on other machines?</summary>
 +
@@ -4880,7 +4708,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-02-23 16:50:01.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/samba.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -27,6 +27,9 @@
  /var/cache/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
  
@@ -4893,7 +4721,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-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-05-08 10:02:45.000000000 -0400
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -5041,7 +4869,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-05-08 10:04:12.000000000 -0400
 @@ -28,6 +28,35 @@
  ## </desc>
  gen_tunable(samba_share_nfs,false)
@@ -5253,7 +5081,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -764,3 +837,16 @@
+@@ -764,3 +837,24 @@
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
  ')
@@ -5262,17 +5090,25 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
 +#
 +# samba_unconfined_script_t local policy
 +#
-+samba_helper_template("unconfined")
++type samba_unconfined_script_t;
++domain_type(samba_unconfined_script_t)
++role system_r types samba_unconfined_script_t;
++
++# This type is used for executable scripts files
++type samba_unconfined_script_exec_t;
++corecmd_shell_entry_type(samba_unconfined_script_t)
++domain_entry_file(samba_unconfined_script_t,samba_unconfined_script_exec_t)
 +allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
++allow smbd_t samba_unconfined_script_exec_t:file ioctl;
 +
 +tunable_policy(`samba_run_unconfined',`
-+	unconfined_domain(samba_unconfined_script_t)
++	domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t)
 +')
 +
 +
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/sasl.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/sasl.te	2007-05-08 09:59:33.000000000 -0400
 @@ -63,6 +63,7 @@
  selinux_compute_access_vector(saslauthd_t)
  
@@ -5283,7 +5119,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl
  domain_use_interactive_fds(saslauthd_t)
 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	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/sendmail.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/sendmail.if	2007-05-08 09:59:33.000000000 -0400
 @@ -76,6 +76,26 @@
  
  ########################################
@@ -5322,7 +5158,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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te	2007-05-08 09:59:33.000000000 -0400
 @@ -28,7 +28,7 @@
  #
  
@@ -5334,7 +5170,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setr
  allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
 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-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/smartmon.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/smartmon.te	2007-05-08 09:59:33.000000000 -0400
 @@ -60,6 +60,7 @@
  fs_search_auto_mountpoints(fsdaemon_t)
  
@@ -5345,7 +5181,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.te serefpolicy-2.6.4/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2007-05-07 10:32:44.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/snmp.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/snmp.te	2007-05-08 09:59:33.000000000 -0400
 @@ -26,7 +26,7 @@
  # Local policy
  #
@@ -5380,7 +5216,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.te serefpolicy-2.6.4/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/spamassassin.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/spamassassin.te	2007-05-14 13:42:25.000000000 -0400
 @@ -6,14 +6,12 @@
  # Declarations
  #
@@ -5436,7 +5272,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	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/squid.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/squid.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -12,3 +12,5 @@
  /var/run/squid\.pid	--	gen_context(system_u:object_r:squid_var_run_t,s0)
  
@@ -5445,7 +5281,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squi
 +/usr/lib64/squid/cachemgr\.cgi	--	gen_context(system_u:object_r:httpd_squid_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.6.4/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2007-05-07 10:32:44.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/squid.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/squid.te	2007-05-08 09:59:33.000000000 -0400
 @@ -185,3 +185,12 @@
  #squid requires the following when run in diskd mode, the recommended setting
  allow squid_t tmpfs_t:file { read write };
@@ -5461,7 +5297,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-04-30 10:41:38.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/ssh.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ssh.if	2007-05-08 09:59:33.000000000 -0400
 @@ -709,3 +709,42 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
@@ -5507,7 +5343,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-04-30 10:41:38.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/ssh.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ssh.te	2007-05-08 09:59:33.000000000 -0400
 @@ -24,11 +24,11 @@
  
  # Type for the ssh-agent executable.
@@ -5543,18 +5379,18 @@ 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/w3c.fc serefpolicy-2.6.4/policy/modules/services/w3c.fc
 --- nsaserefpolicy/policy/modules/services/w3c.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/w3c.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/w3c.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,2 @@
 +/usr/share/w3c-markup-validator(/.*)?		gen_context(system_u:object_r:httpd_w3c_validator_content_t,s0)
 +/usr/share/w3c-markup-validator/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_w3c_validator_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.if serefpolicy-2.6.4/policy/modules/services/w3c.if
 --- nsaserefpolicy/policy/modules/services/w3c.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/w3c.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/w3c.if	2007-05-08 09:59:33.000000000 -0400
 @@ -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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/services/w3c.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/w3c.te	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,14 @@
 +policy_module(w3c,1.2.1)
 +
@@ -5572,12 +5408,12 @@ 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/system/application.fc serefpolicy-2.6.4/policy/modules/system/application.fc
 --- nsaserefpolicy/policy/modules/system/application.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/application.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/application.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/application.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/application.if	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,104 @@
 +## <summary>Policy for application domains</summary>
 +
@@ -5685,7 +5521,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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/application.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/application.te	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,14 @@
 +
 +policy_module(application,1.0.0)
@@ -5703,7 +5539,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	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -14,6 +14,7 @@
  /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
  /sbin/unix_chkpwd	--	gen_context(system_u:object_r:chkpwd_exec_t,s0)
@@ -5714,7 +5550,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-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.if	2007-05-08 09:59:33.000000000 -0400
 @@ -27,11 +27,9 @@
  	domain_type($1_chkpwd_t)
  	domain_entry_file($1_chkpwd_t,chkpwd_exec_t)
@@ -5979,7 +5815,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-04-30 10:41:38.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2007-05-08 09:59:33.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -6044,7 +5880,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
 +')
 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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/clock.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/clock.te	2007-05-08 09:59:33.000000000 -0400
 @@ -26,8 +26,6 @@
  allow hwclock_t self:process signal_perms;
  allow hwclock_t self:fifo_file { getattr read write };
@@ -6064,7 +5900,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	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/fstools.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/fstools.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -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)
@@ -6075,7 +5911,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.te serefpolicy-2.6.4/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/fstools.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/fstools.te	2007-05-08 09:59:33.000000000 -0400
 @@ -9,6 +9,7 @@
  type fsadm_t;
  type fsadm_exec_t;
@@ -6086,7 +5922,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
  type fsadm_log_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.fc serefpolicy-2.6.4/policy/modules/system/fusermount.fc
 --- nsaserefpolicy/policy/modules/system/fusermount.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/fusermount.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/fusermount.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,6 @@
 +# fusermount executable will have:
 +# label: system_u:object_r:fusermount_exec_t
@@ -6096,7 +5932,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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/fusermount.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/fusermount.if	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,41 @@
 +## <summary>policy for fusermount</summary>
 +
@@ -6142,7 +5978,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	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/fusermount.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/fusermount.te	2007-05-08 09:59:33.000000000 -0400
 @@ -0,0 +1,50 @@
 +policy_module(fusermount,1.0.0)
 +
@@ -6196,7 +6032,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/getty.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/getty.te	2007-05-08 09:59:33.000000000 -0400
 @@ -33,7 +33,8 @@
  #
  
@@ -6209,7 +6045,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-01-02 12:57:49.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/hostname.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/hostname.te	2007-05-08 09:59:33.000000000 -0400
 @@ -8,8 +8,12 @@
  
  type hostname_t;
@@ -6238,7 +6074,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostna
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.6.4/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-04-30 10:41:38.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/init.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/init.if	2007-05-08 09:59:33.000000000 -0400
 @@ -194,11 +194,14 @@
  	gen_require(`
  		type initrc_t;
@@ -6308,7 +6144,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-04-30 10:41:38.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/init.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/init.te	2007-05-08 09:59:33.000000000 -0400
 @@ -10,13 +10,20 @@
  # Declarations
  #
@@ -6408,7 +6244,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-2.6.4/policy/modules/system/ipsec.if
 --- nsaserefpolicy/policy/modules/system/ipsec.if	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/ipsec.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/ipsec.if	2007-05-08 09:59:33.000000000 -0400
 @@ -114,6 +114,26 @@
  
  ########################################
@@ -6438,7 +6274,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/ipsec.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/ipsec.te	2007-05-08 09:59:33.000000000 -0400
 @@ -289,6 +289,7 @@
  allow racoon_t self:netlink_selinux_socket { bind create read };
  allow racoon_t self:udp_socket create_socket_perms;
@@ -6449,7 +6285,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/iptables.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/iptables.te	2007-05-08 09:59:33.000000000 -0400
 @@ -56,6 +56,7 @@
  domain_use_interactive_fds(iptables_t)
  
@@ -6468,7 +6304,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptabl
 +')
 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-04 12:19:22.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/libraries.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/libraries.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -81,8 +81,8 @@
  /opt/cisco-vpnclient/lib/libvpnapi\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /opt/netbeans(.*/)?jdk.*/linux/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -6493,7 +6329,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
  /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? --	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-04 12:19:23.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/libraries.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/libraries.te	2007-05-08 09:59:33.000000000 -0400
 @@ -62,7 +62,8 @@
  
  manage_dirs_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t)
@@ -6514,7 +6350,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
  optional_policy(`
 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-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/locallogin.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/locallogin.te	2007-05-08 09:59:33.000000000 -0400
 @@ -48,6 +48,8 @@
  allow local_login_t self:msgq create_msgq_perms;
  allow local_login_t self:msg { send receive };
@@ -6557,7 +6393,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.if serefpolicy-2.6.4/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/logging.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/logging.if	2007-05-08 09:59:33.000000000 -0400
 @@ -302,6 +302,25 @@
  
  ########################################
@@ -6726,7 +6562,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/logging.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/logging.te	2007-05-08 09:59:33.000000000 -0400
 @@ -7,10 +7,15 @@
  #
  
@@ -6814,7 +6650,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-01-02 12:57:49.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/lvm.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/lvm.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -15,6 +15,7 @@
  #
  /etc/lvm(/.*)?			gen_context(system_u:object_r:lvm_etc_t,s0)
@@ -6825,7 +6661,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/lvm.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/lvm.te	2007-05-14 13:22:54.000000000 -0400
 @@ -16,6 +16,7 @@
  type lvm_t;
  type lvm_exec_t;
@@ -6862,9 +6698,18 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te
  
  term_getattr_all_user_ttys(lvm_t)
  term_list_ptys(lvm_t)
+@@ -307,3 +313,8 @@
+ optional_policy(`
+ 	udev_read_db(lvm_t)
+ ')
++
++optional_policy(`
++	xen_append_log(lvm_t)
++	xen_dontaudit_rw_unix_stream_sockets(lvm_t)
++')
 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-02 15:04:46.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/modutils.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/modutils.te	2007-05-08 09:59:33.000000000 -0400
 @@ -102,6 +102,7 @@
  init_use_fds(insmod_t)
  init_use_script_fds(insmod_t)
@@ -6891,7 +6736,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	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/mount.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/mount.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -1,4 +1,3 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -6900,7 +6745,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 +/sbin/mount.ntfs-3g		--	gen_context(system_u:object_r:mount_ntfs_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-2.6.4/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2007-01-02 12:57:49.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/mount.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/mount.if	2007-05-08 09:59:33.000000000 -0400
 @@ -143,3 +143,40 @@
  		mount_domtrans($1)
  	')
@@ -6944,7 +6789,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.6.4/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/mount.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/mount.te	2007-05-08 09:59:33.000000000 -0400
 @@ -9,6 +9,13 @@
  ifdef(`targeted_policy',`
  ## <desc>
@@ -7054,7 +6899,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 +
 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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/raid.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/raid.te	2007-05-08 09:59:33.000000000 -0400
 @@ -46,6 +46,7 @@
  # RAID block device access
  storage_manage_fixed_disk(mdadm_t)
@@ -7065,7 +6910,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	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -40,6 +40,7 @@
  /usr/sbin/setfiles.*		--	gen_context(system_u:object_r:setfiles_exec_t,s0)
  /usr/sbin/setsebool		--	gen_context(system_u:object_r:semanage_exec_t,s0)
@@ -7076,7 +6921,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-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.if	2007-05-08 09:59:33.000000000 -0400
 @@ -445,6 +445,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -7113,7 +6958,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.4/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te	2007-05-11 18:23:21.000000000 -0400
 @@ -1,10 +1,8 @@
  
  policy_module(selinuxutil,1.5.0)
@@ -7240,7 +7085,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  
  tunable_policy(`allow_polyinstantiation',`
  	files_polyinstantiate_all(newrole_t)
-@@ -426,6 +425,10 @@
+@@ -426,6 +425,14 @@
  	hotplug_use_fds(restorecon_t)
  ')
  
@@ -7248,10 +7093,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
 +	rpm_dontaudit_rw_tmp_files(restorecon_t)
 +')
 +
++optional_policy(`
++	xen_dontaudit_use_fds(restorecon_t)
++')
++
  ########################################
  #
  # Restorecond local policy
-@@ -490,7 +493,7 @@
+@@ -490,7 +497,7 @@
  allow run_init_t self:process setexec;
  allow run_init_t self:capability setuid;
  allow run_init_t self:fifo_file rw_file_perms;
@@ -7260,7 +7109,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  
  # often the administrator runs such programs from a directory that is owned
  # by a different user or has restrictive SE permissions, do not want to audit
-@@ -504,6 +507,7 @@
+@@ -504,6 +511,7 @@
  term_dontaudit_list_ptys(run_init_t)
  
  auth_domtrans_chk_passwd(run_init_t)
@@ -7268,7 +7117,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  auth_dontaudit_read_shadow(run_init_t)
  
  corecmd_exec_bin(run_init_t)
-@@ -560,7 +564,7 @@
+@@ -560,7 +568,7 @@
  allow semanage_t self:capability { dac_override audit_write };
  allow semanage_t self:unix_stream_socket create_stream_socket_perms;
  allow semanage_t self:unix_dgram_socket create_socket_perms;
@@ -7277,7 +7126,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  
  allow semanage_t policy_config_t:file { read write };
  
-@@ -571,7 +575,10 @@
+@@ -571,7 +579,10 @@
  kernel_read_system_state(semanage_t)
  kernel_read_kernel_sysctls(semanage_t)
  
@@ -7288,7 +7137,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  
  dev_read_urand(semanage_t)
  
-@@ -621,6 +628,15 @@
+@@ -621,6 +632,15 @@
  
  userdom_search_sysadm_home_dirs(semanage_t)
  
@@ -7304,7 +7153,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -700,6 +716,8 @@
+@@ -700,6 +720,8 @@
  ifdef(`hide_broken_symptoms',`
  	# cjp: cover up stray file descriptors.
  	optional_policy(`
@@ -7316,7 +7165,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.te serefpolicy-2.6.4/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.te	2007-05-08 09:59:33.000000000 -0400
 @@ -164,6 +164,10 @@
  	dbus_connect_system_bus(dhcpc_t)
  	dbus_send_system_bus(dhcpc_t)
@@ -7338,7 +7187,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnet
  optional_policy(`
 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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/udev.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/udev.te	2007-05-11 18:19:28.000000000 -0400
 @@ -83,12 +83,19 @@
  kernel_dgram_send(udev_t)
  kernel_signal(udev_t)
@@ -7359,7 +7208,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.t
  
  domain_read_all_domains_state(udev_t)
  domain_dontaudit_ptrace_all_domains(udev_t) #pidof triggers these 
-@@ -194,5 +201,21 @@
+@@ -194,5 +201,24 @@
  ')
  
  optional_policy(`
@@ -7374,6 +7223,9 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.t
 +
 +optional_policy(`
 +	xen_append_log(udev_t)
++	kernel_write_xen_state(udev_t)
++	kernel_read_xen_state(udev_t)
++	xen_read_image_files(udev_t)
 +')
 +
 +optional_policy(`
@@ -7383,7 +7235,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-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/unconfined.fc	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/unconfined.fc	2007-05-08 09:59:33.000000000 -0400
 @@ -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)
@@ -7392,7 +7244,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-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/unconfined.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/unconfined.if	2007-05-08 09:59:33.000000000 -0400
 @@ -18,7 +18,7 @@
  	')
  
@@ -7461,7 +7313,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2007-05-08 09:59:33.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -7538,7 +7390,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
  		init_dbus_chat_script(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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/userdomain.if	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/userdomain.if	2007-05-08 09:59:33.000000000 -0400
 @@ -114,6 +114,18 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -8086,7 +7938,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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/userdomain.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/userdomain.te	2007-05-08 09:59:33.000000000 -0400
 @@ -15,7 +15,6 @@
  # Declarations
  #
@@ -8263,9 +8115,94 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
 +tunable_policy(`allow_console_login', `
 +	term_use_console(userdomain)
  ')
+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-01-02 12:57:49.000000000 -0500
++++ serefpolicy-2.6.4/policy/modules/system/xen.if	2007-05-11 18:25:10.000000000 -0400
+@@ -72,12 +72,35 @@
+ 	')
+ 
+ 	logging_search_logs($1)
++	allow $1 xend_var_log_t:dir search_dir_perms;
+ 	allow $1 xend_var_log_t:file { getattr append };
+ 	dontaudit $1 xend_var_log_t:file write;
+ ')
+ 
+ ########################################
+ ## <summary>
++##	Allow the specified domain to manage
++##	xend log files.
++## </summary>
++## <param name="domain">
++## 	<summary>
++##	Domain allowed to transition.
++## 	</summary>
++## </param>
++#
++interface(`xen_manage_log',`
++	gen_require(`
++		type var_log_t, xend_var_log_t;
++	')
++
++	logging_search_logs($1)
++	allow $1 xend_var_log_t:dir create_dir_perms;
++	allow $1 xend_var_log_t:file create_file_perms;
++	dontaudit $1 xend_var_log_t:file write;
++')
++
++########################################
++## <summary>
+ ##	Do not audit attempts to read and write
+ ##	Xen unix domain stream sockets.  These
+ ##	are leaked file descriptors.
+@@ -151,3 +174,45 @@
+ 
+ 	domtrans_pattern($1,xm_exec_t,xm_t)
+ ')
++
++########################################
++## <summary>
++##	Allow the specified domain to read
++##	xend image files.
++## </summary>
++## <param name="domain">
++## 	<summary>
++##	Domain allowed to transition.
++## 	</summary>
++## </param>
++#
++interface(`xen_read_image_files',`
++	gen_require(`
++		type xen_image_t;
++	')
++
++	files_list_var_lib($1)
++	read_files_pattern($1,xen_image_t,xen_image_t)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to read
++##	xend image files.
++## </summary>
++## <param name="domain">
++## 	<summary>
++##	Domain allowed to transition.
++## 	</summary>
++## </param>
++#
++interface(`xen_read_image_files',`
++	gen_require(`
++		type xen_image_t, xend_var_lib_t;
++	')
++
++	files_list_var_lib($1)
++	allow $1 xend_var_lib_t:dir search_dir_perms;
++	read_files_pattern($1,xen_image_t,xen_image_t)
++')
++
 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-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/xen.te	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/xen.te	2007-05-14 13:27:09.000000000 -0400
 @@ -25,6 +25,10 @@
  domain_type(xend_t)
  init_daemon_domain(xend_t, xend_exec_t)
@@ -8285,18 +8222,28 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
  rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t)
  
  allow xend_t xenctl_t:fifo_file manage_file_perms;
-@@ -105,6 +110,10 @@
+@@ -97,7 +102,8 @@
+ allow xend_t xend_var_run_t:dir setattr;
+ manage_files_pattern(xend_t,xend_var_run_t,xend_var_run_t)
+ manage_sock_files_pattern(xend_t,xend_var_run_t,xend_var_run_t)
+-files_pid_filetrans(xend_t,xend_var_run_t, { file sock_file })
++manage_fifo_files_pattern(xend_t,xend_var_run_t,xend_var_run_t)
++files_pid_filetrans(xend_t,xend_var_run_t, { file sock_file fifo_file })
+ 
+ # log files
+ allow xend_t xend_var_log_t:dir setattr;
+@@ -105,6 +111,10 @@
  manage_sock_files_pattern(xend_t,xend_var_log_t,xend_var_log_t)
  logging_log_filetrans(xend_t,xend_var_log_t,{ sock_file file dir })
  
-+allow xend_t xend_tmp_t:dir create_dir_perms;
-+allow xend_t xend_tmp_t:file create_file_perms;
++manage_files_Patter(xend_t,xend_tmp_t,xend_tmp_t)
++manage_dirs_Patter(xend_t,xend_tmp_t,xend_tmp_t)
 +files_tmp_filetrans(xend_t, xend_tmp_t, { file dir })
 +
  # var/lib files for xend
  manage_dirs_pattern(xend_t,xend_var_lib_t,xend_var_lib_t)
  manage_files_pattern(xend_t,xend_var_lib_t,xend_var_lib_t)
-@@ -165,8 +174,13 @@
+@@ -165,8 +175,13 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
  files_read_usr_files(xend_t)
@@ -8311,7 +8258,18 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
  storage_raw_read_removable_device(xend_t)
  
  term_getattr_all_user_ptys(xend_t)
-@@ -284,6 +298,12 @@
+@@ -195,6 +210,10 @@
+ 
+ xen_stream_connect_xenstore(xend_t)
+ 
++lvm_domtrans(xend_t)
++
++mount_domtrans(xend_t)
++
+ netutils_domtrans(xend_t)
+ 
+ optional_policy(`
+@@ -284,6 +303,12 @@
  
  files_read_usr_files(xenstored_t)
  
@@ -8324,7 +8282,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
  term_use_generic_ptys(xenstored_t)
  term_use_console(xenconsoled_t)
  
-@@ -317,6 +337,11 @@
+@@ -317,6 +342,11 @@
  
  allow xm_t xen_image_t:dir rw_dir_perms;
  allow xm_t xen_image_t:file read_file_perms;
@@ -8336,7 +8294,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
  
  kernel_read_system_state(xm_t)
  kernel_read_kernel_sysctls(xm_t)
-@@ -352,3 +377,11 @@
+@@ -352,3 +382,11 @@
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)
@@ -8350,7 +8308,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
 +fs_read_dos_files(xend_t)
 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-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.6.4/policy/support/misc_patterns.spt	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/support/misc_patterns.spt	2007-05-08 09:59:33.000000000 -0400
 @@ -41,11 +41,6 @@
  #
  # Other process permissions
@@ -8365,7 +8323,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-04 12:19:23.000000000 -0400
-+++ serefpolicy-2.6.4/policy/support/obj_perm_sets.spt	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/policy/support/obj_perm_sets.spt	2007-05-08 09:59:33.000000000 -0400
 @@ -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 }')
@@ -8399,7 +8357,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-03-22 14:30:10.000000000 -0400
-+++ serefpolicy-2.6.4/Rules.modular	2007-05-07 11:27:37.000000000 -0400
++++ serefpolicy-2.6.4/Rules.modular	2007-05-08 09:59:33.000000000 -0400
 @@ -167,7 +167,7 @@
  # these have to run individually because order matters:
  	$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true
diff --git a/selinux-policy.spec b/selinux-policy.spec
index a7d455c..add403d 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -139,7 +139,7 @@ install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf %{buildroot}%{_sysconfdir}/seli
 %ghost %{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
 %config %{_sysconfdir}/selinux/%1/contexts/files/media \
 %dir %{_sysconfdir}/selinux/%1/contexts/users \
-%{_sysconfdir}/selinux/%1/contexts/users/root
+%config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/root
 
 %define saveFileContext() \
 if [ -s /etc/selinux/config ]; then \
diff --git a/sources b/sources
index 0d61942..190097a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61aceefcea6b4644d7abbfb6a73af136  serefpolicy-2.6.3.tgz
+035120385d3629c367967f20db3f9cd6  serefpolicy-2.6.4.tgz