| 1 |
commit: 2674c787163e1e862c60468ca753b1f60230499b |
| 2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 3 |
AuthorDate: Wed Jun 25 19:53:02 2014 +0000 |
| 4 |
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 30 18:58:07 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=2674c787 |
| 7 |
|
| 8 |
Use init_daemon_pid_file instead of init_daemon_run_dir |
| 9 |
|
| 10 |
Update non-contrib modules to use init_daemon_pid_file instead of |
| 11 |
init_daemon_run_dir. |
| 12 |
|
| 13 |
Signed-off-by: Sven Vermeulen <sven.vermeulen <AT> siphos.be> |
| 14 |
|
| 15 |
--- |
| 16 |
policy/modules/services/postgresql.te | 2 +- |
| 17 |
policy/modules/services/ssh.te | 2 +- |
| 18 |
policy/modules/system/setrans.te | 2 +- |
| 19 |
policy/modules/system/sysnetwork.te | 2 +- |
| 20 |
policy/modules/system/udev.te | 2 +- |
| 21 |
5 files changed, 5 insertions(+), 5 deletions(-) |
| 22 |
|
| 23 |
diff --git a/policy/modules/services/postgresql.te b/policy/modules/services/postgresql.te |
| 24 |
index c771377..c38bb46 100644 |
| 25 |
--- a/policy/modules/services/postgresql.te |
| 26 |
+++ b/policy/modules/services/postgresql.te |
| 27 |
@@ -63,7 +63,7 @@ files_tmp_file(postgresql_tmp_t) |
| 28 |
|
| 29 |
type postgresql_var_run_t; |
| 30 |
files_pid_file(postgresql_var_run_t) |
| 31 |
-init_daemon_run_dir(postgresql_var_run_t, "postgresql") |
| 32 |
+init_daemon_pid_file(postgresql_var_run_t, dir, "postgresql") |
| 33 |
|
| 34 |
# database clients attribute |
| 35 |
attribute sepgsql_admin_type; |
| 36 |
|
| 37 |
diff --git a/policy/modules/services/ssh.te b/policy/modules/services/ssh.te |
| 38 |
index 536a2d9..43b9cc1 100644 |
| 39 |
--- a/policy/modules/services/ssh.te |
| 40 |
+++ b/policy/modules/services/ssh.te |
| 41 |
@@ -85,7 +85,7 @@ type sshd_keytab_t; |
| 42 |
files_type(sshd_keytab_t) |
| 43 |
|
| 44 |
ifdef(`distro_debian',` |
| 45 |
- init_daemon_run_dir(sshd_var_run_t, "sshd") |
| 46 |
+ init_daemon_pid_file(sshd_var_run_t, dir, "sshd") |
| 47 |
') |
| 48 |
|
| 49 |
############################## |
| 50 |
|
| 51 |
diff --git a/policy/modules/system/setrans.te b/policy/modules/system/setrans.te |
| 52 |
index a840e70..057456c 100644 |
| 53 |
--- a/policy/modules/system/setrans.te |
| 54 |
+++ b/policy/modules/system/setrans.te |
| 55 |
@@ -21,7 +21,7 @@ files_pid_file(setrans_var_run_t) |
| 56 |
mls_trusted_object(setrans_var_run_t) |
| 57 |
|
| 58 |
ifdef(`distro_debian',` |
| 59 |
- init_daemon_run_dir(setrans_var_run_t, "setrans") |
| 60 |
+ init_daemon_pid_file(setrans_var_run_t, dir, "setrans") |
| 61 |
') |
| 62 |
|
| 63 |
ifdef(`enable_mcs',` |
| 64 |
|
| 65 |
diff --git a/policy/modules/system/sysnetwork.te b/policy/modules/system/sysnetwork.te |
| 66 |
index 945ffb5..35372f6 100644 |
| 67 |
--- a/policy/modules/system/sysnetwork.te |
| 68 |
+++ b/policy/modules/system/sysnetwork.te |
| 69 |
@@ -40,7 +40,7 @@ type net_conf_t alias resolv_conf_t; |
| 70 |
files_type(net_conf_t) |
| 71 |
|
| 72 |
ifdef(`distro_debian',` |
| 73 |
- init_daemon_run_dir(net_conf_t, "network") |
| 74 |
+ init_daemon_pid_file(net_conf_t, dir, "network") |
| 75 |
') |
| 76 |
|
| 77 |
######################################## |
| 78 |
|
| 79 |
diff --git a/policy/modules/system/udev.te b/policy/modules/system/udev.te |
| 80 |
index 95de10c..246f006 100644 |
| 81 |
--- a/policy/modules/system/udev.te |
| 82 |
+++ b/policy/modules/system/udev.te |
| 83 |
@@ -25,7 +25,7 @@ files_type(udev_rules_t) |
| 84 |
|
| 85 |
type udev_var_run_t; |
| 86 |
files_pid_file(udev_var_run_t) |
| 87 |
-init_daemon_run_dir(udev_var_run_t, "udev") |
| 88 |
+init_daemon_pid_file(udev_var_run_t, dir, "udev") |
| 89 |
|
| 90 |
ifdef(`enable_mcs',` |
| 91 |
kernel_ranged_domtrans_to(udev_t, udev_exec_t, s0 - mcs_systemhigh) |
Archives