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 64B6F138202 for ; Mon, 3 Dec 2012 21:03:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 391B6E0459; Mon, 3 Dec 2012 21:03:24 +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 361E5E0603 for ; Mon, 3 Dec 2012 21:03:22 +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 0418F33D948 for ; Mon, 3 Dec 2012 21:03:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 97B07E544A for ; Mon, 3 Dec 2012 21:03:20 +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: <1354568577.8f1bc281bbe99c1ece6bc0b4c922ba4a99100b1a.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: / X-VCS-Repository: proj/hardened-refpolicy X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 8f1bc281bbe99c1ece6bc0b4c922ba4a99100b1a X-VCS-Branch: master Date: Mon, 3 Dec 2012 21:03:20 +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: 44de52fe-5b6b-49e0-83d0-73cb43581948 X-Archives-Hash: 25fa8d3fd5c45741fc33fc086a77c914 commit: 8f1bc281bbe99c1ece6bc0b4c922ba4a99100b1a Author: Sven Vermeulen siphos be> AuthorDate: Mon Dec 3 21:02:57 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Mon Dec 3 21:02:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=8f1bc281 Resolve merge conflict after rebase policy/modules/system/userdomain.if | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --cc policy/modules/system/userdomain.if index 981b50a,6b5ed8f..760bab7 --- a/policy/modules/system/userdomain.if +++ b/policy/modules/system/userdomain.if @@@ -3453,9 -3453,7 +3453,8 @@@ interface(`userdom_dbus_send_all_users' allow $1 userdomain:dbus send_msg; ') - -ifdef(`distro_gentoo',` +# Gentoo added stuff, but cannot use an ifdef distro_gentoo for this + ######################################## ## ## Support creation of tunable access to user content