From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 9 Jan 2015 18:30:01 +0000 (+0100)
Subject: bus-proxy-test: show parsed system/session policy
X-Git-Tag: v219~585
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=48aae6d6a051acd9c0630fab1e79b82c847e538b

bus-proxy-test: show parsed system/session policy
---

diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/bus-proxyd/bus-xml-policy.c
index 119c73194..8d14828a9 100644
--- a/src/bus-proxyd/bus-xml-policy.c
+++ b/src/bus-proxyd/bus-xml-policy.c
@@ -1047,6 +1047,8 @@ void policy_dump(Policy *p) {
 
         printf("%s Mandatory Items:\n", draw_special_char(DRAW_ARROW));
         dump_items(p->mandatory_items, "\t");
+
+        fflush(stdout);
 }
 
 static const char* const policy_item_type_table[_POLICY_ITEM_TYPE_MAX] = {
diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/bus-proxyd/test-bus-xml-policy.c
index b0f4ed7d3..c22409c0f 100644
--- a/src/bus-proxyd/test-bus-xml-policy.c
+++ b/src/bus-proxyd/test-bus-xml-policy.c
@@ -50,17 +50,41 @@ static int test_policy_load(Policy *p, const char *name) {
         assert_se(path);
 
         if (access(path, R_OK) == 0)
-                policy_load(p, STRV_MAKE(path));
+                r = policy_load(p, STRV_MAKE(path));
         else
                 r = -ENOENT;
 
         return r;
 }
 
+static int show_policy(const char *fn) {
+        Policy p = {};
+        int r;
+
+        r = policy_load(&p, STRV_MAKE(fn));
+        if (r < 0) {
+                log_error_errno(r, "Failed to load policy %s: %m", fn);
+                return r;
+        }
+
+        policy_dump(&p);
+        policy_free(&p);
+
+        return 0;
+}
+
 int main(int argc, char *argv[]) {
 
         Policy p = {};
 
+        printf("Showing session policy BEGIN\n");
+        show_policy("/etc/dbus-1/session.conf");
+        printf("Showing session policy END\n");
+
+        printf("Showing system policy BEGIN\n");
+        show_policy("/etc/dbus-1/system.conf");
+        printf("Showing system policy END\n");
+
         /* Ownership tests */
         assert_se(test_policy_load(&p, "ownerships.conf") == 0);