From e86e1be0830a063d1fd63d9a98278cccb05b0137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Wed, 8 Jun 2016 17:36:00 +0200
Subject: [PATCH] polkit: consolidated polkit action IDs to match DBus names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
---
 Makefile                                            | 4 ++--
 org.tuned.gui.policy => com.redhat.tuned.gui.policy | 2 +-
 dbus.conf                                           | 7 -------
 tuned.spec                                          | 2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)
 rename org.tuned.gui.policy => com.redhat.tuned.gui.policy (94%)

diff --git a/Makefile b/Makefile
index 40c5936..60c6126 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ release-cp: release-dir
 
 	cp -a tuned.py tuned.spec tuned.service tuned.tmpfiles Makefile tuned-adm.py \
 		tuned-adm.bash dbus.conf recommend.conf tuned-main.conf 00_tuned \
-		bootcmdline org.tuned.gui.policy tuned-gui.py tuned-gui.glade \
+		bootcmdline com.redhat.tuned.gui.policy tuned-gui.py tuned-gui.glade \
 		tuned-gui.desktop $(VERSIONED_NAME)
 	cp -a doc experiments libexec man profiles systemtap tuned contrib icons \
 		$(VERSIONED_NAME)
@@ -144,7 +144,7 @@ install: install-dirs
 	install -Dpm 0755 00_tuned $(DESTDIR)/etc/grub.d/00_tuned
 
 	# polkit configuration
-	install -Dpm 0644 org.tuned.gui.policy $(DESTDIR)$(DATADIR)/polkit-1/actions/org.tuned.gui.policy
+	install -Dpm 0644 com.redhat.tuned.gui.policy $(DESTDIR)$(DATADIR)/polkit-1/actions/com.redhat.tuned.gui.policy
 
 	# manual pages
 	$(foreach man_section, 5 7 8, $(foreach file, $(wildcard man/*.$(man_section)), \
diff --git a/org.tuned.gui.policy b/com.redhat.tuned.gui.policy
similarity index 94%
rename from org.tuned.gui.policy
rename to com.redhat.tuned.gui.policy
index 68b15d8..681c3bc 100644
--- a/org.tuned.gui.policy
+++ b/com.redhat.tuned.gui.policy
@@ -2,7 +2,7 @@
 <!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD polkit Policy Configuration 1.0//EN"
 "http://www.freedesktop.org/software/polkit/policyconfig-1.dtd">
 <policyconfig>
-  <action id="org.tuned.gui.run">
+  <action id="com.redhat.tuned.gui.run">
     <description>Run tuned-gui as root</description>
     <message>Authentication is required to run tuned-gui</message>
     <defaults>
diff --git a/dbus.conf b/dbus.conf
index 305d55e..120778a 100644
--- a/dbus.conf
+++ b/dbus.conf
@@ -2,19 +2,12 @@
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
   "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 
-<!--
-	This file is part of tuned daemon.
--->
-
 <busconfig>
 	<policy context="default">
 		<deny send_destination="com.redhat.tuned" />
 		<allow receive_sender="com.redhat.tuned" />
-
 		<allow send_destination="com.redhat.tuned" send_interface="org.freedesktop.DBus.Introspectable" />
-
 		<allow send_destination="com.redhat.tuned" send_interface="com.redhat.tuned.control" send_member="active_profile" />
-		<allow send_destination="com.redhat.tuned" send_interface="com.redhat.tuned.control" send_member="status" />
 	</policy>
 
 	<policy user="root">
diff --git a/tuned.spec b/tuned.spec
index 3c6c78e..76f5c09 100644
--- a/tuned.spec
+++ b/tuned.spec
@@ -256,7 +256,7 @@ fi
 %{_sbindir}/tuned-gui
 %{python_sitelib}/tuned/gtk
 %{_datadir}/tuned/ui
-%{_datadir}/polkit-1/actions/org.tuned.gui.policy
+%{_datadir}/polkit-1/actions/com.redhat.tuned.gui.policy
 %{_datadir}/icons/hicolor/scalable/apps/tuned.svg
 %{_datadir}/applications/tuned-gui.desktop