[selinux-policy/f16] Remove duplicate declaration
Miroslav Grepl
mgrepl at fedoraproject.org
Fri Apr 6 13:00:52 UTC 2012
commit 6f0030746b9143491c393cfe24214141f5d4cf00
Author: Miroslav Grepl <mgrepl at redhat.com>
Date: Fri Apr 6 15:00:41 2012 +0200
Remove duplicate declaration
policy-F16.patch | 60 ++++++++++++++++++-----------------------------------
1 files changed, 21 insertions(+), 39 deletions(-)
---
diff --git a/policy-F16.patch b/policy-F16.patch
index eed2aaa..14f8bcc 100644
--- a/policy-F16.patch
+++ b/policy-F16.patch
@@ -19080,7 +19080,7 @@ index 22821ff..20251b0 100644
########################################
#
diff --git a/policy/modules/kernel/filesystem.if b/policy/modules/kernel/filesystem.if
-index 97fcdac..7adc55b 100644
+index 97fcdac..2918153 100644
--- a/policy/modules/kernel/filesystem.if
+++ b/policy/modules/kernel/filesystem.if
@@ -631,6 +631,27 @@ interface(`fs_getattr_cgroup',`
@@ -19378,28 +19378,10 @@ index 97fcdac..7adc55b 100644
########################################
## <summary>
## Do not audit attempts to create,
-@@ -2025,6 +2205,68 @@ interface(`fs_read_fusefs_symlinks',`
+@@ -2025,6 +2205,50 @@ interface(`fs_read_fusefs_symlinks',`
########################################
## <summary>
-+## Manage symbolic links on a FUSEFS filesystem.
-+## </summary>
-+## <param name="domain">
-+## <summary>
-+## Domain allowed access.
-+## </summary>
-+## </param>
-+#
-+interface(`fs_manage_fusefs_symlinks',`
-+ gen_require(`
-+ type fusefs_t;
-+ ')
-+
-+ manage_lnk_files_pattern($1, fusefs_t, fusefs_t)
-+')
-+
-+########################################
-+## <summary>
+## Execute a file on a FUSE filesystem
+## in the specified domain.
+## </summary>
@@ -19447,7 +19429,7 @@ index 97fcdac..7adc55b 100644
## Get the attributes of an hugetlbfs
## filesystem.
## </summary>
-@@ -2080,6 +2322,24 @@ interface(`fs_manage_hugetlbfs_dirs',`
+@@ -2080,6 +2304,24 @@ interface(`fs_manage_hugetlbfs_dirs',`
########################################
## <summary>
@@ -19472,7 +19454,7 @@ index 97fcdac..7adc55b 100644
## Read and write hugetlbfs files.
## </summary>
## <param name="domain">
-@@ -2148,6 +2408,7 @@ interface(`fs_list_inotifyfs',`
+@@ -2148,6 +2390,7 @@ interface(`fs_list_inotifyfs',`
')
allow $1 inotifyfs_t:dir list_dir_perms;
@@ -19480,7 +19462,7 @@ index 97fcdac..7adc55b 100644
')
########################################
-@@ -2480,6 +2741,7 @@ interface(`fs_read_nfs_files',`
+@@ -2480,6 +2723,7 @@ interface(`fs_read_nfs_files',`
type nfs_t;
')
@@ -19488,7 +19470,7 @@ index 97fcdac..7adc55b 100644
allow $1 nfs_t:dir list_dir_perms;
read_files_pattern($1, nfs_t, nfs_t)
')
-@@ -2518,6 +2780,7 @@ interface(`fs_write_nfs_files',`
+@@ -2518,6 +2762,7 @@ interface(`fs_write_nfs_files',`
type nfs_t;
')
@@ -19496,7 +19478,7 @@ index 97fcdac..7adc55b 100644
allow $1 nfs_t:dir list_dir_perms;
write_files_pattern($1, nfs_t, nfs_t)
')
-@@ -2544,6 +2807,25 @@ interface(`fs_exec_nfs_files',`
+@@ -2544,6 +2789,25 @@ interface(`fs_exec_nfs_files',`
########################################
## <summary>
@@ -19522,7 +19504,7 @@ index 97fcdac..7adc55b 100644
## Append files
## on a NFS filesystem.
## </summary>
-@@ -2584,6 +2866,42 @@ interface(`fs_dontaudit_append_nfs_files',`
+@@ -2584,6 +2848,42 @@ interface(`fs_dontaudit_append_nfs_files',`
########################################
## <summary>
@@ -19565,7 +19547,7 @@ index 97fcdac..7adc55b 100644
## Do not audit attempts to read or
## write files on a NFS filesystem.
## </summary>
-@@ -2598,7 +2916,7 @@ interface(`fs_dontaudit_rw_nfs_files',`
+@@ -2598,7 +2898,7 @@ interface(`fs_dontaudit_rw_nfs_files',`
type nfs_t;
')
@@ -19574,7 +19556,7 @@ index 97fcdac..7adc55b 100644
')
########################################
-@@ -2736,7 +3054,7 @@ interface(`fs_search_removable',`
+@@ -2736,7 +3036,7 @@ interface(`fs_search_removable',`
## </summary>
## <param name="domain">
## <summary>
@@ -19583,7 +19565,7 @@ index 97fcdac..7adc55b 100644
## </summary>
## </param>
#
-@@ -2772,7 +3090,7 @@ interface(`fs_read_removable_files',`
+@@ -2772,7 +3072,7 @@ interface(`fs_read_removable_files',`
## </summary>
## <param name="domain">
## <summary>
@@ -19592,7 +19574,7 @@ index 97fcdac..7adc55b 100644
## </summary>
## </param>
#
-@@ -2965,6 +3283,7 @@ interface(`fs_manage_nfs_dirs',`
+@@ -2965,6 +3265,7 @@ interface(`fs_manage_nfs_dirs',`
type nfs_t;
')
@@ -19600,7 +19582,7 @@ index 97fcdac..7adc55b 100644
allow $1 nfs_t:dir manage_dir_perms;
')
-@@ -3005,6 +3324,7 @@ interface(`fs_manage_nfs_files',`
+@@ -3005,6 +3306,7 @@ interface(`fs_manage_nfs_files',`
type nfs_t;
')
@@ -19608,7 +19590,7 @@ index 97fcdac..7adc55b 100644
manage_files_pattern($1, nfs_t, nfs_t)
')
-@@ -3045,6 +3365,7 @@ interface(`fs_manage_nfs_symlinks',`
+@@ -3045,6 +3347,7 @@ interface(`fs_manage_nfs_symlinks',`
type nfs_t;
')
@@ -19616,7 +19598,7 @@ index 97fcdac..7adc55b 100644
manage_lnk_files_pattern($1, nfs_t, nfs_t)
')
-@@ -3258,6 +3579,24 @@ interface(`fs_getattr_nfsd_files',`
+@@ -3258,6 +3561,24 @@ interface(`fs_getattr_nfsd_files',`
getattr_files_pattern($1, nfsd_fs_t, nfsd_fs_t)
')
@@ -19641,7 +19623,7 @@ index 97fcdac..7adc55b 100644
########################################
## <summary>
## Read and write NFS server files.
-@@ -3958,6 +4297,42 @@ interface(`fs_dontaudit_list_tmpfs',`
+@@ -3958,6 +4279,42 @@ interface(`fs_dontaudit_list_tmpfs',`
########################################
## <summary>
@@ -19684,7 +19666,7 @@ index 97fcdac..7adc55b 100644
## Create, read, write, and delete
## tmpfs directories
## </summary>
-@@ -4175,6 +4550,24 @@ interface(`fs_dontaudit_use_tmpfs_chr_dev',`
+@@ -4175,6 +4532,24 @@ interface(`fs_dontaudit_use_tmpfs_chr_dev',`
########################################
## <summary>
@@ -19709,7 +19691,7 @@ index 97fcdac..7adc55b 100644
## Relabel character nodes on tmpfs filesystems.
## </summary>
## <param name="domain">
-@@ -4251,6 +4644,25 @@ interface(`fs_manage_tmpfs_files',`
+@@ -4251,6 +4626,25 @@ interface(`fs_manage_tmpfs_files',`
########################################
## <summary>
@@ -19735,7 +19717,7 @@ index 97fcdac..7adc55b 100644
## Read and write, create and delete symbolic
## links on tmpfs filesystems.
## </summary>
-@@ -4457,6 +4869,8 @@ interface(`fs_mount_all_fs',`
+@@ -4457,6 +4851,8 @@ interface(`fs_mount_all_fs',`
')
allow $1 filesystem_type:filesystem mount;
@@ -19744,7 +19726,7 @@ index 97fcdac..7adc55b 100644
')
########################################
-@@ -4503,7 +4917,7 @@ interface(`fs_unmount_all_fs',`
+@@ -4503,7 +4899,7 @@ interface(`fs_unmount_all_fs',`
## <desc>
## <p>
## Allow the specified domain to
@@ -19753,7 +19735,7 @@ index 97fcdac..7adc55b 100644
## Example attributes:
## </p>
## <ul>
-@@ -4866,3 +5280,24 @@ interface(`fs_unconfined',`
+@@ -4866,3 +5262,24 @@ interface(`fs_unconfined',`
typeattribute $1 filesystem_unconfined_type;
')
More information about the scm-commits
mailing list