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 EAD4E13877A for ; Mon, 30 Jun 2014 19:03:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B4F9E0B0C; Mon, 30 Jun 2014 19:03:31 +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 046F0E0B0C for ; Mon, 30 Jun 2014 19:03:25 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E58BA3403A8 for ; Mon, 30 Jun 2014 19:03:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 8A567193E8 for ; Mon, 30 Jun 2014 19:03:23 +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: <1404154789.af754468a7fde0d8e230e2eb923489735112a5a1.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/asterisk.te policy/modules/contrib/bind.te policy/modules/contrib/consolekit.te policy/modules/contrib/couchdb.te policy/modules/contrib/cups.te policy/modules/contrib/dbus.te policy/modules/contrib/dkim.te policy/modules/contrib/exim.te policy/modules/contrib/mysql.te policy/modules/contrib/nscd.te policy/modules/contrib/nut.te policy/modules/contrib/pcscd.te policy/modules/contrib/puppet.te policy/modules/contrib/readahead.te policy/modules/contrib/rpcbind.te policy/modules/contrib/shibboleth.te policy/modules/contrib/snort.te policy/modules/contrib/tor.te policy/modules/contrib/xen.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: af754468a7fde0d8e230e2eb923489735112a5a1 X-VCS-Branch: master Date: Mon, 30 Jun 2014 19:03:23 +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: 87282479-ac70-4051-8ce2-a1bc8c4f27a8 X-Archives-Hash: 0617d2506e9f642781c340832f98dfb4 commit: af754468a7fde0d8e230e2eb923489735112a5a1 Author: Sven Vermeulen siphos be> AuthorDate: Sat Jun 28 11:09:33 2014 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Mon Jun 30 18:59:49 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=af754468 Use init_daemon_pid_file for contrib modules Signed-off-by: Sven Vermeulen siphos.be> --- policy/modules/contrib/asterisk.te | 2 +- policy/modules/contrib/bind.te | 2 +- policy/modules/contrib/consolekit.te | 2 +- policy/modules/contrib/couchdb.te | 2 +- policy/modules/contrib/cups.te | 2 +- policy/modules/contrib/dbus.te | 2 +- policy/modules/contrib/dkim.te | 2 +- policy/modules/contrib/exim.te | 2 +- policy/modules/contrib/mysql.te | 2 +- policy/modules/contrib/nscd.te | 2 +- policy/modules/contrib/nut.te | 2 +- policy/modules/contrib/pcscd.te | 2 +- policy/modules/contrib/puppet.te | 2 +- policy/modules/contrib/readahead.te | 2 +- policy/modules/contrib/rpcbind.te | 2 +- policy/modules/contrib/shibboleth.te | 2 +- policy/modules/contrib/snort.te | 2 +- policy/modules/contrib/tor.te | 2 +- policy/modules/contrib/xen.te | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/policy/modules/contrib/asterisk.te b/policy/modules/contrib/asterisk.te index e1ec6bb..2975acd 100644 --- a/policy/modules/contrib/asterisk.te +++ b/policy/modules/contrib/asterisk.te @@ -32,7 +32,7 @@ files_type(asterisk_var_lib_t) type asterisk_var_run_t; files_pid_file(asterisk_var_run_t) -init_daemon_run_dir(asterisk_var_run_t, "asterisk") +init_daemon_pid_file(asterisk_var_run_t, dir, "asterisk") ######################################## # diff --git a/policy/modules/contrib/bind.te b/policy/modules/contrib/bind.te index 796c270..9ba5f03 100644 --- a/policy/modules/contrib/bind.te +++ b/policy/modules/contrib/bind.te @@ -55,7 +55,7 @@ files_tmp_file(named_tmp_t) type named_var_run_t; files_pid_file(named_var_run_t) -init_daemon_run_dir(named_var_run_t, "named") +init_daemon_pid_file(named_var_run_t, dir, "named") # for primary zone files type named_zone_t; diff --git a/policy/modules/contrib/consolekit.te b/policy/modules/contrib/consolekit.te index bd18063..25f444e 100644 --- a/policy/modules/contrib/consolekit.te +++ b/policy/modules/contrib/consolekit.te @@ -17,7 +17,7 @@ files_tmpfs_file(consolekit_tmpfs_t) type consolekit_var_run_t; files_pid_file(consolekit_var_run_t) -init_daemon_run_dir(consolekit_var_run_t, "ConsoleKit") +init_daemon_pid_file(consolekit_var_run_t, dir, "ConsoleKit") ######################################## # diff --git a/policy/modules/contrib/couchdb.te b/policy/modules/contrib/couchdb.te index 9469b57..2248ede 100644 --- a/policy/modules/contrib/couchdb.te +++ b/policy/modules/contrib/couchdb.te @@ -30,7 +30,7 @@ files_type(couchdb_var_lib_t) type couchdb_var_run_t; files_pid_file(couchdb_var_run_t) -init_daemon_run_dir(couchdb_var_run_t, "couchdb") +init_daemon_pid_file(couchdb_var_run_t, dir, "couchdb") ######################################## # diff --git a/policy/modules/contrib/cups.te b/policy/modules/contrib/cups.te index 5b06ce2..7ed33ac 100644 --- a/policy/modules/contrib/cups.te +++ b/policy/modules/contrib/cups.te @@ -59,7 +59,7 @@ files_tmp_file(cupsd_tmp_t) type cupsd_var_run_t; files_pid_file(cupsd_var_run_t) -init_daemon_run_dir(cupsd_var_run_t, "cups") +init_daemon_pid_file(cupsd_var_run_t, dir, "cups") mls_trusted_object(cupsd_var_run_t) type hplip_t; diff --git a/policy/modules/contrib/dbus.te b/policy/modules/contrib/dbus.te index 8075f85..6557312 100644 --- a/policy/modules/contrib/dbus.te +++ b/policy/modules/contrib/dbus.te @@ -41,7 +41,7 @@ files_type(system_dbusd_var_lib_t) type system_dbusd_var_run_t; files_pid_file(system_dbusd_var_run_t) -init_daemon_run_dir(system_dbusd_var_run_t, "dbus") +init_daemon_pid_file(system_dbusd_var_run_t, dir, "dbus") ifdef(`enable_mcs',` init_ranged_system_domain(system_dbusd_t, dbusd_exec_t, s0 - mcs_systemhigh) diff --git a/policy/modules/contrib/dkim.te b/policy/modules/contrib/dkim.te index 6a73d60..021a7ae 100644 --- a/policy/modules/contrib/dkim.te +++ b/policy/modules/contrib/dkim.te @@ -13,7 +13,7 @@ init_script_file(dkim_milter_initrc_exec_t) type dkim_milter_private_key_t; files_type(dkim_milter_private_key_t) -init_daemon_run_dir(dkim_milter_data_t, "opendkim") +init_daemon_pid_file(dkim_milter_data_t, dir, "opendkim") ######################################## # diff --git a/policy/modules/contrib/exim.te b/policy/modules/contrib/exim.te index 768a69f..508504a 100644 --- a/policy/modules/contrib/exim.te +++ b/policy/modules/contrib/exim.te @@ -64,7 +64,7 @@ type exim_var_run_t; files_pid_file(exim_var_run_t) ifdef(`distro_debian',` - init_daemon_run_dir(exim_var_run_t, "exim4") + init_daemon_pid_file(exim_var_run_t, dir, "exim4") ') ######################################## diff --git a/policy/modules/contrib/mysql.te b/policy/modules/contrib/mysql.te index 80d2c6f..f023642 100644 --- a/policy/modules/contrib/mysql.te +++ b/policy/modules/contrib/mysql.te @@ -27,7 +27,7 @@ init_daemon_domain(mysqld_safe_t, mysqld_safe_exec_t) type mysqld_var_run_t; files_pid_file(mysqld_var_run_t) -init_daemon_run_dir(mysqld_var_run_t, "mysqld") +init_daemon_pid_file(mysqld_var_run_t, dir, "mysqld") type mysqld_db_t; files_type(mysqld_db_t) diff --git a/policy/modules/contrib/nscd.te b/policy/modules/contrib/nscd.te index bcd7d0a..eaf1a56 100644 --- a/policy/modules/contrib/nscd.te +++ b/policy/modules/contrib/nscd.te @@ -21,7 +21,7 @@ attribute_role nscd_roles; type nscd_var_run_t; files_pid_file(nscd_var_run_t) -init_daemon_run_dir(nscd_var_run_t, "nscd") +init_daemon_pid_file(nscd_var_run_t, dir, "nscd") type nscd_t; type nscd_exec_t; diff --git a/policy/modules/contrib/nut.te b/policy/modules/contrib/nut.te index 5b2cb0d..4816f03 100644 --- a/policy/modules/contrib/nut.te +++ b/policy/modules/contrib/nut.te @@ -27,7 +27,7 @@ init_script_file(nut_initrc_exec_t) type nut_var_run_t; files_pid_file(nut_var_run_t) -init_daemon_run_dir(nut_var_run_t, "nut") +init_daemon_pid_file(nut_var_run_t, dir, "nut") ######################################## # diff --git a/policy/modules/contrib/pcscd.te b/policy/modules/contrib/pcscd.te index 1af594e..16ceba4 100644 --- a/policy/modules/contrib/pcscd.te +++ b/policy/modules/contrib/pcscd.te @@ -14,7 +14,7 @@ init_script_file(pcscd_initrc_exec_t) type pcscd_var_run_t; files_pid_file(pcscd_var_run_t) -init_daemon_run_dir(pcscd_var_run_t, "pcscd") +init_daemon_pid_file(pcscd_var_run_t, dir, "pcscd") ######################################## # diff --git a/policy/modules/contrib/puppet.te b/policy/modules/contrib/puppet.te index 86e3512..6fa9b91 100644 --- a/policy/modules/contrib/puppet.te +++ b/policy/modules/contrib/puppet.te @@ -37,7 +37,7 @@ files_type(puppet_var_lib_t) type puppet_var_run_t; files_pid_file(puppet_var_run_t) -init_daemon_run_dir(puppet_var_run_t, "puppet") +init_daemon_pid_file(puppet_var_run_t, dir, "puppet") type puppetca_t; type puppetca_exec_t; diff --git a/policy/modules/contrib/readahead.te b/policy/modules/contrib/readahead.te index c0b02c9..27e3bc5 100644 --- a/policy/modules/contrib/readahead.te +++ b/policy/modules/contrib/readahead.te @@ -15,7 +15,7 @@ typealias readahead_var_lib_t alias readahead_etc_rw_t; type readahead_var_run_t; files_pid_file(readahead_var_run_t) -init_daemon_run_dir(readahead_var_run_t, "readahead") +init_daemon_pid_file(readahead_var_run_t, dir, "readahead") ######################################## # diff --git a/policy/modules/contrib/rpcbind.te b/policy/modules/contrib/rpcbind.te index 75f7e70..1f36970 100644 --- a/policy/modules/contrib/rpcbind.te +++ b/policy/modules/contrib/rpcbind.te @@ -14,7 +14,7 @@ init_script_file(rpcbind_initrc_exec_t) type rpcbind_var_run_t; files_pid_file(rpcbind_var_run_t) -init_daemon_run_dir(rpcbind_var_run_t, "rpcbind") +init_daemon_pid_file(rpcbind_var_run_t, dir, "rpcbind") type rpcbind_var_lib_t; files_type(rpcbind_var_lib_t) diff --git a/policy/modules/contrib/shibboleth.te b/policy/modules/contrib/shibboleth.te index 63950ea..23730ee 100644 --- a/policy/modules/contrib/shibboleth.te +++ b/policy/modules/contrib/shibboleth.te @@ -17,7 +17,7 @@ logging_log_file(shibboleth_log_t) type shibboleth_var_run_t; files_pid_file(shibboleth_var_run_t) -init_daemon_run_dir(shibboleth_var_run_t, "shibboleth") +init_daemon_pid_file(shibboleth_var_run_t, dir, "shibboleth") ######################################## # diff --git a/policy/modules/contrib/snort.te b/policy/modules/contrib/snort.te index 42e685f..80d9713 100644 --- a/policy/modules/contrib/snort.te +++ b/policy/modules/contrib/snort.te @@ -23,7 +23,7 @@ files_tmp_file(snort_tmp_t) type snort_var_run_t; files_pid_file(snort_var_run_t) -init_daemon_run_dir(snort_var_run_t, "snort") +init_daemon_pid_file(snort_var_run_t, dir, "snort") ######################################## # diff --git a/policy/modules/contrib/tor.te b/policy/modules/contrib/tor.te index 5ceacde..8db861b 100644 --- a/policy/modules/contrib/tor.te +++ b/policy/modules/contrib/tor.te @@ -31,7 +31,7 @@ logging_log_file(tor_var_log_t) type tor_var_run_t; files_pid_file(tor_var_run_t) -init_daemon_run_dir(tor_var_run_t, "tor") +init_daemon_pid_file(tor_var_run_t, dir, "tor") ######################################## # diff --git a/policy/modules/contrib/xen.te b/policy/modules/contrib/xen.te index 6f736a9..3d95d69 100644 --- a/policy/modules/contrib/xen.te +++ b/policy/modules/contrib/xen.te @@ -105,7 +105,7 @@ logging_log_file(xenstored_var_log_t) type xenstored_var_run_t; files_pid_file(xenstored_var_run_t) -init_daemon_run_dir(xenstored_var_run_t, "xenstored") +init_daemon_pid_file(xenstored_var_run_t, dir, "xenstored") type xenconsoled_t; type xenconsoled_exec_t;