From 74aaedde680e97f0efe40a953736d5b109ae5021 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Fri, 2 Sep 2011 09:55:50 -0400 Subject: [PATCH] Whitespace fixes in rsync, samba, and mount. --- policy/modules/services/rsync.te | 2 +- policy/modules/services/samba.te | 19 +++++++++---------- policy/modules/system/mount.te | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/policy/modules/services/rsync.te b/policy/modules/services/rsync.te index 1c381e14c..5c17e847f 100644 --- a/policy/modules/services/rsync.te +++ b/policy/modules/services/rsync.te @@ -122,7 +122,7 @@ optional_policy(` ') tunable_policy(`rsync_export_all_ro',` - fs_read_noxattr_fs_files(rsync_t) + fs_read_noxattr_fs_files(rsync_t) fs_read_nfs_files(rsync_t) fs_read_cifs_files(rsync_t) auth_read_all_dirs_except_auth_files(rsync_t) diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te index df830cf9c..fff6675dc 100644 --- a/policy/modules/services/samba.te +++ b/policy/modules/services/samba.te @@ -25,7 +25,7 @@ gen_tunable(samba_create_home_dirs, false) ##

## Allow samba to act as the domain controller, add users, ## groups and change passwords. -## +## ##

## gen_tunable(samba_domain_controller, false) @@ -211,7 +211,7 @@ auth_manage_cache(samba_net_t) logging_send_syslog_msg(samba_net_t) -miscfiles_read_localization(samba_net_t) +miscfiles_read_localization(samba_net_t) samba_read_var_files(samba_net_t) @@ -370,7 +370,7 @@ ifdef(`hide_broken_symptoms', ` tunable_policy(`allow_smbd_anon_write',` miscfiles_manage_public_files(smbd_t) -') +') tunable_policy(`samba_domain_controller',` gen_require(` @@ -410,7 +410,6 @@ tunable_policy(`samba_share_fusefs',` fs_search_fusefs(smbd_t) ') - optional_policy(` cups_read_rw_config(smbd_t) cups_stream_connect(smbd_t) @@ -449,18 +448,18 @@ tunable_policy(`samba_create_home_dirs',` ') tunable_policy(`samba_export_all_ro',` - fs_read_noxattr_fs_files(smbd_t) + fs_read_noxattr_fs_files(smbd_t) auth_read_all_dirs_except_auth_files(smbd_t) auth_read_all_files_except_auth_files(smbd_t) - fs_read_noxattr_fs_files(nmbd_t) + fs_read_noxattr_fs_files(nmbd_t) auth_read_all_dirs_except_auth_files(nmbd_t) auth_read_all_files_except_auth_files(nmbd_t) ') tunable_policy(`samba_export_all_rw',` - fs_read_noxattr_fs_files(smbd_t) + fs_read_noxattr_fs_files(smbd_t) auth_manage_all_files_except_auth_files(smbd_t) - fs_read_noxattr_fs_files(nmbd_t) + fs_read_noxattr_fs_files(nmbd_t) auth_manage_all_files_except_auth_files(nmbd_t) userdom_user_home_dir_filetrans_user_home_content(nmbd_t, { file dir }) ') @@ -597,7 +596,7 @@ allow smbmount_t samba_etc_t:file read_file_perms; can_exec(smbmount_t, smbmount_exec_t) -allow smbmount_t samba_log_t:dir list_dir_perms; +allow smbmount_t samba_log_t:dir list_dir_perms; allow smbmount_t samba_log_t:file manage_file_perms; allow smbmount_t samba_secrets_t:file manage_file_perms; @@ -902,7 +901,7 @@ auth_use_nsswitch(winbind_helper_t) logging_send_syslog_msg(winbind_helper_t) -miscfiles_read_localization(winbind_helper_t) +miscfiles_read_localization(winbind_helper_t) userdom_use_user_terminals(winbind_helper_t) diff --git a/policy/modules/system/mount.te b/policy/modules/system/mount.te index 94e49e84f..ae76fc990 100644 --- a/policy/modules/system/mount.te +++ b/policy/modules/system/mount.te @@ -34,7 +34,7 @@ application_domain(unconfined_mount_t, mount_exec_t) # mount local policy # -# setuid/setgid needed to mount cifs +# setuid/setgid needed to mount cifs allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config setuid setgid }; allow mount_t mount_loopback_t:file read_file_perms;