From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C3C541381F3 for ; Wed, 28 Nov 2012 20:23:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8460421C04F; Wed, 28 Nov 2012 20:21:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A09821C030 for ; Wed, 28 Nov 2012 20:21:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5011333D9FA for ; Wed, 28 Nov 2012 20:21:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DE251E5452 for ; Wed, 28 Nov 2012 20:21:12 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1354134016.796f48776b91ee0ff095ed9b42fbaf61c13922f1.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/tftp.if policy/modules/contrib/tftp.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 796f48776b91ee0ff095ed9b42fbaf61c13922f1 X-VCS-Branch: master Date: Wed, 28 Nov 2012 20:21:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 913885f5-8d95-424b-a9cb-f40fcfd0f762 X-Archives-Hash: e5132509b8fa8050c57777cf8c290358 commit: 796f48776b91ee0ff095ed9b42fbaf61c13922f1 Author: Dominick Grift gmail com> AuthorDate: Wed Nov 28 16:43:40 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Wed Nov 28 20:20:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=796f4877 Changes to the tftp policy modules Fix interfaces to include directories and symlinks Signed-off-by: Dominick Grift gmail.com> --- policy/modules/contrib/tftp.if | 9 ++++++--- policy/modules/contrib/tftp.te | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/policy/modules/contrib/tftp.if b/policy/modules/contrib/tftp.if index f7c6ea3..9957e30 100644 --- a/policy/modules/contrib/tftp.if +++ b/policy/modules/contrib/tftp.if @@ -16,7 +16,9 @@ interface(`tftp_read_content',` ') files_search_var_lib($1) - read_files_pattern($1, tftpdir_t, tftpdir_t) + allow $1 tftpdir_t:dir list_dir_perms; + allow $1 tftpdir_t:file read_file_perms; + allow $1 tftpdir_t:lnk_file read_lnk_file_perms; ') ######################################## @@ -36,8 +38,9 @@ interface(`tftp_manage_rw_content',` ') files_search_var_lib($1) - manage_dirs_pattern($1, tftpdir_rw_t, tftpdir_rw_t) - manage_files_pattern($1, tftpdir_rw_t, tftpdir_rw_t) + allow $1 tftpdir_rw_t:dir manage_dir_perms; + allow $1 tftpdir_rw_t:file manage_file_perms; + allow $1 tftpdir_rw_t:lnk_file manage_lnk_file_perms; ') ######################################## diff --git a/policy/modules/contrib/tftp.te b/policy/modules/contrib/tftp.te index 0cebfd0..f455e70 100644 --- a/policy/modules/contrib/tftp.te +++ b/policy/modules/contrib/tftp.te @@ -1,4 +1,4 @@ -policy_module(tftp, 1.12.3) +policy_module(tftp, 1.12.4) ######################################## #