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 774121381F3 for ; Tue, 24 Sep 2013 17:10:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE681E0ABF; Tue, 24 Sep 2013 17:10:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2EED7E0ABE for ; Tue, 24 Sep 2013 17:10:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AF5933ED95 for ; Tue, 24 Sep 2013 17:10:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E9FD5E5460 for ; Tue, 24 Sep 2013 17:10:45 +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: <1380029947.fc120561aecf2754b2f6e690a8e2c2bccddd9201.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: fc120561aecf2754b2f6e690a8e2c2bccddd9201 X-VCS-Branch: master Date: Tue, 24 Sep 2013 17:10:45 +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: 00bb7924-4b37-4c41-90b3-378b41d60534 X-Archives-Hash: 555342503ad0a594713e8ebc60f00906 commit: fc120561aecf2754b2f6e690a8e2c2bccddd9201 Author: Dominick Grift gmail com> AuthorDate: Fri Aug 16 11:03:07 2013 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Tue Sep 24 13:39:07 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=fc120561 The kerberos_keytab_template() template is deprecated: Breaks monolithic built (out-of-scope) This keytab functionality should be re-evaluated because it does not make sense in its current implementation Signed-off-by: Dominick Grift gmail.com> --- policy/modules/services/ssh.te | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/policy/modules/services/ssh.te b/policy/modules/services/ssh.te index eada65c..568c335 100644 --- a/policy/modules/services/ssh.te +++ b/policy/modules/services/ssh.te @@ -74,6 +74,9 @@ typealias ssh_home_t alias { home_ssh_t user_ssh_home_t user_home_ssh_t staff_ho typealias ssh_home_t alias { auditadm_home_ssh_t secadm_home_ssh_t }; userdom_user_home_content(ssh_home_t) +type sshd_keytab_t; +files_type(sshd_keytab_t) + ############################## # # SSH client local policy @@ -224,6 +227,8 @@ optional_policy(` allow sshd_t self:netlink_route_socket r_netlink_socket_perms; allow sshd_t self:key { search link write }; +allow sshd_t sshd_keytab_t:file read_file_perms; + manage_dirs_pattern(sshd_t, sshd_tmp_t, sshd_tmp_t) manage_files_pattern(sshd_t, sshd_tmp_t, sshd_tmp_t) manage_sock_files_pattern(sshd_t, sshd_tmp_t, sshd_tmp_t) @@ -261,7 +266,8 @@ optional_policy(` ') optional_policy(` - kerberos_keytab_template(sshd, sshd_t) + kerberos_read_keytab(sshd_t) + kerberos_use(sshd_t) ') optional_policy(`