From: cpebenito@tresys.com (Christopher J. PeBenito) Date: Thu, 6 Feb 2014 09:03:33 -0500 Subject: [refpolicy] [PATCH 2/2] Move the ifdef at the end of the declaration block In-Reply-To: <1391635412-16253-2-git-send-email-bigon@debian.org> References: <1391635412-16253-1-git-send-email-bigon@debian.org> <1391635412-16253-2-git-send-email-bigon@debian.org> Message-ID: <52F39635.8090009@tresys.com> To: refpolicy@oss.tresys.com List-Id: refpolicy.oss.tresys.com On 02/05/14 16:23, Laurent Bigonville wrote: > From: Laurent Bigonville > > --- > policy/modules/services/ssh.te | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/policy/modules/services/ssh.te b/policy/modules/services/ssh.te > index 30726f2..70bad35 100644 > --- a/policy/modules/services/ssh.te > +++ b/policy/modules/services/ssh.te > @@ -33,10 +33,6 @@ corecmd_executable_file(sshd_exec_t) > ssh_server_template(sshd) > init_daemon_domain(sshd_t, sshd_exec_t) > > -ifdef(`distro_debian',` > - init_daemon_run_dir(sshd_var_run_t, "sshd") > -') > - > type sshd_key_t; > files_type(sshd_key_t) > > @@ -81,6 +77,10 @@ userdom_user_home_content(ssh_home_t) > type sshd_keytab_t; > files_type(sshd_keytab_t) > > +ifdef(`distro_debian',` > + init_daemon_run_dir(sshd_var_run_t, "sshd") > +') > + Merged. -- Chris PeBenito Tresys Technology, LLC www.tresys.com | oss.tresys.com