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 E38E81391DB for ; Tue, 29 Jul 2014 14:07:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FC98E0920; Tue, 29 Jul 2014 14:07:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6BACE0920 for ; Tue, 29 Jul 2014 14:07:33 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB9AD33FF4D for ; Tue, 29 Jul 2014 14:07:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9D1DB18BF7 for ; Tue, 29 Jul 2014 14:07:29 +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: <1406642726.d98d2b28806a778ca2edfab26a5d81a2e79e8e9a.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/ftp.fc X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: d98d2b28806a778ca2edfab26a5d81a2e79e8e9a X-VCS-Branch: master Date: Tue, 29 Jul 2014 14:07:29 +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: 9cd1316f-2ba6-4151-a802-e21190355b9b X-Archives-Hash: 005343548dfe97b38b03bd035c4c95fa commit: d98d2b28806a778ca2edfab26a5d81a2e79e8e9a Author: Nicolas Iooss m4x org> AuthorDate: Sat Jul 5 16:42:29 2014 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Tue Jul 29 14:05:26 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=d98d2b28 ftp: fix labels in /var/lock/subsys/ In the pattern "/var/lock/subsys/*.ftpd", the star is applied to the slash instead to the dot. This means that the pattern matches these files: * "Xftpd" in "/var/lock/subsys/" (where X is whatever character) * "subsysXftpd" in "/var/lock/" (where X is whatever character) "/var/lock/subsys/vsftpd", which has been used by vsftpd, is therefore not matched by the pattern. As "*." looks like a typo, this patch replaces it with ".*". --- policy/modules/contrib/ftp.fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policy/modules/contrib/ftp.fc b/policy/modules/contrib/ftp.fc index ddb75c1..fa132af 100644 --- a/policy/modules/contrib/ftp.fc +++ b/policy/modules/contrib/ftp.fc @@ -19,7 +19,7 @@ /usr/libexec/webmin/vsftpd/webalizer/xfer_log -- gen_context(system_u:object_r:xferlog_t,s0) -/var/lock/subsys/*.ftpd -- gen_context(system_u:object_r:ftpd_lock_t,s0) +/var/lock/subsys/.*ftpd -- gen_context(system_u:object_r:ftpd_lock_t,s0) /var/log/muddleftpd\.log.* -- gen_context(system_u:object_r:xferlog_t,s0) /var/log/proftpd(/.*)? gen_context(system_u:object_r:xferlog_t,s0)