[selinux-policy: 1233/3172] clean up most of user subdir mess
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Oct 7 20:51:43 UTC 2010
commit 4a02d30d352c90ef129e8daa78471838c6cb4d16
Author: Chris PeBenito <cpebenito at tresys.com>
Date: Mon Feb 20 15:04:32 2006 +0000
clean up most of user subdir mess
refpolicy/policy/modules/admin/sudo.if | 4 ++--
refpolicy/policy/modules/apps/java.if | 8 ++++----
refpolicy/policy/modules/services/cron.if | 8 ++++----
refpolicy/policy/modules/services/cron.te | 8 ++++----
refpolicy/policy/modules/services/ftp.if | 8 ++++----
refpolicy/policy/modules/services/ftp.te | 8 ++++----
refpolicy/policy/modules/services/mta.if | 10 +++++-----
refpolicy/policy/modules/services/mta.te | 8 ++++----
refpolicy/policy/modules/services/samba.if | 8 ++++----
refpolicy/policy/modules/system/userdomain.if | 8 ++++----
10 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/refpolicy/policy/modules/admin/sudo.if b/refpolicy/policy/modules/admin/sudo.if
index 12ba56b..d69cacb 100644
--- a/refpolicy/policy/modules/admin/sudo.if
+++ b/refpolicy/policy/modules/admin/sudo.if
@@ -120,8 +120,8 @@ template(`sudo_per_userdomain_template',`
miscfiles_read_localization($1_sudo_t)
- userdom_manage_user_home_subdir_files($1,$1_sudo_t)
- userdom_manage_user_home_subdir_symlinks($1,$1_sudo_t)
+ userdom_manage_user_home_files($1,$1_sudo_t)
+ userdom_manage_user_home_symlinks($1,$1_sudo_t)
userdom_manage_user_tmp_files($1,$1_sudo_t)
userdom_manage_user_tmp_symlinks($1,$1_sudo_t)
userdom_use_user_terminals($1,$1_sudo_t)
diff --git a/refpolicy/policy/modules/apps/java.if b/refpolicy/policy/modules/apps/java.if
index effd249..f82d416 100644
--- a/refpolicy/policy/modules/apps/java.if
+++ b/refpolicy/policy/modules/apps/java.if
@@ -143,10 +143,10 @@ template(`java_per_userdomain_template',`
userdom_dontaudit_setattr_user_home_files($1,$1_javaplugin_t)
userdom_dontaudit_exec_user_home_files($1,$1_javaplugin_t)
userdom_manage_user_home_subdirs($1,$1_javaplugin_t)
- userdom_manage_user_home_subdir_files($1,$1_javaplugin_t)
- userdom_manage_user_home_subdir_symlinks($1,$1_javaplugin_t)
- userdom_manage_user_home_subdir_pipes($1,$1_javaplugin_t)
- userdom_manage_user_home_subdir_sockets($1,$1_javaplugin_t)
+ userdom_manage_user_home_files($1,$1_javaplugin_t)
+ userdom_manage_user_home_symlinks($1,$1_javaplugin_t)
+ userdom_manage_user_home_pipes($1,$1_javaplugin_t)
+ userdom_manage_user_home_sockets($1,$1_javaplugin_t)
userdom_filetrans_user_home($1,$1_javaplugin_t,{ file lnk_file sock_file fifo_file })
# libdeploy.so legacy
diff --git a/refpolicy/policy/modules/services/cron.if b/refpolicy/policy/modules/services/cron.if
index c0558b6..ea8d9e8 100644
--- a/refpolicy/policy/modules/services/cron.if
+++ b/refpolicy/policy/modules/services/cron.if
@@ -144,10 +144,10 @@ template(`cron_per_userdomain_template',`
userdom_exec_user_home_files($1,$1_crond_t)
# Access user files and dirs.
# userdom_manage_user_home_subdir_dirs($1,$1_crond_t)
- userdom_manage_user_home_subdir_files($1,$1_crond_t)
- userdom_manage_user_home_subdir_symlinks($1,$1_crond_t)
- userdom_manage_user_home_subdir_pipes($1,$1_crond_t)
- userdom_manage_user_home_subdir_sockets($1,$1_crond_t)
+ userdom_manage_user_home_files($1,$1_crond_t)
+ userdom_manage_user_home_symlinks($1,$1_crond_t)
+ userdom_manage_user_home_pipes($1,$1_crond_t)
+ userdom_manage_user_home_sockets($1,$1_crond_t)
# userdom_filetrans_user_home($1,$1_crond_t,notdevfile_class_set)
tunable_policy(`fcron_crond', `
diff --git a/refpolicy/policy/modules/services/cron.te b/refpolicy/policy/modules/services/cron.te
index fef15dc..5ddfbca 100644
--- a/refpolicy/policy/modules/services/cron.te
+++ b/refpolicy/policy/modules/services/cron.te
@@ -158,10 +158,10 @@ ifdef(`targeted_policy',`
# cjp: fix this to generic_user interfaces
userdom_manage_user_home_subdirs(user,crond_t)
- userdom_manage_user_home_subdir_files(user,crond_t)
- userdom_manage_user_home_subdir_symlinks(user,crond_t)
- userdom_manage_user_home_subdir_pipes(user,crond_t)
- userdom_manage_user_home_subdir_sockets(user,crond_t)
+ userdom_manage_user_home_files(user,crond_t)
+ userdom_manage_user_home_symlinks(user,crond_t)
+ userdom_manage_user_home_pipes(user,crond_t)
+ userdom_manage_user_home_sockets(user,crond_t)
userdom_filetrans_user_home(user,crond_t,{ dir file lnk_file fifo_file sock_file })
allow crond_t unconfined_t:dbus send_msg;
diff --git a/refpolicy/policy/modules/services/ftp.if b/refpolicy/policy/modules/services/ftp.if
index 8b9b937..7e3738a 100644
--- a/refpolicy/policy/modules/services/ftp.if
+++ b/refpolicy/policy/modules/services/ftp.if
@@ -25,10 +25,10 @@
#
template(`ftp_per_userdomain_template',`
tunable_policy(`ftpd_is_daemon',`
- userdom_manage_user_home_subdir_files($1,ftpd_t)
- userdom_manage_user_home_subdir_symlinks($1,ftpd_t)
- userdom_manage_user_home_subdir_sockets($1,ftpd_t)
- userdom_manage_user_home_subdir_pipes($1,ftpd_t)
+ userdom_manage_user_home_files($1,ftpd_t)
+ userdom_manage_user_home_symlinks($1,ftpd_t)
+ userdom_manage_user_home_sockets($1,ftpd_t)
+ userdom_manage_user_home_pipes($1,ftpd_t)
userdom_filetrans_user_home($1,ftpd_t,{ dir file lnk_file sock_file fifo_file })
')
')
diff --git a/refpolicy/policy/modules/services/ftp.te b/refpolicy/policy/modules/services/ftp.te
index a4bf5d9..bfc6428 100644
--- a/refpolicy/policy/modules/services/ftp.te
+++ b/refpolicy/policy/modules/services/ftp.te
@@ -138,10 +138,10 @@ ifdef(`targeted_policy',`
optional_policy(`ftp',`
tunable_policy(`ftpd_is_daemon',`
# cjp: fix this to use regular interfaces
- userdom_manage_user_home_subdir_files(user,ftpd_t)
- userdom_manage_user_home_subdir_symlinks(user,ftpd_t)
- userdom_manage_user_home_subdir_sockets(user,ftpd_t)
- userdom_manage_user_home_subdir_pipes(user,ftpd_t)
+ userdom_manage_user_home_files(user,ftpd_t)
+ userdom_manage_user_home_symlinks(user,ftpd_t)
+ userdom_manage_user_home_sockets(user,ftpd_t)
+ userdom_manage_user_home_pipes(user,ftpd_t)
userdom_filetrans_user_home(user,ftpd_t,{ dir file lnk_file sock_file fifo_file })
')
')
diff --git a/refpolicy/policy/modules/services/mta.if b/refpolicy/policy/modules/services/mta.if
index 157647e..ced22de 100644
--- a/refpolicy/policy/modules/services/mta.if
+++ b/refpolicy/policy/modules/services/mta.if
@@ -214,15 +214,15 @@ template(`mta_per_userdomain_template',`
# Write to the user domain tty. cjp: why?
userdom_use_user_terminals($1,mta_user_agent)
# Create dead.letter in user home directories.
- userdom_manage_user_home_subdir_files($1,$1_mail_t)
+ userdom_manage_user_home_files($1,$1_mail_t)
userdom_filetrans_user_home($1,$1_mail_t,file)
# for reading .forward - maybe we need a new type for it?
# also for delivering mail to maildir
userdom_manage_user_home_subdirs($1,mailserver_delivery)
- userdom_manage_user_home_subdir_files($1,mailserver_delivery)
- userdom_manage_user_home_subdir_symlinks($1,mailserver_delivery)
- userdom_manage_user_home_subdir_pipes($1,mailserver_delivery)
- userdom_manage_user_home_subdir_sockets($1,mailserver_delivery)
+ userdom_manage_user_home_files($1,mailserver_delivery)
+ userdom_manage_user_home_symlinks($1,mailserver_delivery)
+ userdom_manage_user_home_pipes($1,mailserver_delivery)
+ userdom_manage_user_home_sockets($1,mailserver_delivery)
userdom_filetrans_user_home($1,mailserver_delivery,{ dir file lnk_file fifo_file sock_file })
# Read user temporary files.
userdom_read_user_tmp_files($1,$1_mail_t)
diff --git a/refpolicy/policy/modules/services/mta.te b/refpolicy/policy/modules/services/mta.te
index 39cc1fb..00edc7e 100644
--- a/refpolicy/policy/modules/services/mta.te
+++ b/refpolicy/policy/modules/services/mta.te
@@ -78,10 +78,10 @@ ifdef(`targeted_policy',`
# also for delivering mail to maildir
# cjp: fix this to generic_user interfaces
userdom_manage_user_home_subdirs(user,mailserver_delivery)
- userdom_manage_user_home_subdir_files(user,mailserver_delivery)
- userdom_manage_user_home_subdir_symlinks(user,mailserver_delivery)
- userdom_manage_user_home_subdir_pipes(user,mailserver_delivery)
- userdom_manage_user_home_subdir_sockets(user,mailserver_delivery)
+ userdom_manage_user_home_files(user,mailserver_delivery)
+ userdom_manage_user_home_symlinks(user,mailserver_delivery)
+ userdom_manage_user_home_pipes(user,mailserver_delivery)
+ userdom_manage_user_home_sockets(user,mailserver_delivery)
userdom_filetrans_user_home(user,mailserver_delivery,{ dir file lnk_file fifo_file sock_file })
# cjp: another require-in-else to resolve
diff --git a/refpolicy/policy/modules/services/samba.if b/refpolicy/policy/modules/services/samba.if
index e170713..3e5a308 100644
--- a/refpolicy/policy/modules/services/samba.if
+++ b/refpolicy/policy/modules/services/samba.if
@@ -33,10 +33,10 @@ template(`samba_per_userdomain_template',`
')
tunable_policy(`samba_enable_home_dirs',`
- userdom_manage_user_home_subdir_files($1,smbd_t)
- userdom_manage_user_home_subdir_symlinks($1,smbd_t)
- userdom_manage_user_home_subdir_sockets($1,smbd_t)
- userdom_manage_user_home_subdir_pipes($1,smbd_t)
+ userdom_manage_user_home_files($1,smbd_t)
+ userdom_manage_user_home_symlinks($1,smbd_t)
+ userdom_manage_user_home_sockets($1,smbd_t)
+ userdom_manage_user_home_pipes($1,smbd_t)
userdom_filetrans_user_home($1,smbd_t,{ dir file lnk_file sock_file fifo_file })
')
')
diff --git a/refpolicy/policy/modules/system/userdomain.if b/refpolicy/policy/modules/system/userdomain.if
index 2d3471f..0025588 100644
--- a/refpolicy/policy/modules/system/userdomain.if
+++ b/refpolicy/policy/modules/system/userdomain.if
@@ -1537,7 +1537,7 @@ template(`userdom_dontaudit_exec_user_home_files',`
## </summary>
## </param>
#
-template(`userdom_manage_user_home_subdir_files',`
+template(`userdom_manage_user_home_files',`
gen_require(`
type $1_home_dir_t, $1_home_t;
')
@@ -1575,7 +1575,7 @@ template(`userdom_manage_user_home_subdir_files',`
## </summary>
## </param>
#
-template(`userdom_manage_user_home_subdir_symlinks',`
+template(`userdom_manage_user_home_symlinks',`
gen_require(`
type $1_home_dir_t, $1_home_t;
')
@@ -1613,7 +1613,7 @@ template(`userdom_manage_user_home_subdir_symlinks',`
## </summary>
## </param>
#
-template(`userdom_manage_user_home_subdir_pipes',`
+template(`userdom_manage_user_home_pipes',`
gen_require(`
type $1_home_dir_t, $1_home_t;
')
@@ -1651,7 +1651,7 @@ template(`userdom_manage_user_home_subdir_pipes',`
## </summary>
## </param>
#
-template(`userdom_manage_user_home_subdir_sockets',`
+template(`userdom_manage_user_home_sockets',`
gen_require(`
type $1_home_dir_t, $1_home_t;
')
More information about the scm-commits
mailing list