From: sven.vermeulen@siphos.be (Sven Vermeulen) Date: Wed, 25 Jun 2014 21:53:02 +0200 Subject: [refpolicy] [PATCH v2 3/3] Use init_daemon_pid_file instead of init_daemon_run_dir In-Reply-To: <1403725982-10043-1-git-send-email-sven.vermeulen@siphos.be> References: <1403725982-10043-1-git-send-email-sven.vermeulen@siphos.be> Message-ID: <1403725982-10043-4-git-send-email-sven.vermeulen@siphos.be> To: refpolicy@oss.tresys.com List-Id: refpolicy.oss.tresys.com Update non-contrib modules to use init_daemon_pid_file instead of init_daemon_run_dir. Signed-off-by: Sven Vermeulen --- policy/modules/services/postgresql.te | 2 +- policy/modules/services/ssh.te | 2 +- policy/modules/system/setrans.te | 2 +- policy/modules/system/sysnetwork.te | 2 +- policy/modules/system/udev.te | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/policy/modules/services/postgresql.te b/policy/modules/services/postgresql.te index c771377..c38bb46 100644 --- a/policy/modules/services/postgresql.te +++ b/policy/modules/services/postgresql.te @@ -63,7 +63,7 @@ files_tmp_file(postgresql_tmp_t) type postgresql_var_run_t; files_pid_file(postgresql_var_run_t) -init_daemon_run_dir(postgresql_var_run_t, "postgresql") +init_daemon_pid_file(postgresql_var_run_t, dir, "postgresql") # database clients attribute attribute sepgsql_admin_type; diff --git a/policy/modules/services/ssh.te b/policy/modules/services/ssh.te index 536a2d9..43b9cc1 100644 --- a/policy/modules/services/ssh.te +++ b/policy/modules/services/ssh.te @@ -85,7 +85,7 @@ type sshd_keytab_t; files_type(sshd_keytab_t) ifdef(`distro_debian',` - init_daemon_run_dir(sshd_var_run_t, "sshd") + init_daemon_pid_file(sshd_var_run_t, dir, "sshd") ') ############################## diff --git a/policy/modules/system/setrans.te b/policy/modules/system/setrans.te index a840e70..057456c 100644 --- a/policy/modules/system/setrans.te +++ b/policy/modules/system/setrans.te @@ -21,7 +21,7 @@ files_pid_file(setrans_var_run_t) mls_trusted_object(setrans_var_run_t) ifdef(`distro_debian',` - init_daemon_run_dir(setrans_var_run_t, "setrans") + init_daemon_pid_file(setrans_var_run_t, dir, "setrans") ') ifdef(`enable_mcs',` diff --git a/policy/modules/system/sysnetwork.te b/policy/modules/system/sysnetwork.te index 4b6a520..9bd538b 100644 --- a/policy/modules/system/sysnetwork.te +++ b/policy/modules/system/sysnetwork.te @@ -40,7 +40,7 @@ type net_conf_t alias resolv_conf_t; files_type(net_conf_t) ifdef(`distro_debian',` - init_daemon_run_dir(net_conf_t, "network") + init_daemon_pid_file(net_conf_t, dir, "network") ') ######################################## diff --git a/policy/modules/system/udev.te b/policy/modules/system/udev.te index f4545f5..d3d5509 100644 --- a/policy/modules/system/udev.te +++ b/policy/modules/system/udev.te @@ -25,7 +25,7 @@ files_type(udev_rules_t) type udev_var_run_t; files_pid_file(udev_var_run_t) -init_daemon_run_dir(udev_var_run_t, "udev") +init_daemon_pid_file(udev_var_run_t, dir, "udev") ifdef(`enable_mcs',` kernel_ranged_domtrans_to(udev_t, udev_exec_t, s0 - mcs_systemhigh) -- 1.8.5.5