From: cpebenito@tresys.com (Christopher J. PeBenito)
Date: Mon, 30 Jun 2014 14:37:53 -0400
Subject: [refpolicy] [PATCH 1/1] Use init_daemon_pid_file for contrib
 modules
In-Reply-To: <1403953773-6934-1-git-send-email-sven.vermeulen@siphos.be>
References: <1403953773-6934-1-git-send-email-sven.vermeulen@siphos.be>
Message-ID: <53B1AE81.6010304@tresys.com>
To: refpolicy@oss.tresys.com
List-Id: refpolicy.oss.tresys.com

On 6/28/2014 7:09 AM, Sven Vermeulen wrote:
> Signed-off-by: Sven Vermeulen <sven.vermeulen@siphos.be>
> ---
>  asterisk.te   | 2 +-
>  bind.te       | 2 +-
>  consolekit.te | 2 +-
>  couchdb.te    | 2 +-
>  cups.te       | 2 +-
>  dbus.te       | 2 +-
>  dkim.te       | 2 +-
>  exim.te       | 2 +-
>  mysql.te      | 2 +-
>  nscd.te       | 2 +-
>  nut.te        | 2 +-
>  pcscd.te      | 2 +-
>  puppet.te     | 2 +-
>  readahead.te  | 2 +-
>  rpcbind.te    | 2 +-
>  shibboleth.te | 2 +-
>  snort.te      | 2 +-
>  tor.te        | 2 +-
>  xen.te        | 2 +-
>  19 files changed, 19 insertions(+), 19 deletions(-)

Merged.


> diff --git a/asterisk.te b/asterisk.te
> index e1ec6bb..2975acd 100644
> --- a/asterisk.te
> +++ b/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/bind.te b/bind.te
> index 796c270..9ba5f03 100644
> --- a/bind.te
> +++ b/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/consolekit.te b/consolekit.te
> index bd18063..25f444e 100644
> --- a/consolekit.te
> +++ b/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/couchdb.te b/couchdb.te
> index 9469b57..2248ede 100644
> --- a/couchdb.te
> +++ b/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/cups.te b/cups.te
> index 5b06ce2..7ed33ac 100644
> --- a/cups.te
> +++ b/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/dbus.te b/dbus.te
> index 69ef8f5..76ff71c 100644
> --- a/dbus.te
> +++ b/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/dkim.te b/dkim.te
> index 6a73d60..021a7ae 100644
> --- a/dkim.te
> +++ b/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/exim.te b/exim.te
> index 768a69f..508504a 100644
> --- a/exim.te
> +++ b/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/mysql.te b/mysql.te
> index 80d2c6f..f023642 100644
> --- a/mysql.te
> +++ b/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/nscd.te b/nscd.te
> index bcd7d0a..eaf1a56 100644
> --- a/nscd.te
> +++ b/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/nut.te b/nut.te
> index 5b2cb0d..4816f03 100644
> --- a/nut.te
> +++ b/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/pcscd.te b/pcscd.te
> index 1af594e..16ceba4 100644
> --- a/pcscd.te
> +++ b/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/puppet.te b/puppet.te
> index 618dcfe..6b1a0b6 100644
> --- a/puppet.te
> +++ b/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/readahead.te b/readahead.te
> index c0b02c9..27e3bc5 100644
> --- a/readahead.te
> +++ b/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/rpcbind.te b/rpcbind.te
> index 75f7e70..1f36970 100644
> --- a/rpcbind.te
> +++ b/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/shibboleth.te b/shibboleth.te
> index 63950ea..23730ee 100644
> --- a/shibboleth.te
> +++ b/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/snort.te b/snort.te
> index 42e685f..80d9713 100644
> --- a/snort.te
> +++ b/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/tor.te b/tor.te
> index 5ceacde..8db861b 100644
> --- a/tor.te
> +++ b/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/xen.te b/xen.te
> index 6f736a9..3d95d69 100644
> --- a/xen.te
> +++ b/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;
> 

-- 
Chris PeBenito
Tresys Technology, LLC
www.tresys.com | oss.tresys.com