From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-950660-garchives=archives.gentoo.org@lists.gentoo.org>
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 5E080139694
	for <garchives@archives.gentoo.org>; Thu, 18 May 2017 17:03:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E31C7E0EB8;
	Thu, 18 May 2017 17:03:33 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 C6550E0EB8
	for <gentoo-commits@lists.gentoo.org>; Thu, 18 May 2017 17:03:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 4AED43416BB
	for <gentoo-commits@lists.gentoo.org>; Thu, 18 May 2017 17:03:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B6C18746A
	for <gentoo-commits@lists.gentoo.org>; Thu, 18 May 2017 17:03:29 +0000 (UTC)
From: "Sven Vermeulen" <swift@gentoo.org>
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" <swift@gentoo.org>
Message-ID: <1495126919.343c6e0f96645d89fd64ec5f6434dc792a887b02.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/openoffice.if
X-VCS-Directories: policy/modules/contrib/
X-VCS-Committer: swift
X-VCS-Committer-Name: Sven Vermeulen
X-VCS-Revision: 343c6e0f96645d89fd64ec5f6434dc792a887b02
X-VCS-Branch: master
Date: Thu, 18 May 2017 17:03:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b0c0b051-3298-478f-88d3-4ebdc25daab9
X-Archives-Hash: 9fb4b2ce9cc992638928875ad45d8acc
Message-ID: <20170518170329.VxO0a-V7NArzD-JkDG4TO41_eiJQ4_GUsja4pcxVdTQ@z>

commit:     343c6e0f96645d89fd64ec5f6434dc792a887b02
Author:     Chris PeBenito <pebenito <AT> ieee <DOT> org>
AuthorDate: Mon May 15 22:27:04 2017 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Thu May 18 17:01:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=343c6e0f

openoffice: Move ooffice_rw_tmp_files() implementation.

 policy/modules/contrib/openoffice.if | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/policy/modules/contrib/openoffice.if b/policy/modules/contrib/openoffice.if
index 5a579e08..19f62381 100644
--- a/policy/modules/contrib/openoffice.if
+++ b/policy/modules/contrib/openoffice.if
@@ -51,38 +51,38 @@ interface(`ooffice_domtrans',`
 
 ########################################
 ## <summary>
-##	Read and write temporary
-##	openoffice files.
+##	Do not audit attempts to execute
+##	files in temporary directories.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
-##	Domain allowed access.
+##	Domain to not audit.
 ##	</summary>
 ## </param>
 #
-interface(`ooffice_rw_tmp_files',`
+interface(`ooffice_dontaudit_exec_tmp_files',`
 	gen_require(`
 		type ooffice_tmp_t;
 	')
 
-	rw_files_pattern($1, ooffice_tmp_t, ooffice_tmp_t)
+	dontaudit $1 ooffice_tmp_t:file exec_file_perms;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to execute
-##	files in temporary directories.
+##	Read and write temporary
+##	openoffice files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
-##	Domain to not audit.
+##	Domain allowed access.
 ##	</summary>
 ## </param>
 #
-interface(`ooffice_dontaudit_exec_tmp_files',`
+interface(`ooffice_rw_tmp_files',`
 	gen_require(`
 		type ooffice_tmp_t;
 	')
 
-	dontaudit $1 ooffice_tmp_t:file exec_file_perms;
+	rw_files_pattern($1, ooffice_tmp_t, ooffice_tmp_t)
 ')