chiark / gitweb /
bus-policy: print numeric [gu]id in dump_items()
[elogind.git] / src / bus-proxyd / bus-policy.c
index 227742ba745a7b1266201b8232249dafd676b0c3..e870fbc9485aa735aa244947bdff55f2efe28dd9 100644 (file)
@@ -704,8 +704,8 @@ static void dump_items(PolicyItem *items, const char *prefix) {
 
                         user = uid_to_name(i->uid);
 
-                        printf("%sUser: %s\n",
-                               prefix, strna(user));
+                        printf("%sUser: %s (%d)\n",
+                               prefix, strna(user), i->uid);
                 }
 
                 if (i->gid_valid) {
@@ -713,8 +713,8 @@ static void dump_items(PolicyItem *items, const char *prefix) {
 
                         group = gid_to_name(i->gid);
 
-                        printf("%sGroup: %s\n",
-                               prefix, strna(group));
+                        printf("%sGroup: %s (%d)\n",
+                               prefix, strna(group), i->gid);
                 }
         }
 }
@@ -730,7 +730,7 @@ static void dump_hashmap_items(Hashmap *h) {
         }
 }
 
-noreturn void policy_dump(Policy *p) {
+void policy_dump(Policy *p) {
 
         printf("%s Default Items:\n", draw_special_char(DRAW_ARROW));
         dump_items(p->default_items, "\t");
@@ -743,8 +743,6 @@ noreturn void policy_dump(Policy *p) {
 
         printf("%s Mandatory Items:\n", draw_special_char(DRAW_ARROW));
         dump_items(p->mandatory_items, "\t");
-
-        exit(0);
 }
 
 static const char* const policy_item_type_table[_POLICY_ITEM_TYPE_MAX] = {