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 242D013877A for ; Tue, 15 Jul 2014 16:16:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89B3CE0901; Tue, 15 Jul 2014 16:16:39 +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 11C9FE0901 for ; Tue, 15 Jul 2014 16:16:39 +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 162EF33F52C for ; Tue, 15 Jul 2014 16:16:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B551D1807D for ; Tue, 15 Jul 2014 16:16:36 +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: <1405440761.cdb454ef832509e56baed5d22fb7d5d267be869c.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/, policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/apache.te policy/modules/contrib/clamav.te policy/modules/contrib/ldap.te policy/modules/system/authlogin.te X-VCS-Directories: policy/modules/contrib/ policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: cdb454ef832509e56baed5d22fb7d5d267be869c X-VCS-Branch: master Date: Tue, 15 Jul 2014 16:16:36 +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: b298029e-c081-40ad-b16e-1f684dfdaa1a X-Archives-Hash: 8c2118a414c6542e263a05d2c2dd9c74 commit: cdb454ef832509e56baed5d22fb7d5d267be869c Author: Jason Zaman perfinion com> AuthorDate: Tue Jul 15 16:10:32 2014 +0000 Commit: Sven Vermeulen gentoo 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 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',` ## 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") ')