From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E04A0138C8E for ; Mon, 24 Oct 2016 15:45:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BDBAE094C; Mon, 24 Oct 2016 15:45:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 261C5E094C for ; Mon, 24 Oct 2016 15:45:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F19F6341619 for ; Mon, 24 Oct 2016 15:45:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF458304 for ; Mon, 24 Oct 2016 15:45:51 +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: <1475474661.ca00fbff6cea187f3b7c99ff328c0f13dffef900.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:swift commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/userdomain.if X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: ca00fbff6cea187f3b7c99ff328c0f13dffef900 X-VCS-Branch: swift Date: Mon, 24 Oct 2016 15:45:51 +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: 06502598-dd33-490b-9d58-6a8b2af8748c X-Archives-Hash: 5a7380b1345b00a03f16d77d3ec77a8f commit: ca00fbff6cea187f3b7c99ff328c0f13dffef900 Author: Chris PeBenito ieee org> AuthorDate: Wed Sep 7 21:51:42 2016 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Mon Oct 3 06:04:21 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=ca00fbff userdomain: Move enable_mls block in userdom_common_user_template(). policy/modules/system/userdomain.if | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if index 12585fb..e353c6e 100644 --- a/policy/modules/system/userdomain.if +++ b/policy/modules/system/userdomain.if @@ -592,6 +592,17 @@ template(`userdom_common_user_template',` # to this one. seutil_dontaudit_signal_newrole($1_t) + ifndef(`enable_mls',` + tunable_policy(`user_write_removable',` + # Read/write floppies and other removable devices + storage_raw_read_removable_device($1_t) + storage_raw_write_removable_device($1_t) + ',` + # Read floppies + storage_raw_read_removable_device($1_t) + ') + ') + tunable_policy(`user_direct_mouse',` dev_read_mouse($1_t) ') @@ -607,17 +618,6 @@ template(`userdom_common_user_template',` term_getattr_all_ttys($1_t) ') - ifndef(`enable_mls',` - tunable_policy(`user_write_removable',` - # Read/write floppies and other removable devices - storage_raw_read_removable_device($1_t) - storage_raw_write_removable_device($1_t) - ',` - # Read floppies - storage_raw_read_removable_device($1_t) - ') - ') - tunable_policy(`user_write_removable',` # Read/write USB devices (e.g. external removable USB mass storage devices) dev_rw_generic_usb_dev($1_t)