From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-650332-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 4D0F1138247
	for <garchives@archives.gentoo.org>; Tue, 17 Dec 2013 08:53:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A3F8DE0AD5;
	Tue, 17 Dec 2013 08:53:00 +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 40171E0AD5
	for <gentoo-commits@lists.gentoo.org>; Tue, 17 Dec 2013 08:53:00 +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 3328933F4A9
	for <gentoo-commits@lists.gentoo.org>; Tue, 17 Dec 2013 08:52:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id CB356E56D3
	for <gentoo-commits@lists.gentoo.org>; Tue, 17 Dec 2013 08:52:57 +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: <1387270086.d9c93e2772405ded03cb478b07bec4cfdbe9c23d.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/ldap.te
X-VCS-Directories: policy/modules/contrib/
X-VCS-Committer: swift
X-VCS-Committer-Name: Sven Vermeulen
X-VCS-Revision: d9c93e2772405ded03cb478b07bec4cfdbe9c23d
X-VCS-Branch: master
Date: Tue, 17 Dec 2013 08:52:57 +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: d7a499a1-7bdc-42d6-9832-c2eb5c6aa0fd
X-Archives-Hash: 8bf81b0e062fd66600d3f6ecda4af108

commit:     d9c93e2772405ded03cb478b07bec4cfdbe9c23d
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Tue Dec 17 08:48:06 2013 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 08:48:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=d9c93e27

Move gentoo stuff below

---
 policy/modules/contrib/ldap.te | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/policy/modules/contrib/ldap.te b/policy/modules/contrib/ldap.te
index 131dc88..7629d1e 100644
--- a/policy/modules/contrib/ldap.te
+++ b/policy/modules/contrib/ldap.te
@@ -128,13 +128,6 @@ miscfiles_read_localization(slapd_t)
 userdom_dontaudit_use_unpriv_user_fds(slapd_t)
 userdom_dontaudit_search_user_home_dirs(slapd_t)
 
-ifdef(`distro_gentoo',`
-	allow slapd_t self:process signal;
-	allow slapd_t self:unix_stream_socket listen;
-
-	userdom_use_user_terminals(slapd_t)
-')
-
 optional_policy(`
 	kerberos_manage_host_rcache(slapd_t)
 	kerberos_read_keytab(slapd_t)
@@ -155,3 +148,10 @@ optional_policy(`
 optional_policy(`
 	udev_read_db(slapd_t)
 ')
+
+ifdef(`distro_gentoo',`
+	allow slapd_t self:process signal;
+	allow slapd_t self:unix_stream_socket listen;
+
+	userdom_use_user_terminals(slapd_t)
+')