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 3571A1381F3 for ; Tue, 23 Jul 2013 12:02:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05A00E0A82; Tue, 23 Jul 2013 12:02:47 +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 9B7D5E0A82 for ; Tue, 23 Jul 2013 12:02:41 +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 715A833E956 for ; Tue, 23 Jul 2013 12:02:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1BD48E545F for ; Tue, 23 Jul 2013 12:02:39 +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: <1374580859.e4a2e7aef6f63743e93b33bb0c7be09c348b836e.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/services/postgresql.fc X-VCS-Directories: policy/modules/services/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: e4a2e7aef6f63743e93b33bb0c7be09c348b836e X-VCS-Branch: master Date: Tue, 23 Jul 2013 12:02:39 +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: 8ef18e6b-e4c6-4988-ace4-5deb83e6909f X-Archives-Hash: 6f820e6d40336124f594b1d02914309d commit: e4a2e7aef6f63743e93b33bb0c7be09c348b836e Author: Sven Vermeulen siphos be> AuthorDate: Tue Jul 23 12:00:59 2013 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Tue Jul 23 12:00:59 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=e4a2e7ae Mark PostgreSQL service as appropriate initrc script The postgresql-* service scripts should be labeled as postgresql_initrc_exec_t so that non-sysadmin users, when allowed by policy, can still manipulate the service. --- policy/modules/services/postgresql.fc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/policy/modules/services/postgresql.fc b/policy/modules/services/postgresql.fc index d7bbc24..4ff317d 100644 --- a/policy/modules/services/postgresql.fc +++ b/policy/modules/services/postgresql.fc @@ -2,9 +2,6 @@ # /etc # /etc/postgresql(/.*)? gen_context(system_u:object_r:postgresql_etc_t,s0) -ifdef(`distro_gentoo',` -/etc/postgresql-.*(/.*)? gen_context(system_u:object_r:postgresql_etc_t,s0) -') /etc/rc\.d/init\.d/(se)?postgresql -- gen_context(system_u:object_r:postgresql_initrc_exec_t,s0) /etc/sysconfig/pgsql(/.*)? gen_context(system_u:object_r:postgresql_etc_t,s0) @@ -16,7 +13,7 @@ ifdef(`distro_gentoo',` /usr/lib/pgsql/test/regress(/.*)? gen_context(system_u:object_r:postgresql_db_t,s0) /usr/lib/pgsql/test/regress/pg_regress -- gen_context(system_u:object_r:postgresql_exec_t,s0) -/usr/lib/postgresql/bin/.* -- gen_context(system_u:object_r:postgresql_exec_t,s0) +/usr/lib/postgresql/bin/.* -- gen_context(system_u:object_r:postgresql_exec_t,s0) ifdef(`distro_debian', ` /usr/lib/postgresql/.*/bin/.* -- gen_context(system_u:object_r:postgresql_exec_t,s0) @@ -26,10 +23,6 @@ ifdef(`distro_redhat', ` /usr/share/jonas/pgsql(/.*)? gen_context(system_u:object_r:postgresql_db_t,s0) ') -ifdef(`distro_gentoo',` -/usr/lib/postgresql-.*/bin/.* -- gen_context(system_u:object_r:postgresql_exec_t,s0) -') - # # /var # @@ -53,3 +46,12 @@ ifdef(`distro_redhat', ` /var/run/postgresql(/.*)? gen_context(system_u:object_r:postgresql_var_run_t,s0) /var/run/postmaster.* gen_context(system_u:object_r:postgresql_var_run_t,s0) + +ifdef(`distro_gentoo',` +/etc/rc\.d/init\.d/postgresql-.* -- gen_context(system_u:object_r:postgresql_initrc_exec_t,s0) + +/etc/postgresql-.*(/.*)? gen_context(system_u:object_r:postgresql_etc_t,s0) + +/usr/lib/postgresql-.*/bin/.* -- gen_context(system_u:object_r:postgresql_exec_t,s0) +') +