picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bus-policy: append items rather than prepending them

Browse source 
In the D-Bus policy, the order of items matters, so make sure to store them
in the same order as they are parsed by the sax parser.
This commit is contained in:
Daniel Mack 2014-09-19 22:05:01 +02:00
parent 303174638a
commit e7eb49db07
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/bus-proxyd/bus-policy.c
View file

@ -39,6 +39,14 @@ static void policy_item_free(PolicyItem *i) {
DEFINE_TRIVIAL_CLEANUP_FUNC(PolicyItem*, policy_item_free);
static void item_append(PolicyItem *i, PolicyItem **list) {
PolicyItem *tail;
LIST_FIND_TAIL(items, *list, tail);
LIST_INSERT_AFTER(items, *list, tail, i);
}
static int file_load(Policy *p, const char *path) {
_cleanup_free_ char *c = NULL, *policy_user = NULL, *policy_group = NULL;
@ -330,9 +338,9 @@ static int file_load(Policy *p, const char *path) {
}
if (policy_category == POLICY_CATEGORY_DEFAULT)
LIST_PREPEND(items, p->default_items, i);
item_append(i, &p->default_items);
else if (policy_category == POLICY_CATEGORY_MANDATORY)
LIST_PREPEND(items, p->mandatory_items, i);
item_append(i, &p->mandatory_items);
else if (policy_category == POLICY_CATEGORY_USER) {
const char *u = policy_user;
@ -355,7 +363,7 @@ static int file_load(Policy *p, const char *path) {
PolicyItem *first;
first = hashmap_get(p->user_items, UINT32_TO_PTR(i->uid));
LIST_PREPEND(items, first, i);
item_append(i, &first);
r = hashmap_replace(p->user_items, UINT32_TO_PTR(i->uid), first);
if (r < 0) {
@ -386,7 +394,7 @@ static int file_load(Policy *p, const char *path) {
PolicyItem *first;
first = hashmap_get(p->group_items, UINT32_TO_PTR(i->gid));
LIST_PREPEND(items, first, i);
item_append(i, &first);
r = hashmap_replace(p->group_items, UINT32_TO_PTR(i->gid), first);
if (r < 0) {