apparmor-easyprof-ubuntu

Merge lp:~ken-vandine/apparmor-easyprof-ubuntu/ual_typo into lp:apparmor-easyprof-ubuntu

  1. ual_typo
  2. Merge into trunk
Proposed by Ken VanDine on 2015-06-18
Status: Merged
Merge reported by: Ken VanDine
Merged at revision: not available
Proposed branch: lp:~ken-vandine/apparmor-easyprof-ubuntu/ual_typo
Merge into: lp:apparmor-easyprof-ubuntu
Diff against target: 59 lines (+12/-3)
3 files modified
data/templates/ubuntu/1.0/ubuntu-sdk (+4/-1)
data/templates/ubuntu/1.1/ubuntu-sdk (+4/-1)
data/templates/ubuntu/1.3/ubuntu-sdk (+4/-1)
To merge this branch: bzr merge lp:~ken-vandine/apparmor-easyprof-ubuntu/ual_typo
Reviewer Review Type Date Requested Status
Jamie Strandboge 2015-06-18 Approve on 2015-06-19
Review via email: mp+262326@code.launchpad.net

Commit Message

Fixed the interface name for the SocketDemangler rule in the ubuntu-sdk template and added rule to allow the socket-demangler to be executed.

Description of the Change

Fixed the interface name for the SocketDemangler rule in the ubuntu-sdk template and added rule to allow the socket-demangler to be executed.

To post a comment you must log in.
lp:~ken-vandine/apparmor-easyprof-ubuntu/ual_typo updated on 2015-06-18
26. By Ken VanDine on 2015-06-18

fixes for the socket-demanager for 1.0 and 1.3

Ted Gould (ted) wrote :

+1 sorry about the typos.

Jamie Strandboge (jdstrand) wrote :

Looks fine. Merging with a small whitespace and comment change. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/templates/ubuntu/1.0/ubuntu-sdk'
2--- data/templates/ubuntu/1.0/ubuntu-sdk 2015-06-05 19:24:05 +0000
3+++ data/templates/ubuntu/1.0/ubuntu-sdk 2015-06-18 13:14:50 +0000
4@@ -199,11 +199,14 @@
5 # move to socket activation or FD passing
6 dbus (receive, send)
7 path=/com/canonical/UbuntuAppLaunch/@{APP_ID_DBUS}/*
8- interface="org.canonical.UbuntuAppLaunch.SocketDemangler"
9+ interface="com.canonical.UbuntuAppLaunch.SocketDemangler"
10 member="GetMirSocket"
11 bus=session
12 peer=(label=unconfined),
13
14+# Allow access to the socket-demangler
15+/usr/lib/@{multiarch}/ubuntu-app-launch/socket-demangler rmix,
16+
17 # TODO: finetune this
18 dbus (send)
19 bus=session
20
21=== modified file 'data/templates/ubuntu/1.1/ubuntu-sdk'
22--- data/templates/ubuntu/1.1/ubuntu-sdk 2015-06-05 19:24:05 +0000
23+++ data/templates/ubuntu/1.1/ubuntu-sdk 2015-06-18 13:14:50 +0000
24@@ -194,11 +194,14 @@
25 # move to socket activation or FD passing
26 dbus (receive, send)
27 path=/com/canonical/UbuntuAppLaunch/@{APP_ID_DBUS}/*
28- interface="org.canonical.UbuntuAppLaunch.SocketDemangler"
29+ interface="com.canonical.UbuntuAppLaunch.SocketDemangler"
30 member="GetMirSocket"
31 bus=session
32 peer=(label=unconfined),
33
34+# Allow access to the socket-demangler
35+/usr/lib/@{multiarch}/ubuntu-app-launch/socket-demangler rmix,
36+
37 # TODO: finetune this
38 dbus (send)
39 bus=session
40
41=== modified file 'data/templates/ubuntu/1.3/ubuntu-sdk'
42--- data/templates/ubuntu/1.3/ubuntu-sdk 2015-06-05 19:24:05 +0000
43+++ data/templates/ubuntu/1.3/ubuntu-sdk 2015-06-18 13:14:50 +0000
44@@ -194,11 +194,14 @@
45 # move to socket activation or FD passing
46 dbus (receive, send)
47 path=/com/canonical/UbuntuAppLaunch/@{APP_ID_DBUS}/*
48- interface="org.canonical.UbuntuAppLaunch.SocketDemangler"
49+ interface="com.canonical.UbuntuAppLaunch.SocketDemangler"
50 member="GetMirSocket"
51 bus=session
52 peer=(label=unconfined),
53
54+# Allow access to the socket-demangler
55+/usr/lib/@{multiarch}/ubuntu-app-launch/socket-demangler rmix,
56+
57 # TODO: finetune this
58 dbus (send)
59 bus=session

Subscribers

People subscribed via source and target branches