Gentoo Archives: gentoo-commits

From: Sven Vermeulen <swift@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/
Date: Sun, 09 Feb 2014 10:54:48
Message-Id: 1391943060.e75e43633695b99fd3892f07f94e9ff84da1b1e8.swift@gentoo
1 commit: e75e43633695b99fd3892f07f94e9ff84da1b1e8
2 Author: Laurent Bigonville <bigon <AT> bigon <DOT> be>
3 AuthorDate: Wed Feb 5 21:23:32 2014 +0000
4 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 10:51:00 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=e75e4363
7
8 Move the ifdef at the end of the declaration block
9
10 ---
11 policy/modules/services/ssh.te | 8 ++++----
12 1 file changed, 4 insertions(+), 4 deletions(-)
13
14 diff --git a/policy/modules/services/ssh.te b/policy/modules/services/ssh.te
15 index 30726f2..70bad35 100644
16 --- a/policy/modules/services/ssh.te
17 +++ b/policy/modules/services/ssh.te
18 @@ -33,10 +33,6 @@ corecmd_executable_file(sshd_exec_t)
19 ssh_server_template(sshd)
20 init_daemon_domain(sshd_t, sshd_exec_t)
21
22 -ifdef(`distro_debian',`
23 - init_daemon_run_dir(sshd_var_run_t, "sshd")
24 -')
25 -
26 type sshd_key_t;
27 files_type(sshd_key_t)
28
29 @@ -81,6 +77,10 @@ userdom_user_home_content(ssh_home_t)
30 type sshd_keytab_t;
31 files_type(sshd_keytab_t)
32
33 +ifdef(`distro_debian',`
34 + init_daemon_run_dir(sshd_var_run_t, "sshd")
35 +')
36 +
37 ##############################
38 #
39 # SSH client local policy