commit: cdb454ef832509e56baed5d22fb7d5d267be869c
Author: Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Tue Jul 15 16:10:32 2014 +0000
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Tue Jul 15 16:12:41 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=cdb454ef
init_daemon_run_dir ==> init_daemon_pid_file
init_daemon_run_dir has been deprecated, it should be
replaced with init_daemon_pid_file instead
Signed-off-by: Jason Zaman <jason <AT> perfinion.com>
---
policy/modules/contrib/apache.te | 4 ++--
policy/modules/contrib/clamav.te | 2 +-
policy/modules/contrib/ldap.te | 2 +-
policy/modules/system/authlogin.te | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/policy/modules/contrib/apache.te b/policy/modules/contrib/apache.te
index f39b6ca..5570175 100644
--- a/policy/modules/contrib/apache.te
+++ b/policy/modules/contrib/apache.te
@@ -1434,8 +1434,8 @@ ifdef(`distro_gentoo',`
## </desc>
gen_tunable(hiawatha_httpd, false)
-init_daemon_run_dir(httpd_var_run_t, "apache_ssl_mutex")
-init_daemon_run_dir(httpd_var_run_t, "apache2")
+init_daemon_pid_file(httpd_var_run_t, dir, "apache_ssl_mutex")
+init_daemon_pid_file(httpd_var_run_t, dir, "apache2")
tunable_policy(`hiawatha_httpd',`
# bug 513362
diff --git a/policy/modules/contrib/clamav.te b/policy/modules/contrib/clamav.te
index 34e3f61..5e74354 100644
--- a/policy/modules/contrib/clamav.te
+++ b/policy/modules/contrib/clamav.te
@@ -323,5 +323,5 @@ optional_policy(`
')
ifdef(`distro_gentoo',`
- init_daemon_run_dir(clamd_var_run_t, "clamav")
+ init_daemon_pid_file(clamd_var_run_t, dir, "clamav")
')
diff --git a/policy/modules/contrib/ldap.te b/policy/modules/contrib/ldap.te
index 0f65384..2a2dfd0 100644
--- a/policy/modules/contrib/ldap.te
+++ b/policy/modules/contrib/ldap.te
@@ -150,7 +150,7 @@ optional_policy(`
')
ifdef(`distro_gentoo',`
- init_daemon_run_dir(slapd_var_run_t, "openldap")
+ init_daemon_pid_file(slapd_var_run_t, dir, "openldap")
########################################
#
diff --git a/policy/modules/system/authlogin.te
b/policy/modules/system/authlogin.te
index 06db47e..984fe54 100644
--- a/policy/modules/system/authlogin.te
+++ b/policy/modules/system/authlogin.te
@@ -466,5 +466,5 @@ optional_policy(`
')
ifdef(`distro_gentoo',`
- init_daemon_run_dir(pam_var_run_t, "sepermit")
+ init_daemon_pid_file(pam_var_run_t, dir, "sepermit")
')
