Merge pull request #4733 from jdstrand/fix-dbus-path-and-interface-typos

interfaces/screen-inhibit-control,network-status: fix dbus path and interface typos
snapcore · Feb 26, 2018 · 3b1cbdd · 3b1cbdd
2 parents 9dc0884 + 1bb9e40
commit 3b1cbdd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/interfaces/builtin/network_status.go b/interfaces/builtin/network_status.go
@@ -81,7 +81,7 @@ const networkStatusConnectedPlugAppArmor = `
 # Allow all access to NetworkingStatus service
 dbus (send)
     bus=system
-    interface=com.ubuntu.connectivity1.NetworkingStatus{,/**}
+    interface=com.ubuntu.connectivity1.NetworkingStatus{,*}
     path=/com/ubuntu/connectivity1/NetworkingStatus
     peer=(label=###SLOT_SECURITY_TAGS###),
 

diff --git a/interfaces/builtin/network_status_test.go b/interfaces/builtin/network_status_test.go
@@ -76,7 +76,7 @@ func (s *NetworkStatusSuite) TestAppArmorConnectedPlug(c *C) {
 	c.Assert(spec.AddConnectedPlug(s.iface, s.plug, s.slot), IsNil)
 	c.Assert(spec.SecurityTags(), DeepEquals, []string{"snap.consumer.app"})
 	c.Assert(spec.SnippetForTag("snap.consumer.app"), testutil.Contains, `peer=(label="snap.provider.app"`)
-	c.Assert(spec.SnippetForTag("snap.consumer.app"), testutil.Contains, "interface=com.ubuntu.connectivity1.NetworkingStatus{,/**}")
+	c.Assert(spec.SnippetForTag("snap.consumer.app"), testutil.Contains, "interface=com.ubuntu.connectivity1.NetworkingStatus{,*}")
 }
 
 func (s *NetworkStatusSuite) TestAppArmorConnectedSlot(c *C) {

diff --git a/interfaces/builtin/screen_inhibit_control.go b/interfaces/builtin/screen_inhibit_control.go
@@ -67,7 +67,7 @@ dbus (send)
 # API rule
 dbus (send)
     bus=session
-    path=/{,org/freedesktop/,org.gnome/}ScreenSaver
+    path=/{,org/freedesktop/,org/gnome/}ScreenSaver
     interface=org.freedesktop.ScreenSaver
     member={Inhibit,UnInhibit,SimulateUserActivity}
     peer=(label=unconfined),