summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-06 19:52:50 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-06 19:52:50 +0200
commit445743035336bf9691d200b8417685186ef9b5f9 (patch)
tree00945a0cd4d79d2b30e25e0a5b201e268ef341ef
parentbcf3295d2b0d87caefad2e73d221aac080d0c11e (diff)
bus-proxy: properly read user/group policy items
-rw-r--r--src/bus-proxyd/bus-policy.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bus-proxyd/bus-policy.c b/src/bus-proxyd/bus-policy.c
index c592f501bf..af3b3abbf9 100644
--- a/src/bus-proxyd/bus-policy.c
+++ b/src/bus-proxyd/bus-policy.c
@@ -212,6 +212,7 @@ static int file_load(Policy *p, const char *path) {
free(policy_user);
policy_user = name;
name = NULL;
+ policy_category = POLICY_CATEGORY_USER;
state = STATE_POLICY;
} else {
log_error("Unexpected token (5) in %s:%u.", path, line);
@@ -226,6 +227,7 @@ static int file_load(Policy *p, const char *path) {
free(policy_group);
policy_group = name;
name = NULL;
+ policy_category = POLICY_CATEGORY_GROUP;
state = STATE_POLICY;
} else {
log_error("Unexpected token (6) at %s:%u.", path, line);
@@ -636,10 +638,10 @@ static void dump_items(PolicyItem *i) {
static void dump_hashmap_items(Hashmap *h) {
PolicyItem *i;
Iterator j;
- char *k;
+ void *k;
HASHMAP_FOREACH_KEY(i, k, h, j) {
- printf("Item for %s", k);
+ printf("Item for %u:\n", PTR_TO_UINT(k));
dump_items(i);
}
}