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 8187E138A1A for ; Fri, 2 Jan 2015 17:22:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A502E079C; Fri, 2 Jan 2015 17:22:36 +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 408D4E078C for ; Fri, 2 Jan 2015 17:22:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31E2A3406E7 for ; Fri, 2 Jan 2015 17:22:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AD06EBB2 for ; Fri, 2 Jan 2015 17:22:31 +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: <1420219284.3f0e0524d443adce4e2c4ce3d460e2d35dc12ec5.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/courier.fc policy/modules/contrib/courier.if policy/modules/contrib/courier.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 3f0e0524d443adce4e2c4ce3d460e2d35dc12ec5 X-VCS-Branch: master Date: Fri, 2 Jan 2015 17:22:31 +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: 47d09a68-10d4-4ac9-a901-43d2f2c4eb33 X-Archives-Hash: d0a7e3645d5cdbde0ffe95edc90bb404 commit: 3f0e0524d443adce4e2c4ce3d460e2d35dc12ec5 Author: Sven Vermeulen siphos be> AuthorDate: Fri Jan 2 17:21:24 2015 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Fri Jan 2 17:21:24 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=3f0e0524 Merge with upstream done, remove gentoo specifics --- policy/modules/contrib/courier.fc | 5 ----- policy/modules/contrib/courier.if | 38 -------------------------------------- policy/modules/contrib/courier.te | 19 +------------------ 3 files changed, 1 insertion(+), 61 deletions(-) diff --git a/policy/modules/contrib/courier.fc b/policy/modules/contrib/courier.fc index c0f288b..2f017a0 100644 --- a/policy/modules/contrib/courier.fc +++ b/policy/modules/contrib/courier.fc @@ -30,8 +30,3 @@ /var/spool/authdaemon(/.*)? gen_context(system_u:object_r:courier_spool_t,s0) /var/spool/courier(/.*)? gen_context(system_u:object_r:courier_spool_t,s0) - -ifdef(`distro_gentoo',` -# Default location for authdaemon socket, should be /var/run imo but meh -/var/lib/courier/authdaemon(/.*)? gen_context(system_u:object_r:courier_var_run_t,s0) -') diff --git a/policy/modules/contrib/courier.if b/policy/modules/contrib/courier.if index 0705659..10f820f 100644 --- a/policy/modules/contrib/courier.if +++ b/policy/modules/contrib/courier.if @@ -188,41 +188,3 @@ interface(`courier_rw_spool_pipes',` files_search_var($1) allow $1 courier_spool_t:fifo_file rw_fifo_file_perms; ') - -######################################## -## -## Allow read/write operations on an inherited stream socket -## -## -## -## Domain allowed access. -## -## -## -# -interface(`courier_authdaemon_rw_inherited_stream_sockets',` - gen_require(` - type courier_authdaemon_t; - ') - allow $1 courier_authdaemon_t:unix_stream_socket { read write }; -') - - -######################################## -## -## Connect to Authdaemon using a unix domain stream socket. -## -## -## -## Domain allowed access. -## -## -## -# -interface(`courier_authdaemon_stream_connect',` - gen_require(` - type courier_authdaemon_t, courier_var_run_t; - ') - - stream_connect_pattern($1, courier_var_run_t, courier_var_run_t, courier_authdaemon_t) -') diff --git a/policy/modules/contrib/courier.te b/policy/modules/contrib/courier.te index 2171e04..dd23992 100644 --- a/policy/modules/contrib/courier.te +++ b/policy/modules/contrib/courier.te @@ -194,23 +194,6 @@ optional_policy(` ifdef(`distro_gentoo',` ######################################## # - # Courier imap/pop daemon policy - # - - # Switch after succesfull authentication (bug 534030) - allow courier_pop_t self:capability { setuid setgid }; - - # Executes script /usr/lib64/courier-imap/courier-imapd.indirect after authentication and to start user session (bug 534030) - corecmd_exec_shell(courier_pop_t) - - # Locate authdaemon socket and communicate with authdaemon (bug 534030) - stream_connect_pattern(courier_pop_t, courier_var_lib_t, courier_var_run_t, courier_authdaemon_t) - - # Manage maildir of users (bug 534030) - mta_manage_mail_home_rw_content(courier_pop_t) - - ######################################## - # # Courier tcpd daemon policy # @@ -223,6 +206,6 @@ ifdef(`distro_gentoo',` # # Grant authdaemon getattr rights on security_t so that it can check if SELinux is enabled (needed through pam support) (bug 534030) - # selinux_getattr_fs(courier_authdaemon_t) + # Handled through pam use auth_use_pam(courier_authdaemon_t) ')