Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'maste...

Conflicts:
	policy/support/obj_perm_sets.spt

diff --cc policy/modules/admin/consoletype.te
Simple merge

diff --cc policy/modules/admin/su.if
Simple merge

diff --cc policy/modules/admin/sudo.if
index bb95e79c43a37bd4968cd250bac1d93662dd96a0,975af1a007339de343231c0eb4cc23c5d3d85afe..30a7f389128e84232b706f21b352f7fe28bc512a
--- 1/policy/modules/admin/sudo.if
--- 2/policy/modules/admin/sudo.if
+++ b/policy/modules/admin/sudo.if
@@@ -80,10 -76,8 +80,10 @@@ template(`sudo_role_template',
        # By default, revert to the calling domain when a shell is executed.
        corecmd_shell_domtrans($1_sudo_t, $3)
        corecmd_bin_domtrans($1_sudo_t, $3)
 +      userdom_domtrans_user_home($1_sudo_t, $3)
 +      userdom_domtrans_user_tmp($1_sudo_t, $3)
        allow $3 $1_sudo_t:fd use;
-       allow $3 $1_sudo_t:fifo_file rw_file_perms;
+       allow $3 $1_sudo_t:fifo_file rw_fifo_file_perms;
        allow $3 $1_sudo_t:process signal_perms;
  
        kernel_read_kernel_sysctls($1_sudo_t)
@@@ -115,9 -110,9 +116,10 @@@
        selinux_validate_context($1_sudo_t)
        selinux_compute_relabel_context($1_sudo_t)
  
+       term_getattr_pty_fs($1_sudo_t)
        term_relabel_all_ttys($1_sudo_t)
        term_relabel_all_ptys($1_sudo_t)
 +      term_getattr_pty_fs($1_sudo_t)
  
        auth_run_chk_passwd($1_sudo_t, $2)
        # sudo stores a token in the pam_pid directory

diff --cc policy/modules/admin/sudo.te
Simple merge

diff --cc policy/modules/kernel/devices.if
Simple merge

diff --cc policy/modules/kernel/devices.te
Simple merge

diff --cc policy/modules/services/dbus.if
Simple merge

diff --cc policy/modules/services/dbus.te
Simple merge

diff --cc policy/modules/system/init.if
Simple merge

diff --cc policy/modules/system/init.te
Simple merge

diff --cc policy/support/obj_perm_sets.spt
index d9b0868d613dbf01ea51d4e80583913371ee6aec,effb6c59aa5b63e0637b3fe748fdac67b44e8438..a9034444b6e0a820eb7e0ca786be5592cf5ab083
--- 1/policy/support/obj_perm_sets.spt
--- 2/policy/support/obj_perm_sets.spt
+++ b/policy/support/obj_perm_sets.spt
@@@ -311,8 -305,7 +311,8 @@@ define(`relabel_chr_file_perms',`{ geta
  #
  # Use (read and write) terminals
  #
- define(`rw_inherited_term_perms', `{ getattr open read write ioctl append }')
- define(`rw_term_perms', `{ open rw_inherited_term_perms }')
+ define(`rw_term_perms', `{ getattr open read write append ioctl }')
++define(`rw_inherited_term_perms', `{ rw_term_perms -open }')
  
  #
  # Sockets