You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.5 KiB
48 lines
1.5 KiB
15 years ago
|
From 67a2478f610be4beff34258a5a5b36243415b069 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matthias Clasen <mclasen@redhat.com>
|
||
|
|
Date: Tue, 19 Jan 2010 20:36:03 -0500
|
||
|
|
Subject: [PATCH] Make the defaults mechanism find the right polkit action
|
||
|
|
|
||
|
|
Due to a thinko in the code, the mechanism was always using the
|
||
|
|
default privileges.
|
||
|
|
---
|
||
|
|
defaults/gconf-defaults.c | 7 ++++---
|
||
|
|
1 files changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/defaults/gconf-defaults.c b/defaults/gconf-defaults.c
|
||
|
|
index 11a38ad..b84c632 100644
|
||
|
|
--- a/defaults/gconf-defaults.c
|
||
|
|
+++ b/defaults/gconf-defaults.c
|
||
|
|
@@ -286,8 +286,8 @@ polkit_action_for_gconf_path (GConfDefaults *mechanism,
|
||
|
|
PolkitActionDescription *action_description;
|
||
|
|
const gchar *annotation;
|
||
|
|
|
||
|
|
+ g_debug ("finding action for path '%s'", path);
|
||
|
|
prefix = g_strdup (path);
|
||
|
|
-
|
||
|
|
while (1) {
|
||
|
|
for (l = action_descriptions; l; l = l->next) {
|
||
|
|
action_description = l->data;
|
||
|
|
@@ -295,8 +295,8 @@ polkit_action_for_gconf_path (GConfDefaults *mechanism,
|
||
|
|
annotation = polkit_action_description_get_annotation (action_description, annotation_key);
|
||
|
|
if (g_strcmp0 (prefix, annotation) == 0) {
|
||
|
|
action = polkit_action_description_get_action_id (action_description);
|
||
|
|
- g_debug ("action for path '%s': '%s'\n", action, path);
|
||
|
|
- break;
|
||
|
|
+ g_debug ("action for prefix '%s': '%s'\n", prefix, action);
|
||
|
|
+ goto found;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -310,6 +310,7 @@ polkit_action_for_gconf_path (GConfDefaults *mechanism,
|
||
|
|
*p = 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ found:
|
||
|
|
g_free (prefix);
|
||
|
|
|
||
|
|
return action;
|
||
|
|
--
|
||
|
|
1.6.6
|
||
|
|
|