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/contrib/
Date: Mon, 30 Sep 2013 19:04:05
Message-Id: 1380567774.bd27cdedb28bc2557e402b02fcd00abcb85543cd.swift@gentoo
1 commit: bd27cdedb28bc2557e402b02fcd00abcb85543cd
2 Author: Dominick Grift <dominick.grift <AT> gmail <DOT> com>
3 AuthorDate: Thu Sep 26 21:51:03 2013 +0000
4 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 30 19:02:54 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=bd27cded
7
8 wm: allow $1_wm_t to stream connect to $1_gkeyringd_t
9
10 Signed-off-by: Dominick Grift <dominick.grift <AT> gmail.com>
11
12 ---
13 policy/modules/contrib/wm.if | 6 +++---
14 policy/modules/contrib/wm.te | 2 +-
15 2 files changed, 4 insertions(+), 4 deletions(-)
16
17 diff --git a/policy/modules/contrib/wm.if b/policy/modules/contrib/wm.if
18 index fbd84ba..95f888d 100644
19 --- a/policy/modules/contrib/wm.if
20 +++ b/policy/modules/contrib/wm.if
21 @@ -80,9 +80,9 @@ template(`wm_role_template',`
22 ')
23 ')
24
25 - # optional_policy(`
26 - # gnome_stream_connect_gkeyringd($1, $1_wm_t)
27 - # ')
28 + optional_policy(`
29 + gnome_stream_connect_gkeyringd($1, $1_wm_t)
30 + ')
31
32 optional_policy(`
33 pulseaudio_run($1_wm_t, $2)
34
35 diff --git a/policy/modules/contrib/wm.te b/policy/modules/contrib/wm.te
36 index 9d2e935..638d10f 100644
37 --- a/policy/modules/contrib/wm.te
38 +++ b/policy/modules/contrib/wm.te
39 @@ -1,4 +1,4 @@
40 -policy_module(wm, 1.3.2)
41 +policy_module(wm, 1.3.3)
42
43 ########################################
44 #