From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-666223-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DF615138CE3 for <garchives@archives.gentoo.org>; Sun, 9 Feb 2014 10:54:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1CF3E0AD9; Sun, 9 Feb 2014 10:54: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 B1F2EE0A9B for <gentoo-commits@lists.gentoo.org>; Sun, 9 Feb 2014 10:54:38 +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 DF9B633F82B for <gentoo-commits@lists.gentoo.org>; Sun, 9 Feb 2014 10:54:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 5B12C18888 for <gentoo-commits@lists.gentoo.org>; Sun, 9 Feb 2014 10:54:34 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> 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" <swift@gentoo.org> Message-ID: <1391943060.e75e43633695b99fd3892f07f94e9ff84da1b1e8.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/services/ssh.te X-VCS-Directories: policy/modules/services/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: e75e43633695b99fd3892f07f94e9ff84da1b1e8 X-VCS-Branch: master Date: Sun, 9 Feb 2014 10:54:34 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f1fb1651-ac7e-4d96-868e-e5a750f4c498 X-Archives-Hash: e6e474219bc19d5b33b7c76105419ff5 commit: e75e43633695b99fd3892f07f94e9ff84da1b1e8 Author: Laurent Bigonville <bigon <AT> bigon <DOT> be> AuthorDate: Wed Feb 5 21:23:32 2014 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Sun Feb 9 10:51:00 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=e75e4363 Move the ifdef at the end of the declaration block --- 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") +') + ############################## # # SSH client local policy