1 files changed, 23 insertions, 17 deletions

diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/bus-proxyd/bus-xml-policy.c
index 9a3b451c56..debd58ce8b 100644
--- a/src/bus-proxyd/bus-xml-policy.c
+++ b/src/bus-proxyd/bus-xml-policy.c
@@ -19,15 +19,21 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "xml.h"
-#include "fileio.h"
-#include "strv.h"
-#include "set.h"
-#include "conf-files.h"
+#include "sd-login.h"
+
+#include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-xml-policy.h"
-#include "sd-login.h"
+#include "conf-files.h"
+#include "fileio.h"
 #include "formats-util.h"
+#include "locale-util.h"
+#include "set.h"
+#include "string-table.h"
+#include "string-util.h"
+#include "strv.h"
+#include "user-util.h"
+#include "xml.h"
 
 static void policy_item_free(PolicyItem *i) {
         assert(i);
@@ -386,11 +392,11 @@ static int file_load(Policy *p, const char *path) {
                                         } else {
                                                 PolicyItem *first;
 
-                                                first = hashmap_get(p->user_items, UINT32_TO_PTR(i->uid));
+                                                first = hashmap_get(p->user_items, UID_TO_PTR(i->uid));
                                                 item_append(i, &first);
                                                 i->uid_valid = true;
 
-                                                r = hashmap_replace(p->user_items, UINT32_TO_PTR(i->uid), first);
+                                                r = hashmap_replace(p->user_items, UID_TO_PTR(i->uid), first);
                                                 if (r < 0) {
                                                         LIST_REMOVE(items, first, i);
                                                         return log_oom();
@@ -418,11 +424,11 @@ static int file_load(Policy *p, const char *path) {
                                         } else {
                                                 PolicyItem *first;
 
-                                                first = hashmap_get(p->group_items, UINT32_TO_PTR(i->gid));
+                                                first = hashmap_get(p->group_items, GID_TO_PTR(i->gid));
                                                 item_append(i, &first);
                                                 i->gid_valid = true;
 
-                                                r = hashmap_replace(p->group_items, UINT32_TO_PTR(i->gid), first);
+                                                r = hashmap_replace(p->group_items, GID_TO_PTR(i->gid), first);
                                                 if (r < 0) {
                                                         LIST_REMOVE(items, first, i);
                                                         return log_oom();
@@ -781,7 +787,7 @@ static int policy_check(Policy *p, const struct policy_check_filter *filter) {
         verdict = check_policy_items(p->default_items, filter);
 
         if (filter->gid != GID_INVALID) {
-                items = hashmap_get(p->group_items, UINT32_TO_PTR(filter->gid));
+                items = hashmap_get(p->group_items, GID_TO_PTR(filter->gid));
                 if (items) {
                         v = check_policy_items(items, filter);
                         if (v != DUNNO)
@@ -790,7 +796,7 @@ static int policy_check(Policy *p, const struct policy_check_filter *filter) {
         }
 
         if (filter->uid != UID_INVALID) {
-                items = hashmap_get(p->user_items, UINT32_TO_PTR(filter->uid));
+                items = hashmap_get(p->user_items, UID_TO_PTR(filter->uid));
                 if (items) {
                         v = check_policy_items(items, filter);
                         if (v != DUNNO)
@@ -1149,7 +1155,7 @@ static void dump_hashmap_items(Hashmap *h) {
         void *k;
 
         HASHMAP_FOREACH_KEY(i, k, h, j) {
-                printf("\t%s Item for %u:\n", draw_special_char(DRAW_ARROW), PTR_TO_UINT(k));
+                printf("\t%s Item for " UID_FMT ":\n", draw_special_char(DRAW_ARROW), PTR_TO_UID(k));
                 dump_items(i, "\t\t");
         }
 }
@@ -1186,14 +1192,14 @@ int shared_policy_new(SharedPolicy **out) {
                 return log_oom();
 
         r = pthread_mutex_init(&sp->lock, NULL);
-        if (r < 0) {
-                log_error_errno(r, "Cannot initialize shared policy mutex: %m");
+        if (r != 0) {
+                r = log_error_errno(r, "Cannot initialize shared policy mutex: %m");
                 goto exit_free;
         }
 
         r = pthread_rwlock_init(&sp->rwlock, NULL);
-        if (r < 0) {
-                log_error_errno(r, "Cannot initialize shared policy rwlock: %m");
+        if (r != 0) {
+                r = log_error_errno(r, "Cannot initialize shared policy rwlock: %m");
                 goto exit_mutex;
         }