diff options
author | Joe MacDonald <joe_macdonald@mentor.com> | 2017-01-06 15:07:23 -0500 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2017-01-06 15:07:23 -0500 |
commit | d85c6734eebbc84e55af467b59bf79afbe8cec31 (patch) | |
tree | a77d8d2397f9b941d7fce5f483080a1ac12f0c26 /recipes-security/refpolicy/refpolicy-git/ftp-add-ftpd_t-to-mlsfilewrite.patch | |
parent | 68fc3af746701ea10cf8f081dc96a0ee61f1025e (diff) | |
download | meta-selinux-d85c6734eebbc84e55af467b59bf79afbe8cec31.tar.gz |
refpolicy-git: Update patches
A number of upstream changes caused patch conflicts or duplication in the
final policy. Update the list of git patches appropriately.
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'recipes-security/refpolicy/refpolicy-git/ftp-add-ftpd_t-to-mlsfilewrite.patch')
-rw-r--r-- | recipes-security/refpolicy/refpolicy-git/ftp-add-ftpd_t-to-mlsfilewrite.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/recipes-security/refpolicy/refpolicy-git/ftp-add-ftpd_t-to-mlsfilewrite.patch b/recipes-security/refpolicy/refpolicy-git/ftp-add-ftpd_t-to-mlsfilewrite.patch index 49da4b6..4830566 100644 --- a/recipes-security/refpolicy/refpolicy-git/ftp-add-ftpd_t-to-mlsfilewrite.patch +++ b/recipes-security/refpolicy/refpolicy-git/ftp-add-ftpd_t-to-mlsfilewrite.patch | |||
@@ -21,11 +21,11 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> | |||
21 | policy/modules/contrib/ftp.te | 2 ++ | 21 | policy/modules/contrib/ftp.te | 2 ++ |
22 | 1 file changed, 2 insertions(+) | 22 | 1 file changed, 2 insertions(+) |
23 | 23 | ||
24 | diff --git a/policy/modules/contrib/ftp.te b/policy/modules/contrib/ftp.te | ||
25 | index 544c512..12a31dd 100644 | ||
26 | --- a/policy/modules/contrib/ftp.te | 24 | --- a/policy/modules/contrib/ftp.te |
27 | +++ b/policy/modules/contrib/ftp.te | 25 | +++ b/policy/modules/contrib/ftp.te |
28 | @@ -144,6 +144,8 @@ role ftpdctl_roles types ftpdctl_t; | 26 | @@ -148,10 +148,12 @@ init_system_domain(ftpdctl_t, ftpdctl_ex |
27 | role ftpdctl_roles types ftpdctl_t; | ||
28 | |||
29 | type ftpdctl_tmp_t; | 29 | type ftpdctl_tmp_t; |
30 | files_tmp_file(ftpdctl_tmp_t) | 30 | files_tmp_file(ftpdctl_tmp_t) |
31 | 31 | ||
@@ -34,6 +34,5 @@ index 544c512..12a31dd 100644 | |||
34 | type sftpd_t; | 34 | type sftpd_t; |
35 | domain_type(sftpd_t) | 35 | domain_type(sftpd_t) |
36 | role system_r types sftpd_t; | 36 | role system_r types sftpd_t; |
37 | -- | 37 | |
38 | 1.7.10.4 | 38 | type xferlog_t; |
39 | |||