From 4d681cdf22416834b2d5a0ac66bf274d2a9c429c Mon Sep 17 00:00:00 2001
From: Angelo Naselli <angelo.naselli@softeco.it>
Date: Thu, 5 Jun 2014 15:42:23 +0200
Subject: fixed adminpanel and logviewer polkit policy

---
 extras/polkit/org.mageia.adminpanel.policy          | 21 +++++++++++++++++++++
 extras/polkit/org.mageia.logviewer.policy           |  2 +-
 .../org.mageia.policykit.pkexec.adminpanel.policy   | 21 ---------------------
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 extras/polkit/org.mageia.adminpanel.policy
 delete mode 100644 extras/polkit/org.mageia.policykit.pkexec.adminpanel.policy

(limited to 'extras')

diff --git a/extras/polkit/org.mageia.adminpanel.policy b/extras/polkit/org.mageia.adminpanel.policy
new file mode 100644
index 0000000..6b8baf9
--- /dev/null
+++ b/extras/polkit/org.mageia.adminpanel.policy
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <vendor>Mageia.Org</vendor>
+  <vendor_url>http://www.mageia.org</vendor_url>
+
+  <action id="org.mageia.adminpanel.pkexec.run">
+    <description>Allow APanel GUI</description>
+    <message>Authentication is required to run the program apanel (user=$(user), program=$(program), command_line=$(command_line))</message>
+    <defaults>
+      <allow_any>no</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/apanel.pl</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+</policyconfig>
diff --git a/extras/polkit/org.mageia.logviewer.policy b/extras/polkit/org.mageia.logviewer.policy
index ab35808..bbdd36c 100644
--- a/extras/polkit/org.mageia.logviewer.policy
+++ b/extras/polkit/org.mageia.logviewer.policy
@@ -45,7 +45,7 @@
      <allow_inactive>no</allow_inactive>
      <allow_active>auth_admin_keep</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/local/bin/logviewer</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/logviewer</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
  </action>
 </policyconfig>
diff --git a/extras/polkit/org.mageia.policykit.pkexec.adminpanel.policy b/extras/polkit/org.mageia.policykit.pkexec.adminpanel.policy
deleted file mode 100644
index 78f47d0..0000000
--- a/extras/polkit/org.mageia.policykit.pkexec.adminpanel.policy
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-
-  <vendor>Mageia.Org</vendor>
-  <vendor_url>http://www.mageia.org</vendor_url>
-
-  <action id="org.mageia.policykit.pkexec.adminpanel">
-    <description>Allow APanel GUI</description>
-    <message>Authentication is required to run the program apanel (user=$(user), program=$(program), command_line=$(command_line))</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>auth_admin</allow_inactive>
-      <allow_active>auth_admin</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/apanel.pl</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
-  </action>
-</policyconfig>
-- 
cgit v1.2.1