From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-666217-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 76833138CE3
	for <garchives@archives.gentoo.org>; Sun,  9 Feb 2014 10:54:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4595EE0A88;
	Sun,  9 Feb 2014 10:54:38 +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 84DC9E0A88
	for <gentoo-commits@lists.gentoo.org>; Sun,  9 Feb 2014 10:54:37 +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 BB2ED33F8BA
	for <gentoo-commits@lists.gentoo.org>; Sun,  9 Feb 2014 10:54:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by spoonbill.gentoo.org (Postfix) with ESMTP id CB1BA1888C
	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: <1391943067.0cc26bea9b48fa43b815a9da5013c0d60a0ec770.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.if policy/modules/services/ssh.te
X-VCS-Directories: policy/modules/services/
X-VCS-Committer: swift
X-VCS-Committer-Name: Sven Vermeulen
X-VCS-Revision: 0cc26bea9b48fa43b815a9da5013c0d60a0ec770
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: 10eb9a6f-9e32-4ca4-9cd9-695a6083d089
X-Archives-Hash: fd6984d6319069caf915b10aaf8db378

commit:     0cc26bea9b48fa43b815a9da5013c0d60a0ec770
Author:     Chris PeBenito <pebenito <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 13:40:37 2014 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 10:51:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=0cc26bea

Rearrange gpg agent calls.

---
 policy/modules/services/ssh.if | 10 +++++-----
 policy/modules/services/ssh.te | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/policy/modules/services/ssh.if b/policy/modules/services/ssh.if
index dbce034..cbd0cdd 100644
--- a/policy/modules/services/ssh.if
+++ b/policy/modules/services/ssh.if
@@ -423,16 +423,16 @@ template(`ssh_role_template',`
 	')
 
 	optional_policy(`
-		xserver_use_xdm_fds($1_ssh_agent_t)
-		xserver_rw_xdm_pipes($1_ssh_agent_t)
-	')
-
-	optional_policy(`
 		tunable_policy(`ssh_use_gpg_agent',`
 			# for ssh-add
 			gpg_stream_connect_agent($3)
 		')
 	')
+
+	optional_policy(`
+		xserver_use_xdm_fds($1_ssh_agent_t)
+		xserver_rw_xdm_pipes($1_ssh_agent_t)
+	')
 ')
 
 ########################################

diff --git a/policy/modules/services/ssh.te b/policy/modules/services/ssh.te
index 48654c2..e7b6412 100644
--- a/policy/modules/services/ssh.te
+++ b/policy/modules/services/ssh.te
@@ -205,16 +205,16 @@ tunable_policy(`user_tcp_server',`
 ')
 
 optional_policy(`
-	xserver_user_x_domain_template(ssh, ssh_t, ssh_tmpfs_t)
-	xserver_domtrans_xauth(ssh_t)
-')
-
-optional_policy(`
 	tunable_policy(`ssh_use_gpg_agent',`
 		gpg_stream_connect_agent(ssh_t)
 	')
 ')
 
+optional_policy(`
+	xserver_user_x_domain_template(ssh, ssh_t, ssh_tmpfs_t)
+	xserver_domtrans_xauth(ssh_t)
+')
+
 ##############################
 #
 # ssh_keysign_t local policy